summaryrefslogtreecommitdiff
path: root/mysql-test/r/case.result
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-11-18 13:47:27 +0200
committermonty@mashka.mysql.fi <>2003-11-18 13:47:27 +0200
commitcab1dc628c116f042a3fd8dbc505f7ca2df599a3 (patch)
tree0a23d90c946c5f05a8c160fc7c6ef3f05505fc79 /mysql-test/r/case.result
parentf277c9f88a4a2e392e44cfdb6b3f4785b6c730d0 (diff)
downloadmariadb-git-cab1dc628c116f042a3fd8dbc505f7ca2df599a3.tar.gz
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables. ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set (One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set) Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib) New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones) Removed compiler warnings Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
Diffstat (limited to 'mysql-test/r/case.result')
-rw-r--r--mysql-test/r/case.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result
index 4aab3defa2b..9b03422f54c 100644
--- a/mysql-test/r/case.result
+++ b/mysql-test/r/case.result
@@ -103,7 +103,7 @@ t1 CREATE TABLE `t1` (
`c6` char(3) default NULL,
`c7` double(3,1) default NULL,
`c8` double(3,1) default NULL
-) TYPE=MyISAM CHARSET=latin1
+) TYPE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
SELECT CASE
WHEN 1
@@ -150,5 +150,5 @@ t1 CREATE TABLE `t1` (
`COALESCE(1,'1')` char(1) NOT NULL default '',
`COALESCE(1.1,'1')` char(3) NOT NULL default '',
`COALESCE('a' COLLATE latin1_bin,'b')` char(1) character set latin1 collate latin1_bin NOT NULL default ''
-) TYPE=MyISAM CHARSET=latin1
+) TYPE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;