1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed version number from test case

Browse Source 
mysql-test/suite/maria/t/compat_aliases.test:
  Removed column with version number
sql/sql_show.cc:
  Fixed compiler warning
This commit is contained in:
Michael Widenius 2010-11-09 10:17:36 +02:00
parent 18292caa48
commit 9e008bd726
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/maria/r/compat_aliases.result
View File

@ -1,7 +1,7 @@
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

1
mysql-test/suite/maria/t/compat_aliases.test
View File

@ -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

2
sql/sql_show.cc
View File

@ -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;