diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-12-17 11:00:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-12-17 11:00:39 +0100 |
| commit | cb7f5948ecedaaaf68de5bdbfab78f1c2e934453 (patch) | |
| tree | 7204e1cd0161875fca1faaa420e13b25fc01eb18 /mysql-test/r | |
| parent | a058974440f7df7832f4bb9bf5d2783ca040fa66 (diff) | |
| download | mariadb-git-cb7f5948ecedaaaf68de5bdbfab78f1c2e934453.tar.gz | |
simplify the handler api - table_type() is no longer abstract, not even virtual
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/sql_mode.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/variables.result | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result index 6736ca7f541..4fdac6b9cea 100644 --- a/mysql-test/r/sql_mode.result +++ b/mysql-test/r/sql_mode.result @@ -71,7 +71,7 @@ t1 CREATE TABLE `t1` ( `email` varchar(60) NOT NULL DEFAULT '', PRIMARY KEY (`a`), UNIQUE KEY `email` (`email`) -) TYPE=HEAP ROW_FORMAT=DYNAMIC +) TYPE=MEMORY ROW_FORMAT=DYNAMIC set sql_mode="postgresql,oracle,mssql,db2,maxdb"; select @@sql_mode; @@sql_mode diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index e055a333faf..6ec9d77230b 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -211,10 +211,10 @@ VARIABLE_NAME VARIABLE_VALUE DEFAULT_STORAGE_ENGINE MEMORY show global variables like 'default_storage_engine'; Variable_name Value -default_storage_engine MRG_MYISAM +default_storage_engine MRG_MyISAM select * from information_schema.global_variables where variable_name like 'default_storage_engine'; VARIABLE_NAME VARIABLE_VALUE -DEFAULT_STORAGE_ENGINE MRG_MYISAM +DEFAULT_STORAGE_ENGINE MRG_MyISAM set GLOBAL myisam_max_sort_file_size=2000000; Warnings: Warning 1292 Truncated incorrect myisam_max_sort_file_size value: '2000000' |