1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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
This commit is contained in:
unknown
2003-03-20 21:35:03 +02:00
parent 97cd4fb127
commit e968e3b18f
9 changed files with 42 additions and 30 deletions

View File

@ -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;