[Commits] Rev 2867: merged in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Tue Sep 21 17:24:20 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2867 [merge]
revision-id: sergii at pisem.net-20100921142403-pwhiz9lj3xdd9ihm
parent: sergii at pisem.net-20100921121153-nbi0fbduhvv1db9c
parent: sergii at pisem.net-20100921142130-1ghr7wenwcv1hvks
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Tue 2010-09-21 16:24:03 +0200
message:
  merged
modified:
  config/ac-macros/plugins.m4    sp1f-plugins.m4-20060413204924-cltp6uagmyygsgdno6od3mamfizdhk3m
  mysql-test/mysql-test-run.pl   sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
  mysql-test/r/mysqldump.result  sp1f-mysqldump.result-20030924111344-ly2xhpckbj53fyoa7kllzxyruwj4cg54
  mysql-test/r/upgrade.result    sp1f-upgrade.result-20060217091846-vefhbvl6q255bcptbelqp7boemlf7jyp
  mysql-test/t/mysqldump.test    sp1f-mysqldump.test-20030924111344-fh6llfm45dls3uxwugociq3shkpxsxn3
  mysql-test/t/upgrade.test      sp1f-upgrade.test-20060217091845-b2j6eahffx256stwqu5aki5p55sq2bz3
  sql/sql_plugin.cc              sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a2
-------------- next part --------------
=== modified file 'config/ac-macros/plugins.m4'
--- a/config/ac-macros/plugins.m4	2010-09-21 12:11:53 +0000
+++ b/config/ac-macros/plugins.m4	2010-09-21 14:24:03 +0000
@@ -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(

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-09-16 07:58:57 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-09-21 14:24:03 +0000
@@ -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= [];

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2010-08-02 09:01:24 +0000
+++ b/mysql-test/r/mysqldump.result	2010-09-20 13:17:59 +0000
@@ -1,3 +1,4 @@
+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

=== modified file 'mysql-test/r/upgrade.result'
--- a/mysql-test/r/upgrade.result	2010-09-03 16:20:30 +0000
+++ b/mysql-test/r/upgrade.result	2010-09-20 13:17:59 +0000
@@ -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

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2010-08-02 09:01:24 +0000
+++ b/mysql-test/t/mysqldump.test	2010-09-20 13:17:59 +0000
@@ -1,3 +1,5 @@
+call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
+
 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 

=== modified file 'mysql-test/t/upgrade.test'
--- a/mysql-test/t/upgrade.test	2010-09-07 20:46:10 +0000
+++ b/mysql-test/t/upgrade.test	2010-09-20 13:17:59 +0000
@@ -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
 

=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2010-08-05 19:56:11 +0000
+++ b/sql/sql_plugin.cc	2010-09-21 14:24:03 +0000
@@ -3651,8 +3651,7 @@ void my_print_help_inc_plugins(my_option
     {
       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 */



More information about the commits mailing list