diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-09 10:17:36 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-09 10:17:36 +0200 |
| commit | c4b3f430442a3804fbae6cb8df10e037db2d0852 (patch) | |
| tree | 9582e8e28dfb81478fdd93284475a7289dd35284 | |
| parent | 649977bb4d46da77e1d7958e60ae4fc4bc245c8f (diff) | |
| download | mariadb-git-mariadb-5.2.3.tar.gz | |
Removed version number from test casemariadb-5.2.3
mysql-test/suite/maria/t/compat_aliases.test:
Removed column with version number
sql/sql_show.cc:
Fixed compiler warning
| -rw-r--r-- | mysql-test/suite/maria/r/compat_aliases.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/maria/t/compat_aliases.test | 1 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/suite/maria/r/compat_aliases.result b/mysql-test/suite/maria/r/compat_aliases.result index db33737ebbc..bcc9ece0986 100644 --- a/mysql-test/suite/maria/r/compat_aliases.result +++ b/mysql-test/suite/maria/r/compat_aliases.result @@ -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 diff --git a/mysql-test/suite/maria/t/compat_aliases.test b/mysql-test/suite/maria/t/compat_aliases.test index d48128a3041..7b94d24e643 100644 --- a/mysql-test/suite/maria/t/compat_aliases.test +++ b/mysql-test/suite/maria/t/compat_aliases.test @@ -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 diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 8f1f938d36e..e721175cbe5 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4064,7 +4064,7 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables, } 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; |