summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl_heap.result
diff options
context:
space:
mode:
authorunknown <brian@zim.tangent.org>2006-02-12 13:26:30 -0800
committerunknown <brian@zim.tangent.org>2006-02-12 13:26:30 -0800
commit48d435b16f6d071fe2726f80c3dc080f5632cb21 (patch)
treea998c1754983b8b4aba1c4acc4ff63214d4b3bef /mysql-test/r/rpl_heap.result
parentdc11d498b25d6b2fd909b344f3f2837571cb38b0 (diff)
downloadmariadb-git-48d435b16f6d071fe2726f80c3dc080f5632cb21.tar.gz
This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.
BitKeeper/deleted/.del-raid.test~501e9e00b3c27a55: Delete: mysql-test/t/raid.test mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Test change mysql-test/r/binlog_stm_mix_innodb_myisam.result: New results mysql-test/r/ctype_ujis.result: New results mysql-test/r/innodb_concurrent.result: New results. mysql-test/r/rpl_heap.result: New results mysql-test/r/warnings.result: New results mysql-test/t/ctype_ujis.test: Fixed ENGINE=, test should now actually function mysql-test/t/innodb_concurrent.test: Fixed test for engine mysql-test/t/rpl_heap.test: Fixed test for engine mysql-test/t/system_mysql_db_fix.test: Fixed setup. mysql-test/t/warnings.test: Removed deprecated tests scripts/fill_func_tables.sh: Fixed script scripts/mysql_convert_table_format.sh: Fixed script sql/ha_innodb.cc: Fixed comment sql/sql_yacc.yy: Removed deprecated syntax tests/fork_big.pl: Fixed scipt tests/fork_big2.pl: Fixed script tests/mail_to_db.pl: Fixed script tests/mysql_client_test.c: Fixed test
Diffstat (limited to 'mysql-test/r/rpl_heap.result')
-rw-r--r--mysql-test/r/rpl_heap.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_heap.result b/mysql-test/r/rpl_heap.result
index 1facbcb7676..d0ef7e541b2 100644
--- a/mysql-test/r/rpl_heap.result
+++ b/mysql-test/r/rpl_heap.result
@@ -1,10 +1,10 @@
reset master;
drop table if exists t1;
-create table t1 type=HEAP select 10 as a;
+create table t1 ENGINE=HEAP select 10 as a;
insert into t1 values(11);
show binlog events from 79;
Log_name Pos Event_type Server_id Orig_log_pos Info
-master-bin.001 79 Query 1 79 use `test`; create table t1 type=HEAP select 10 as a
+master-bin.001 79 Query 1 79 use `test`; create table t1 ENGINE=HEAP select 10 as a
master-bin.001 154 Query 1 154 use `test`; insert into t1 values(11)
reset slave;
start slave;
@@ -12,7 +12,7 @@ show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` bigint(2) NOT NULL default '0'
-) TYPE=HEAP
+) ENGINE=HEAP
select * from t1;
a
10