diff options
| author | unknown <guilhem@gbichot4.local> | 2008-04-24 23:13:56 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-04-24 23:13:56 +0200 |
| commit | 5e0fc121fb84723ea73a5d014b519549515435d1 (patch) | |
| tree | 7a6c8e72be83cbb9a131b6703286fac44e860fb4 /sql | |
| parent | 0b421a3e06300321bc746072c5f231b1f5247889 (diff) | |
| download | mariadb-git-5e0fc121fb84723ea73a5d014b519549515435d1.tar.gz | |
No more 'have_maria' variable, use information schema.engines.
Fix for some pushbuild failures.
BitKeeper/deleted/.del-have_maria.require:
Delete: mysql-test/r/have_maria.require
mysql-test/include/have_maria.inc:
no more 'have_maria' variable, use information schema.engines
mysql-test/r/maria-recovery-rtree-ft.result:
removed piece
mysql-test/t/maria-recovery-rtree-ft.test:
This portion seems to break on some pushbuild machine, let's disable
it for now until BUG#36319 is fixed.
sql/set_var.cc:
no more 'have_maria' variable, use information schema.engines
storage/maria/ma_rt_split.c:
On non-debug builds, the logging was wrong
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/set_var.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 483fc713f9b..86bda15b15d 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -659,7 +659,6 @@ static sys_var_have_plugin sys_have_csv(&vars, "have_csv", C_STRING_WITH_LEN("cs static sys_var_have_variable sys_have_dlopen(&vars, "have_dynamic_loading", &have_dlopen); static sys_var_have_variable sys_have_geometry(&vars, "have_geometry", &have_geometry); static sys_var_have_plugin sys_have_innodb(&vars, "have_innodb", C_STRING_WITH_LEN("innodb"), MYSQL_STORAGE_ENGINE_PLUGIN); -static sys_var_have_plugin sys_have_maria(&vars, "have_maria", C_STRING_WITH_LEN("maria"), MYSQL_STORAGE_ENGINE_PLUGIN); static sys_var_have_plugin sys_have_ndbcluster(&vars, "have_ndbcluster", C_STRING_WITH_LEN("ndbcluster"), MYSQL_STORAGE_ENGINE_PLUGIN); static sys_var_have_variable sys_have_openssl(&vars, "have_openssl", &have_ssl); static sys_var_have_variable sys_have_ssl(&vars, "have_ssl", &have_ssl); |