diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-03-20 21:35:03 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-03-20 21:35:03 +0200 |
| commit | e968e3b18f7cbfd51284fc5a8618178c79ec32ab (patch) | |
| tree | d3a53b10ea0018a2433b7c4e230d138a12a838db /mysql-test/r/create.result | |
| parent | 97cd4fb127f4096f2196a71778a15c8183aa7784 (diff) | |
| download | mariadb-git-e968e3b18f7cbfd51284fc5a8618178c79ec32ab.tar.gz | |
After merge fixes
Fixed bug in Item::set_name()
Fix for memory leak with geometry type
mysql-test/r/create.result:
Fixed results after merge
mysql-test/r/innodb.result:
Hack to make test repeatable
(InnoDB's cardinality numbers varies a bit between tests)
mysql-test/r/rpl_relayspace.result:
After merge fix
mysql-test/t/innodb.test:
Hack to make test repeatable
(InnoDB's cardinality numbers varies a bit between tests)
sql/ha_myisam.cc:
Indentation cleanup
sql/item.cc:
Fixed bug in Item::set_name()
sql/password.c:
After merge fix
sql/sql_update.cc:
After merge fix
sql/table.cc:
Fix for memory leak with geometry type
Diffstat (limited to 'mysql-test/r/create.result')
| -rw-r--r-- | mysql-test/r/create.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 136b7272c1d..0780b97890f 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -262,7 +262,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL default '0' -) TYPE=HEAP +) TYPE=HEAP CHARSET=latin1 drop table t1; SET SESSION table_type="gemini"; SELECT @@table_type; @@ -273,6 +273,6 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) NOT NULL default '0' -) TYPE=MyISAM +) TYPE=MyISAM CHARSET=latin1 SET SESSION table_type=default; drop table t1; |