merged

config/ac-macros/plugins.m4

@@ -26,7 +26,7 @@ AC_DEFUN([MYSQL_PLUGIN],[
   [__MYSQL_PLUGIN_]AS_TR_CPP([$1])[__],
   m4_default([$2], [$1 plugin]),
   m4_default([$3], [plugin for $1]),
-  m4_default([$4], []),
+  m4_default([[$4]], []),
  )
 ])
 
@@ -61,7 +61,7 @@ dnl
 dnl ---------------------------------------------------------------------------
 
 AC_DEFUN([MYSQL_STORAGE_ENGINE],[
- MYSQL_PLUGIN([$1], [$3], [$4], [[$5]])
+ MYSQL_PLUGIN([$1], [$3], [$4], [$5])
  MYSQL_PLUGIN_DEFINE([$1], [WITH_]AS_TR_CPP([$1])[_STORAGE_ENGINE])
  ifelse([$2],[no],[],[
   _MYSQL_LEGACY_STORAGE_ENGINE(

mysql-test/mysql-test-run.pl

@@ -4247,7 +4247,8 @@ sub extract_warning_lines ($) {
      qr/Slave: Operation DROP USER failed for 'create_rout_db'/,
      qr|Checking table:   '\./mtr/test_suppressions'|,
      qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|,
-     qr|mysqld: Table '\./mtr/test_suppressions' is marked as crashed and should be repaired|
+     qr|mysqld: Table '\./mtr/test_suppressions' is marked as crashed and should be repaired|,
+     qr|InnoDB: Error: table 'test/bug39438'|,
     );
 
   my $matched_lines= [];

mysql-test/r/mysqldump.result

+call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
 # Bug#37938 Test "mysqldump" lacks various insert statements
 # Turn off concurrent inserts to avoid random errors
 # NOTE:  We reset the variable back to saved value at the end of test

mysql-test/r/upgrade.result

@@ -141,10 +141,10 @@ USE `#mysql50#../blablabla`;
 ERROR 42000: Incorrect database name '#mysql50#../blablabla'
 show full tables;
 Tables_in_test	Table_type
-#mysql50#ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com	BASE TABLE
-rename table `#mysql50#ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com` to `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`;
+#mysql50#ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com	BASE TABLE
+rename table `#mysql50#ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com` to `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`;
 show full tables;
 Tables_in_test	Table_type
-ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com	BASE TABLE
-drop table `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`;
+ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com	BASE TABLE
+drop table `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`;
 # End of 5.1 tests

mysql-test/t/mysqldump.test

+call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
+
 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 

mysql-test/t/upgrade.test

@@ -172,13 +172,13 @@ USE `#mysql50#../blablabla`;
 #
 # Test of Bug #56441: mysql_upgrade 5.0->5.1 fails for tables with long names
 #
-copy_file $MYSQL_TEST_DIR/std_data/long_table_name.MYI $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com.MYI;
-copy_file $MYSQL_TEST_DIR/std_data/long_table_name.MYD $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com.MYD;
-copy_file $MYSQL_TEST_DIR/std_data/long_table_name.frm $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com.frm;
+copy_file $MYSQL_TEST_DIR/std_data/long_table_name.MYI $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com.MYI;
+copy_file $MYSQL_TEST_DIR/std_data/long_table_name.MYD $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com.MYD;
+copy_file $MYSQL_TEST_DIR/std_data/long_table_name.frm $MYSQLD_DATADIR/test/ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com.frm;
 show full tables;
-rename table `#mysql50#ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com` to `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`;
+rename table `#mysql50#ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com` to `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`;
 show full tables;
-drop table `ltoriaeinnovacionendesarrolloempres?9120761097220077376?cio_com`;
+drop table `ltoriaeinnovacionendesarrolloempres#9120761097220077376#cio_com`;
 
 --echo # End of 5.1 tests
 

sql/sql_plugin.cc

@@ -3651,8 +3651,7 @@ void my_print_help_inc_plugins(my_option *main_options, uint size)
     {
       p= *dynamic_element(&plugin_array, idx, struct st_plugin_int **);
 
-      if (!p->plugin->system_vars ||
-          !(opt= construct_help_options(&mem_root, p)))
+      if (!(opt= construct_help_options(&mem_root, p)))
         continue;
 
       /* Only options with a non-NULL comment are displayed in help text */