Commit 9e008bd7 authored by Michael Widenius's avatar Michael Widenius

Removed version number from test case

mysql-test/suite/maria/t/compat_aliases.test:
  Removed column with version number
sql/sql_show.cc:
  Fixed compiler warning
parent 18292caa
select * from information_schema.plugins where plugin_name like '%aria'; 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 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 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 50202.0 NULL NULL Monty Program Ab Crash-safe tables with MyISAM heritage 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 select maria_vars.variable_name, aria_vars.variable_name from
information_schema.session_variables as maria_vars left join information_schema.session_variables as maria_vars left join
information_schema.session_variables as aria_vars information_schema.session_variables as aria_vars
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# command-line options). They should match aria* variables. # command-line options). They should match aria* variables.
# #
--replace_column 5 #
select * from information_schema.plugins where plugin_name like '%aria'; select * from information_schema.plugins where plugin_name like '%aria';
select maria_vars.variable_name, aria_vars.variable_name from select maria_vars.variable_name, aria_vars.variable_name from
......
...@@ -4064,7 +4064,7 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables, ...@@ -4064,7 +4064,7 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables,
} }
else else
{ {
char option_buff[350],*ptr; char option_buff[350];
String str(option_buff,sizeof(option_buff), system_charset_info); String str(option_buff,sizeof(option_buff), system_charset_info);
TABLE *show_table= tables->table; TABLE *show_table= tables->table;
TABLE_SHARE *share= show_table->s; TABLE_SHARE *share= show_table->s;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment