- up to percona 5.6.20-68.0

diff --git a/bison3.patch b/bison3.patch
deleted file mode 100644 (file)
index d8e0985..0000000
--- a/bison3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- Percona-Server-5.5.32-rel31.0/sql/sql_yacc.yy.orig 2013-07-01 05:16:34.000000000 +0200
-+++ Percona-Server-5.5.32-rel31.0/sql/sql_yacc.yy      2013-08-18 21:33:19.181583895 +0200
-@@ -26,8 +26,6 @@
- ** The type will be void*, so it must be  cast to (THD*) when used.
- ** Use the YYTHD macro for this.
- */
--#define YYPARSE_PARAM yythd
--#define YYLEX_PARAM yythd
- #define YYTHD ((THD *)yythd)
- #define YYLIP (& YYTHD->m_parser_state->m_lip)
- #define YYPS (& YYTHD->m_parser_state->m_yacc)
-@@ -76,7 +74,7 @@
-     ulong val= *(F);                          \
-     if (my_yyoverflow((B), (D), &val))        \
-     {                                         \
--      yyerror((char*) (A));                   \
-+      yyerror(yythd, (char*) (A));            \
-       return 2;                               \
-     }                                         \
-     else                                      \
-@@ -174,7 +172,7 @@
-   to abort from the parser.
- */
- 
--void MYSQLerror(const char *s)
-+void MYSQLerror(void *yythd, const char *s)
- {
-   THD *thd= current_thd;
- 
-@@ -780,7 +778,9 @@
- bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
- %}
- 
--%pure_parser                                    /* We have threads */
-+%pure-parser                                    /* We have threads */
-+%parse-param { void *yythd }
-+%lex-param { void *yythd }
- /*
-   Currently there are 168 shift/reduce conflicts.
-   We should not introduce new conflicts any more.

diff --git a/mysql.spec b/mysql.spec
index 521fa82fa0e3bb6d5431dc5906b008041d774525..8bfceec53ede3c22d6e1ed48f9aecce1f76ff989 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -23,8 +23,8 @@
 %bcond_with    tests           # FIXME: don't run correctly
 %bcond_with    ndb             # NDB is now a separate product, this here is broken, so disable it
 
-%define                rel     3
-%define                percona_rel     64.1
+%define                rel     1
+%define                percona_rel     68.0
 %include       /usr/lib/rpm/macros.perl
 Summary:       MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     MySQL: ist eine SQL-Datenbank
@@ -35,16 +35,16 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.6.16
+Version:       5.6.20
 Release:       %{percona_rel}.%{rel}
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
 # Source0:     http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
 Source0:       http://www.percona.com/downloads/Percona-Server-5.6/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: ba75fbcc530dc74ebb978cf450c011b3
-Source100:     http://www.sphinxsearch.com/files/sphinx-2.1.6-release.tar.gz
-# Source100-md5:       f416c743c0e0f4e337b4549928d8494f
+# Source0-md5: 0a22d7a5455498fc5c66d545646f3c06
+Source100:     http://www.sphinxsearch.com/files/sphinx-2.1.9-release.tar.gz
+# Source100-md5:       3b987baa64b9c050c92412a72c4d3059
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
@@ -73,7 +73,7 @@ Patch18:      %{name}-sphinx.patch
 Patch19:       %{name}-chain-certs.patch
 # from fedora
 Patch20:       %{name}-dubious-exports.patch
-Patch21:       bison3.patch
+
 Patch22:       bug-66589.patch
 Patch23:       bug-44278.patch
 Patch24:       %{name}-cmake.patch
@@ -516,7 +516,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch14 -p0
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
+
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
@@ -556,7 +556,8 @@ cd build
        -DINSTALL_MYSQLTESTDIR_RPM="" \
        -DINSTALL_PLUGINDIR=%{_libdir}/%{name}/plugin \
        -DINSTALL_SQLBENCHDIR=%{_datadir} \
-       -DINSTALL_SUPPORTFILESDIR=%{_datadir}/%{_orgname}-support \
+       -DINSTALL_SUPPORTFILESDIR=share/%{_orgname}-support \
+       -DINSTALL_MYSQLSHAREDIR=share/%{_orgname} \
        -DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \
        %{?debug:-DWITH_DEBUG=ON} \
        -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
@@ -902,6 +903,7 @@ done
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugin
 %attr(755,root,root) %{_libdir}/%{name}/plugin/adt_null.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/audit_log.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/auth_pam_compat.so
@@ -911,10 +913,15 @@ done
 #%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_archive.so
 #%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_blackhole.so
 #%attr(755,root,root) %{_libdir}/%{name}/plugin/ha_federated.so
+#%attr(755,root,root) %{_libdir}/%{name}/plugin/handlersocket.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv1a_udf.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/libfnv_udf.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/libmurmur_udf.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/mypluglib.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_client.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_interface.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/qa_auth_server.so
+%attr(755,root,root) %{_libdir}/%{name}/plugin/scalability_metrics.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_master.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/semisync_slave.so
 %attr(755,root,root) %{_libdir}/%{name}/plugin/validate_password.so