diff options
| author | jimw@mysql.com <> | 2005-03-11 15:06:03 -0800 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-03-11 15:06:03 -0800 |
| commit | f463143158457006a13b1247b148ba64d788bb93 (patch) | |
| tree | e5e15b4cd92168d2818da27ee55ed116ed8b2eca /mysql-test | |
| parent | c56a00ec98bd117022bd3e02e3cf11e7007bee5e (diff) | |
| download | mariadb-git-f463143158457006a13b1247b148ba64d788bb93.tar.gz | |
Update tests and test results after merge, disable broken NDB tests
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/information_schema.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/query_cache.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/query_cache.test | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index e1270168493..e65924bfcbe 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -505,7 +505,7 @@ proc body blob proc definer char(77) proc created timestamp proc modified timestamp -proc sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO') +proc sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') proc comment char(64) drop table t115; create procedure p108 () begin declare c cursor for select data_type diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 3becb9546e2..6863534b2d8 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -957,6 +957,7 @@ drop table t1; select table_name from information_schema.tables where table_schema="test"; table_name +SET SESSION query_cache_type = 1; set global query_cache_size=1024*1024; flush query cache; create table t1 ( a int ); diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index f393ce69cfa..6a3d22d2695 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -698,6 +698,7 @@ drop table t1; select table_name from information_schema.tables where table_schema="test"; # Bug #8480: REPAIR TABLE needs to flush the table from the query cache +SET SESSION query_cache_type = 1; set global query_cache_size=1024*1024; flush query cache; create table t1 ( a int ); |