rpms/mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase patch30

Browse Source
This commit is contained in:
Honza Horák 2013-08-20 17:28:47 +02:00
parent 0a42b35c06
commit a950da39b8
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
community-mysql-pluginerrmsg.patch
View File

@ -12,9 +12,9 @@ MySQL bug report: http://bugs.mysql.com/bug.php?id=51771
MariaDB bug report: https://mariadb.atlassian.net/browse/MDEV-4573 MariaDB bug report: https://mariadb.atlassian.net/browse/MDEV-4573
MariaDB fix: http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/3802 MariaDB fix: http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/3802
diff -up mysql-5.5.32/include/mysql.h.pluginerrmsg mysql-5.5.32/include/mysql.h diff -up mysql-5.5.33/include/mysql.h.p30 mysql-5.5.33/include/mysql.h
--- mysql-5.5.32/include/mysql.h.pluginerrmsg 2013-05-16 17:47:15.000000000 +0200 --- mysql-5.5.33/include/mysql.h.p30 2013-07-15 14:01:50.000000000 +0200
+++ mysql-5.5.32/include/mysql.h 2013-07-01 16:07:29.175690210 +0200 +++ mysql-5.5.33/include/mysql.h 2013-08-20 17:26:56.745334059 +0200
@@ -134,6 +134,7 @@ typedef unsigned long long my_ulonglong; @@ -134,6 +134,7 @@ typedef unsigned long long my_ulonglong;
/* backward compatibility define - to be removed eventually */ /* backward compatibility define - to be removed eventually */
@ -23,20 +23,20 @@ diff -up mysql-5.5.32/include/mysql.h.pluginerrmsg mysql-5.5.32/include/mysql.h
typedef struct st_mysql_rows { typedef struct st_mysql_rows {
struct st_mysql_rows *next; /* list of rows */ struct st_mysql_rows *next; /* list of rows */
diff -up mysql-5.5.32/mysql-test/r/plugin.result.pluginerrmsg mysql-5.5.32/mysql-test/r/plugin.result diff -up mysql-5.5.33/mysql-test/r/plugin.result.p30 mysql-5.5.33/mysql-test/r/plugin.result
--- mysql-5.5.32/mysql-test/r/plugin.result.pluginerrmsg 2013-05-16 17:47:14.000000000 +0200 --- mysql-5.5.33/mysql-test/r/plugin.result.p30 2013-07-15 14:01:49.000000000 +0200
+++ mysql-5.5.32/mysql-test/r/plugin.result 2013-07-01 16:07:29.176690210 +0200 +++ mysql-5.5.33/mysql-test/r/plugin.result 2013-08-20 17:26:56.746334059 +0200
@@ -63,3 +63,5 @@ set session sql_mode=@old_sql_mode; @@ -143,3 +143,5 @@ SELECT @@SESSION.example_double_thdvar;
set session old=bla; @@SESSION.example_double_thdvar
ERROR HY000: Variable 'old' is a read only variable 1000.500000
UNINSTALL PLUGIN example; UNINSTALL PLUGIN example;
+UNINSTALL PLUGIN MyISAM; +UNINSTALL PLUGIN MyISAM;
+ERROR HY000: Built-in plugins cannot be deleted +ERROR HY000: Built-in plugins cannot be deleted
diff -up mysql-5.5.32/mysql-test/t/plugin.test.pluginerrmsg mysql-5.5.32/mysql-test/t/plugin.test diff -up mysql-5.5.33/mysql-test/t/plugin.test.p30 mysql-5.5.33/mysql-test/t/plugin.test
--- mysql-5.5.32/mysql-test/t/plugin.test.pluginerrmsg 2013-05-16 17:47:14.000000000 +0200 --- mysql-5.5.33/mysql-test/t/plugin.test.p30 2013-07-15 14:01:49.000000000 +0200
+++ mysql-5.5.32/mysql-test/t/plugin.test 2013-07-01 16:07:29.199690210 +0200 +++ mysql-5.5.33/mysql-test/t/plugin.test 2013-08-20 17:26:56.746334059 +0200
@@ -85,3 +85,10 @@ set session sql_mode=@old_sql_mode; @@ -137,3 +137,10 @@ SET SESSION example_double_thdvar = 1000
set session old=bla; SELECT @@SESSION.example_double_thdvar;
UNINSTALL PLUGIN example; UNINSTALL PLUGIN example;
+ +
@ -46,9 +46,9 @@ diff -up mysql-5.5.32/mysql-test/t/plugin.test.pluginerrmsg mysql-5.5.32/mysql-t
+--error ER_PLUGIN_DELETE_BUILTIN +--error ER_PLUGIN_DELETE_BUILTIN
+UNINSTALL PLUGIN MyISAM; +UNINSTALL PLUGIN MyISAM;
+ +
diff -up mysql-5.5.32/sql/share/errmsg-utf8.txt.pluginerrmsg mysql-5.5.32/sql/share/errmsg-utf8.txt diff -up mysql-5.5.33/sql/share/errmsg-utf8.txt.p30 mysql-5.5.33/sql/share/errmsg-utf8.txt
--- mysql-5.5.32/sql/share/errmsg-utf8.txt.pluginerrmsg 2013-05-16 17:47:15.000000000 +0200 --- mysql-5.5.33/sql/share/errmsg-utf8.txt.p30 2013-07-15 14:01:50.000000000 +0200
+++ mysql-5.5.32/sql/share/errmsg-utf8.txt 2013-07-01 16:07:29.203690210 +0200 +++ mysql-5.5.33/sql/share/errmsg-utf8.txt 2013-08-20 17:26:56.750334057 +0200
@@ -6161,7 +6161,7 @@ WARN_NO_MASTER_INFO @@ -6161,7 +6161,7 @@ WARN_NO_MASTER_INFO
WARN_OPTION_IGNORED WARN_OPTION_IGNORED
eng "<%-.64s> option ignored" eng "<%-.64s> option ignored"
@ -58,9 +58,9 @@ diff -up mysql-5.5.32/sql/share/errmsg-utf8.txt.pluginerrmsg mysql-5.5.32/sql/sh
eng "Built-in plugins cannot be deleted" eng "Built-in plugins cannot be deleted"
ger "Eingebaute Plugins können nicht gelöscht werden" ger "Eingebaute Plugins können nicht gelöscht werden"
WARN_PLUGIN_BUSY WARN_PLUGIN_BUSY
diff -up mysql-5.5.32/sql/sql_plugin.cc.pluginerrmsg mysql-5.5.32/sql/sql_plugin.cc diff -up mysql-5.5.33/sql/sql_plugin.cc.p30 mysql-5.5.33/sql/sql_plugin.cc
--- mysql-5.5.32/sql/sql_plugin.cc.pluginerrmsg 2013-07-01 16:07:29.205690210 +0200 --- mysql-5.5.33/sql/sql_plugin.cc.p30 2013-08-20 17:26:56.640334104 +0200
+++ mysql-5.5.32/sql/sql_plugin.cc 2013-07-01 16:07:54.721689764 +0200 +++ mysql-5.5.33/sql/sql_plugin.cc 2013-08-20 17:26:56.752334057 +0200
@@ -1909,9 +1909,7 @@ bool mysql_uninstall_plugin(THD *thd, co @@ -1909,9 +1909,7 @@ bool mysql_uninstall_plugin(THD *thd, co
} }
if (!plugin->plugin_dl) if (!plugin->plugin_dl)