diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-28 15:08:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-28 15:08:12 +0100 |
| commit | e79847d16a0f51137ca46f23af7d5276dce7952d (patch) | |
| tree | be71c60badd9dc5a88b07f968688024c1f09a348 /mysql-test/suite | |
| parent | a293d0788c2425ef702f02b4cce41ed1cf56055f (diff) | |
| download | mariadb-git-e79847d16a0f51137ca46f23af7d5276dce7952d.tar.gz | |
after merge fixes
sql/sql_base.cc:
fix a memory leak
storage/xtradb/handler/ha_innodb.cc:
fix for a visual studio
storage/xtradb/row/row0ins.c:
valgrind complains about uninitialized variable.
incorrect errors in the innodb.test too
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/innodb_gis.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/innodb_mysql.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb_plugin/t/innodb_gis.test b/mysql-test/suite/innodb_plugin/t/innodb_gis.test index ad1d081f29c..3ad20e3dce6 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_gis.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_gis.test @@ -1,4 +1,4 @@ ---source include/have_innodb_plugin.inc +--source include/have_xtradb.inc SET storage_engine=innodb; --source include/gis_generic.inc --source include/gis_keys.inc diff --git a/mysql-test/suite/innodb_plugin/t/innodb_mysql.test b/mysql-test/suite/innodb_plugin/t/innodb_mysql.test index 1cdc1b4e2fe..fc77d9aaa8a 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_mysql.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_mysql.test @@ -5,7 +5,7 @@ # main testing code t/innodb_mysql.test -> include/mix1.inc # --- source include/have_innodb_plugin.inc +-- source include/have_xtradb.inc -- source include/have_query_cache.inc let $engine_type= InnoDB; |