summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/include/master-slave.inc1
-rw-r--r--mysql-test/r/alter_table.result20
-rw-r--r--mysql-test/r/rpl000001.result22
-rw-r--r--mysql-test/r/rpl000003.result1
-rw-r--r--mysql-test/r/rpl000015.result2
-rw-r--r--mysql-test/r/rpl000016.result11
-rw-r--r--mysql-test/t/drop.test4
-rw-r--r--mysql-test/t/union.test14
8 files changed, 40 insertions, 35 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc
index c7c37fd01d3..3cb802fe6d9 100644
--- a/mysql-test/include/master-slave.inc
+++ b/mysql-test/include/master-slave.inc
@@ -3,6 +3,7 @@ connect (master1,localhost,root,,test,0,master.sock);
connect (slave,localhost,root,,test,0,slave.sock);
connect (slave1,localhost,root,,test,0,slave.sock);
connection slave;
+--error 0,1199
!slave stop;
@r/slave-stopped.result show status like 'Slave_running';
connection master;
diff --git a/mysql-test/r/alter_table.result b/mysql-test/r/alter_table.result
index 4d6ef5ada98..f0c3e2d162a 100644
--- a/mysql-test/r/alter_table.result
+++ b/mysql-test/r/alter_table.result
@@ -92,16 +92,16 @@ key (n2, n3, n4, n1),
key (n3, n4, n1, n2),
key (n4, n1, n2, n3) );
alter table t1 disable keys;
- insert into t1 values(10,RAND()*1000,RAND()*1000,RAND());
- insert into t1 values(9,RAND()*1000,RAND()*1000,RAND());
- insert into t1 values(8,RAND()*1000,RAND()*1000,RAND());
- insert into t1 values(7,RAND()*1000,RAND()*1000,RAND());
- insert into t1 values(6,RAND()*1000,RAND()*1000,RAND());
- insert into t1 values(5,RAND()*1000,RAND()*1000,RAND());
- insert into t1 values(4,RAND()*1000,RAND()*1000,RAND());
- insert into t1 values(3,RAND()*1000,RAND()*1000,RAND());
- insert into t1 values(2,RAND()*1000,RAND()*1000,RAND());
- insert into t1 values(1,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(10,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(9,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(8,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(7,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(6,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(5,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(4,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(3,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(2,RAND()*1000,RAND()*1000,RAND());
+insert into t1 values(1,RAND()*1000,RAND()*1000,RAND());
alter table t1 enable keys;
drop table t1;
create table t1 (i int unsigned not null auto_increment primary key);
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index 918f68275fb..e6d6d6dadaa 100644
--- a/mysql-test/r/rpl000001.result
+++ b/mysql-test/r/rpl000001.result
@@ -7,7 +7,7 @@ use test;
drop table if exists t1,t3;
create table t1 (word char(20) not null);
load data infile '../../std_data/words.dat' into table t1;
- load data local infile '$MYSQL_TEST_DIR/std_data/words.dat' into table t1;
+load data local infile '$MYSQL_TEST_DIR/std_data/words.dat' into table t1;
select * from t1;
word
Aarhus
@@ -47,16 +47,16 @@ reset master;
reset slave;
drop table if exists t1,t2;
create table t1(n int);
- insert into t1 values(10);
- insert into t1 values(9);
- insert into t1 values(8);
- insert into t1 values(7);
- insert into t1 values(6);
- insert into t1 values(5);
- insert into t1 values(4);
- insert into t1 values(3);
- insert into t1 values(2);
- insert into t1 values(1);
+insert into t1 values(10);
+insert into t1 values(9);
+insert into t1 values(8);
+insert into t1 values(7);
+insert into t1 values(6);
+insert into t1 values(5);
+insert into t1 values(4);
+insert into t1 values(3);
+insert into t1 values(2);
+insert into t1 values(1);
create table t2(id int);
insert into t2 values(connection_id());
create temporary table t1_temp(n int);
diff --git a/mysql-test/r/rpl000003.result b/mysql-test/r/rpl000003.result
index 6ecb649c152..eb64d1855b1 100644
--- a/mysql-test/r/rpl000003.result
+++ b/mysql-test/r/rpl000003.result
@@ -6,6 +6,7 @@ slave start;
drop table if exists t1;
create table t1(n int primary key);
insert into t1 values (1),(2),(2);
+Duplicate entry '2' for key 1
insert into t1 values (3);
select * from t1;
n
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
index d34c8d21327..6418ac590fe 100644
--- a/mysql-test/r/rpl000015.result
+++ b/mysql-test/r/rpl000015.result
@@ -10,7 +10,7 @@ change master to master_host='127.0.0.1';
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
127.0.0.1 test 9998 60 4 No 0 0 0
- change master to master_host='127.0.0.1',master_user='root',
+change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=$MASTER_MYPORT;
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result
index 899ca3b46b8..3fb94c5b189 100644
--- a/mysql-test/r/rpl000016.result
+++ b/mysql-test/r/rpl000016.result
@@ -1,9 +1,12 @@
slave start;
+Could not initialize master info structure, check permisions on master.info
slave start;
- change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT,
+Could not initialize master info structure, check permisions on master.info
+change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT,
master_user='root';
+Could not initialize master info
reset slave;
- change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT,
+change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT,
master_user='root';
reset master;
slave start;
@@ -57,12 +60,12 @@ master-bin.005
master-bin.006
show master status;
File Position Binlog_do_db Binlog_ignore_db
-master-bin.006 720
+master-bin.006 710
slave stop;
slave start;
show slave status;
Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq
-127.0.0.1 root 9999 60 master-bin.006 720 Yes 0 0 11
+127.0.0.1 root 9999 60 master-bin.006 710 Yes 0 0 11
lock tables t3 read;
select count(*) from t3 where n >= 4;
count(*)
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test
index 38323f5958d..faf0a1a31b4 100644
--- a/mysql-test/t/drop.test
+++ b/mysql-test/t/drop.test
@@ -28,13 +28,13 @@ drop database foo;
# test drop/create database and FLUSH TABLES WITH READ LOCK
drop database if exists foo;
flush tables with read lock;
---error 1209,1219;
+--error 1209,1223;
create database foo;
unlock tables;
create database foo;
show databases;
flush tables with read lock;
---error 1208,1219;
+--error 1208,1223;
drop database foo;
unlock tables;
drop database foo;
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index dc7e036e258..0d391f6f37b 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -22,25 +22,25 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g
# Test some error conditions with UNION
explain select a,b from t1 union all select a,b from t2;
---error 1217
+--error 1221
select a,b from t1 into outfile 'skr' union select a,b from t2;
---error 1217
+--error 1221
select a,b from t1 order by a union select a,b from t2;
---error 1217
+--error 1221
insert into t3 select a from t1 order by a union select a from t2;
---error 1218
+--error 1222
create table t3 select a,b from t1 union select a from t2;
---error 1218
+--error 1222
select a,b from t1 union select a from t2;
---error 1218
+--error 1222
select * from t1 union select a from t2;
---error 1218
+--error 1222
select a from t1 union select * from t2;
# Test CREATE, INSERT and REPLACE
View Lorry Controller Status