[Commits] bzr commit into Mariadb 5.2, with Maria 2.0:maria/5.2 branch (monty:2883)

Michael Widenius monty at askmonty.org
Tue Nov 9 10:17:38 EET 2010


#At lp:maria/5.2 based on revid:monty at askmonty.org-20101107114703-nqrn6y92mrckw3s0

 2883 Michael Widenius	2010-11-09
      Removed version number from test case
      modified:
        mysql-test/suite/maria/r/compat_aliases.result
        mysql-test/suite/maria/t/compat_aliases.test
        sql/sql_show.cc

per-file messages:
  mysql-test/suite/maria/t/compat_aliases.test
    Removed column with version number
  sql/sql_show.cc
    Fixed compiler warning
=== modified file 'mysql-test/suite/maria/r/compat_aliases.result'
--- a/mysql-test/suite/maria/r/compat_aliases.result	2010-09-14 21:06:54 +0000
+++ b/mysql-test/suite/maria/r/compat_aliases.result	2010-11-09 08:17:36 +0000
@@ -1,7 +1,7 @@
 select * from information_schema.plugins where plugin_name like '%aria';
 PLUGIN_NAME	PLUGIN_VERSION	PLUGIN_STATUS	PLUGIN_TYPE	PLUGIN_TYPE_VERSION	PLUGIN_LIBRARY	PLUGIN_LIBRARY_VERSION	PLUGIN_AUTHOR	PLUGIN_DESCRIPTION	PLUGIN_LICENSE	PLUGIN_MATURITY	PLUGIN_AUTH_VERSION
-Maria	1.5	ACTIVE	DAEMON	50202.0	NULL	NULL	Monty Program Ab	Compatibility aliases for the Aria engine	GPL	Gamma	1.5
-Aria	1.5	ACTIVE	STORAGE ENGINE	50202.0	NULL	NULL	Monty Program Ab	Crash-safe tables with MyISAM heritage	GPL	Gamma	1.5
+Maria	1.5	ACTIVE	DAEMON	#	NULL	NULL	Monty Program Ab	Compatibility aliases for the Aria engine	GPL	Gamma	1.5
+Aria	1.5	ACTIVE	STORAGE ENGINE	#	NULL	NULL	Monty Program Ab	Crash-safe tables with MyISAM heritage	GPL	Gamma	1.5
 select maria_vars.variable_name, aria_vars.variable_name from
 information_schema.session_variables as maria_vars left join
 information_schema.session_variables as aria_vars

=== modified file 'mysql-test/suite/maria/t/compat_aliases.test'
--- a/mysql-test/suite/maria/t/compat_aliases.test	2010-09-16 07:04:59 +0000
+++ b/mysql-test/suite/maria/t/compat_aliases.test	2010-11-09 08:17:36 +0000
@@ -3,6 +3,7 @@
 #  command-line options). They should match aria* variables.
 #
 
+--replace_column 5 #
 select * from information_schema.plugins where plugin_name like '%aria';
 
 select maria_vars.variable_name, aria_vars.variable_name from

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-10-29 18:29:43 +0000
+++ b/sql/sql_show.cc	2010-11-09 08:17:36 +0000
@@ -4064,7 +4064,7 @@ static int get_schema_tables_record(THD
   }
   else
   {
-    char option_buff[350],*ptr;
+    char option_buff[350];
     String str(option_buff,sizeof(option_buff), system_charset_info);
     TABLE *show_table= tables->table;
     TABLE_SHARE *share= show_table->s;



More information about the commits mailing list