diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 07:50:11 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 07:50:11 +0100 |
commit | c39877071a5ce8ba3c8dc7a1963e3c542e6cc83b (patch) | |
tree | cbab9d6a8cf2f5dd167bbffbddd92ebec30700eb /sql/handler.cc | |
parent | ae0a7cfd5f75d80b4b0540258daa0e2ed051cd1b (diff) | |
download | mariadb-git-c39877071a5ce8ba3c8dc7a1963e3c542e6cc83b.tar.gz |
overlay support for mysql-test-run and mysqltest
mysql-test-run auto-disables all optional plugins.
mysql-test/include/default_client.cnf:
no @OPT.plugindir anymore
mysql-test/include/default_mysqld.cnf:
don't disable plugins manually - mtr can do it better
mysql-test/suite/innodb/t/innodb_bug47167.test:
mtr now uses suite-dir as an include path
mysql-test/suite/innodb/t/innodb_file_format.test:
mtr now uses suite-dir as an include path
mysql-test/t/partition_binlog.test:
this test uses partitions
storage/example/mysql-test/mtr/t/source.result:
update results. as mysqltest includes the correct overlayed include
storage/innobase/handler/ha_innodb.cc:
the assert is wrong
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 516f61c8700..57049e87d31 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -155,7 +155,7 @@ redo: if ((plugin= my_plugin_lock_by_name(thd, name, MYSQL_STORAGE_ENGINE_PLUGIN))) { handlerton *hton= plugin_data(plugin, handlerton *); - if (!(hton->flags & HTON_NOT_USER_SELECTABLE)) + if (hton && !(hton->flags & HTON_NOT_USER_SELECTABLE)) return plugin; /* |