diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-14 01:50:16 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-14 01:50:16 +0400 |
| commit | aad8a2980ddcac154aabe40673690b98995b1751 (patch) | |
| tree | 597553c14e8dcab7c5bfb67dbe15d9df9edd0072 /mysql-test | |
| parent | 508e75c259a88638999822cccdc66c271769a167 (diff) | |
| parent | 23de53f538c4798b5b3f7ce1461a38c7c3cad505 (diff) | |
| download | mariadb-git-aad8a2980ddcac154aabe40673690b98995b1751.tar.gz | |
Merge-in Sanja's post-merge fix
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/maria/r/compat_aliases.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/maria/r/compat_aliases.result b/mysql-test/suite/maria/r/compat_aliases.result index db33737ebbc..22150cc680b 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 50300.0 NULL NULL Monty Program Ab Compatibility aliases for the Aria engine GPL Gamma 1.5 +Aria 1.5 ACTIVE STORAGE ENGINE 50300.0 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 |