summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2003-06-11 17:07:34 +0200
committerunknown <serg@serg.mylan>2003-06-11 17:07:34 +0200
commit41021a0fc8237411d5977edf9151a4b95f074957 (patch)
tree4ece61ae67b6d95a30be3c4876d37c9ca631ead2 /mysql-test
parent3a4be00416667bc7d3a9dca18f3d771d0b8f912d (diff)
downloadmariadb-git-41021a0fc8237411d5977edf9151a4b95f074957.tar.gz
test result updated
mysql-test/t/rpl_relayrotate.test: when mysqld has no innodb compiled in it's not a bug!
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/type_blob.result2
-rw-r--r--mysql-test/t/rpl_relayrotate.test2
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result
index a537aeeca07..d39f72cbe0b 100644
--- a/mysql-test/r/type_blob.result
+++ b/mysql-test/r/type_blob.result
@@ -29,7 +29,7 @@ drop table t1,t2,t3
CREATE TABLE t1 (a char(257) default "hello");
ERROR 42000: Too big column length for column 'a' (max = 255). Use BLOB instead
CREATE TABLE t2 (a blob default "hello");
-ERROR 42000: BLOB column 'a' can't have a default value
+ERROR 42000: BLOB/TEXT column 'a' can't have a default value
drop table if exists t1,t2;
create table t1 (nr int(5) not null auto_increment,b blob,str char(10), primary key (nr));
insert into t1 values (null,"a","A");
diff --git a/mysql-test/t/rpl_relayrotate.test b/mysql-test/t/rpl_relayrotate.test
index 09cf7cbb741..3df55eea57d 100644
--- a/mysql-test/t/rpl_relayrotate.test
+++ b/mysql-test/t/rpl_relayrotate.test
@@ -14,7 +14,9 @@ source include/master-slave.inc;
connection slave;
stop slave;
connection master;
+--disable_warnings
create table t1 (a int) type=innodb;
+--enable_warnings
let $1=8000;
disable_query_log;
begin;