From: Staale Smedseng
Date: April 22 2010 1:52pm
Subject: bzr commit into mysql-5.1-bugteam branch (staale.smedseng:3356) Bug#46261
List-Archive: http://lists.mysql.com/commits/106364
X-Bug: 46261
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4851697593025223467=="

--===============4851697593025223467==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/tmp/ss156133/z/46261-51/ based on revid:kristofer.pettersson@stripped

 3356 Staale Smedseng	2010-04-22
      Bug#46261 Plugins can be installed with --skip-grant-tables
      
      Previously installed dynamic plugins are explicitly not loaded
      on startup with --skip-grant-tables enabled. However, INSTALL
      PLUGIN/UNINSTALL PLUGIN commands are allowed, and result in
      inconsistent error messages (reporting duplicate plugin or
      plugin does not exist).
      
      This patch adds a check for --skip-grant-tables mode, and
      returns error ER_OPTION_PREVENTS_STATEMENT to the user when
      the above commands are attempted.

    added:
      mysql-test/r/bug46261.result
      mysql-test/t/bug46261-master.opt
      mysql-test/t/bug46261.test
    modified:
      sql/sql_plugin.cc
=== added file 'mysql-test/r/bug46261.result'
--- a/mysql-test/r/bug46261.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/bug46261.result	2010-04-22 13:52:00 +0000
@@ -0,0 +1,8 @@
+#
+# Bug#46261 Plugins can be installed with --skip-grant-tables
+#
+INSTALL PLUGIN example SONAME 'ha_example.so';
+ERROR HY000: The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement
+UNINSTALL PLUGIN example;
+ERROR HY000: The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement
+End of 5.1 tests

=== added file 'mysql-test/t/bug46261-master.opt'
--- a/mysql-test/t/bug46261-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/bug46261-master.opt	2010-04-22 13:52:00 +0000
@@ -0,0 +1 @@
+--skip-grant-tables $EXAMPLE_PLUGIN_OPT

=== added file 'mysql-test/t/bug46261.test'
--- a/mysql-test/t/bug46261.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/bug46261.test	2010-04-22 13:52:00 +0000
@@ -0,0 +1,16 @@
+--source include/not_embedded.inc
+--source include/have_example_plugin.inc
+
+--echo #
+--echo # Bug#46261 Plugins can be installed with --skip-grant-tables
+--echo #
+
+--replace_regex /\.dll/.so/
+--error ER_OPTION_PREVENTS_STATEMENT
+eval INSTALL PLUGIN example SONAME $HA_EXAMPLE_SO;
+
+--replace_regex /\.dll/.so/
+--error ER_OPTION_PREVENTS_STATEMENT
+eval UNINSTALL PLUGIN example;
+
+--echo End of 5.1 tests

=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2010-04-16 13:02:23 +0000
+++ b/sql/sql_plugin.cc	2010-04-22 13:52:00 +0000
@@ -1665,6 +1665,12 @@ bool mysql_install_plugin(THD *thd, cons
   struct st_plugin_int *tmp;
   DBUG_ENTER("mysql_install_plugin");
 
+  if (opt_noacl)
+  {
+    my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--skip-grant-tables");
+    DBUG_RETURN(TRUE);
+  }
+
   bzero(&tables, sizeof(tables));
   tables.db= (char *)"mysql";
   tables.table_name= tables.alias= (char *)"plugin";
@@ -1741,6 +1747,12 @@ bool mysql_uninstall_plugin(THD *thd, co
   struct st_plugin_int *plugin;
   DBUG_ENTER("mysql_uninstall_plugin");
 
+  if (opt_noacl)
+  {
+    my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--skip-grant-tables");
+    DBUG_RETURN(TRUE);
+  }
+
   bzero(&tables, sizeof(tables));
   tables.db= (char *)"mysql";
   tables.table_name= tables.alias= (char *)"plugin";


--===============4851697593025223467==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/staale.smedseng@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: staale.smedseng@stripped
# target_branch: file:///export/home/tmp/ss156133/z/46261-51/
# testament_sha1: 7327ced5912a61679dc1cbfd045f406a818756a1
# timestamp: 2010-04-22 15:52:05 +0200
# base_revision_id: kristofer.pettersson@stripped\
#   24ar0rrqdbytwte8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX8uUuUAA9rfgEAQXef//3fn
/2S////6YAiOny2UDoBkLHcNAG7ABdoSijKaJ4ifqJtNNNDUekZGmgAABkNANBJUAak80NKepkGg
aGhoyA000DQAADjJk0MRiaMAjATCAMBNNGmRoBhJNRJ6ontTUzyp5R5DSeo9INPU9PUNCaGgGIGT
Q4yZNDEYmjAIwEwgDATTRpkaAYSSBDQEMmgmCNEjaYppGnqPUeoZqYmj02qK74ajqvVVk4tKWpqC
MU9bvoLNehwFaM1GEvD42w5bDy5SCu3XssU42WNXobK77nWfuvTUSgSwlitk8zMeFz/vUr+Pytls
4JAIUk6TZs61c4zQEWgxIfpRbUVQ1/YJmRCyb7bjCVZmTMsjarR6tA/fHJJ3lN3SpIUIQo8vQjuf
uagenZpyzP0/tGJx6UFEgZSD1bxOZ3EaYkmUcjIk6cog51A4sjEH085QDsYiZFKcZEANRHrD5tvR
Qp9WhwbxRjoyU4qjqXrqS0seX4gnB0TY2RSmucyFOkMSJcEQRaoP5GSPieQzEgzmCsw7poNJr7xy
16ALEzBSOMQntNIOEwK1QL+zMXd8BOpOgjkSvXbQJOpKBHDG0FlI4jzuBH7DQkKxZpLiGspaY0bs
GZU6IgHf9UwwXUQY7p9BkTBVNwhM37FJgkh5AYd4uEil8B6q2QJDQHRSREyHETMkUHMZxRIZFRR2
+kT2niV71z0hjQ5NWvuIuAjASPlZQrTTWGAqiOiRRK+mftoynWC+5FqsFTcCYutxcEBiJaaKE/TS
69a7yslK1Fh4JYGgExDHCy58JFKa2YKK1DCRarxiJqEDhBPMmQZKopWiRehMp1ZZ6IJVh9BfS4vt
mOdgaaanlyOKkFQMmKiMcWgURcHOemsGVEhfdiLY3VGVMsSdaQLcEQpGWIwgePuyDVnUVXH4L4aE
FhWWOLFrHi2IyNKLzUas7x5QpbDcbbcVGEJmRMpwCyRtiJUn736pnhuDSMWGBi8nSWsQBfzyHHoK
oyIRrFSWlNWToFw9ImQgPJoVZvvJLyLywfYcgVRuFYWmQ4uMSIxuLD11GwXLb69pMuymW6XVDP44
Huh8tZvmO4DazsN20rwKDYUmkVxIeaDZpqrlXOdTMrbh2o0nYnBHHlcqqZlZYVDz3xja60E8YcnH
sYXQfwMHBYfeLUJ7Tm4ZFonTRdelK//f8Af1znKtiEHrgdWZjUVDehqyIQRcDMmoNOJyvSL0nL2k
1ALmFyncNHZs0ggIUHWe+3fNB+jtNaaHo+qHkl8T5pfp6/6Iy/uVoJQX/RNi0nD7UUi+p9T9xMkx
qQxUH1ReN4FycKQhno9U5GgUjEpRhAVAnp9A8gVomUky4ZEajmaBPRFEOVUUVpF6HoyIImUF1hpS
9DpGNpQlwNRItrrReaMQ/CjftOLeDzTBjISZ8E3JmfVOkILZCMJhMZIYDmMA0l4zOSX9aKIBE8RS
Yso0ifdUChOJJ7sKEl5zAycT/iKtMiO4rhIRDKlGqQTJRPyQELWXukyPD2U8iYzHWXYCktmYanSF
0I0it7Cr6iqqsSUyok0s6jiEeJSC2NFMIkhCKOQh8EgMCJSdg8/HhZV+VewHtQ5iI6xART4EU5hk
ytbqDLcZQW4wKBaC8kKBDgXAuw1nzOKsCktIl2HdcQH0NxRtyMo6CaSnCkE3QOqbcdWeFpsW9Ssi
kmGDI7NSmC+b4r/Os5GRZWMSPYGXeio5IzkbKiJJ6sc02AfvjY43k60/DY1JXrfpsj40x2k3T3El
MhQGpMkMQZ6yV2b+ksiZYRXQImoM2ObB1H4KgTMYBRSnd5scCoLCxhmClBxFOstOzwTbw2UDxxAe
QOhmihUo0fqGkLkcik2c4B+e14blyGQOEtneIdkQEe4FyNVQL19kDPeHew3e3QR+bvKJ8BjGHWEB
4TtO/egiWa+6Lm18uoKg3ngjh1BbUKJE8BeI4v5pNGwkEQ/p1k/fQMIyqEaBfbIYgkd8sVE3C259
pIJ+W0FkdTEqGEzBVsNyUxHT05jzwKi24guL19gSwBhJzginDkNIPakebz0FRUMjHXS4PtsT7SpL
4riP2YPzPJAcAk5dJjJjGJf2EOSIRHzLuXJyCF1hM1RuBBRI4WmD7G0q6oovAyFC3EBDQp30cMy6
jUaiGlBR0hMJPq8iY88B5WY6d2msGscFimIZJzAMvGjxDYcGWzmXnR9vXQUroCLV7mFWmDpClHmv
MqWEBTScrxyvRj4Fpby0/HfARFLiZXo393cJ90UXBir95AVvntq5A3oUa6Kb7xn2ogxpF+ph1lsN
y5ZpdpdysRgN2ucNiwnpk9LhQIsIqSYF3HPPetvt2ugG1k+4n1WowWf4YZ0ZBmgmL70yKjFxXcOI
KocjwVoOZg7EMe8UROYZuJxOCvqSWjttKnI0osSLXBvEXFwqtwlMZWqR70bWczHNXLNNcyPphSUi
YMAjYqM0yoSgL/yAdIjEdmvsZteBU8ePMiQjqdsplUQpKe8BjzYSyEMBQZn8VKiBtkDBtVixENpE
47mXvw3Dxqx5KExGheQzisTNaBbFMS3BVNplkZbjaI9y4EEhEjhwIRQbLBPccROfcaVjiHgBMsU5
FSskcALQN8v4ZpihKlSlehwEhki2EWdYP+RWQxQtL1SLNP1aEbn2ECVugFZSVB/i7kinChIP5cpc
oA==


--===============4851697593025223467==--