Commit 924dadef authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

merged new 3.23 errors 

fixed bugs in log seq - now starting to look good
fixes for SHOW BINLOG EVENTS
will push this one
parent b86ffcef

include/mysqld_error.h

+6 −4
Original line number Diff line number Diff line
@@ -208,7 +208,9 @@ 
#define ER_LOCK_WAIT_TIMEOUT 1205

#define ER_LOCK_TABLE_FULL 1206

#define ER_READ_ONLY_TRANSACTION 1207

#define ER_CONNECT_TO_MASTER 1208

#define ER_QUERY_ON_MASTER 1209

#define ER_SHOW_BINLOG_EVENTS 1210

#define ER_ERROR_MESSAGES 211
 
#define ER_DROP_DB_WITH_READ_LOCK 1208

#define ER_CREATE_DB_WITH_READ_LOCK 1209

#define ER_CONNECT_TO_MASTER 1210

#define ER_QUERY_ON_MASTER 1211

#define ER_SHOW_BINLOG_EVENTS 1212

#define ER_ERROR_MESSAGES 213

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ run_testcase () 
 slave_master_info_file=$TESTDIR/$tname-slave-master-info.opt

 SKIP_SLAVE=`$EXPR \( $tname : rpl \) = 0`

 if [ -n $SKIP_TEST ] ; then 

   SKIP_THIS_TEST=`$EXPR \( $tname : '$SKIP_TEST' \) != 0`

   SKIP_THIS_TEST=`$EXPR \( $tname : "$SKIP_TEST" \) != 0`

   if [ x$SKIP_THIS_TEST = x1 ] ;

   then

    return;

mysql-test/r/drop.result

+7 −0
Original line number Diff line number Diff line
@@ -2,3 +2,10 @@ n 
1

n

4

Database

foo

mysql

test

Database

mysql

test

mysql-test/r/rpl_log.result

+13 −15
Original line number Diff line number Diff line
@@ -28,24 +28,22 @@ master-bin.001 549 Stop 1 10 
Log_name	Pos	Event_type	Server_id	Log_seq	Info

master-bin.002	4	Start	1	1	Server ver: 4.0.0-debug-log, Binlog ver: 2

Log_name

master-bin.001

master-bin.002

Log_name

slave-bin.001

slave-bin.002

slave-bin.003

slave-bin.004

Log_name	Pos	Event_type	Server_id	Log_seq	Info

slave-bin.001	4	Start	2	1	Server ver: 4.0.0-debug-log, Binlog ver: 2

slave-bin.001	79	Slave	2	2	

slave-bin.001	118	Rotate	2	3	slave-bin.002

slave-bin.001	150	Stop	2	4	

slave-bin.001	79	Slave	2	2	host=127.0.0.1,port=9306,log=master-bin.001,pos=4

slave-bin.001	132	Query	1	2	use test; create table t1(n int not null auto_increment primary key)

slave-bin.001	225	Intvar	1	3	INSERT_ID=1

slave-bin.001	253	Query	1	4	use test; insert into t1 values (NULL)

slave-bin.001	316	Query	1	5	use test; drop table t1

slave-bin.001	364	Query	1	6	use test; create table t1 (word char(20) not null)

slave-bin.001	439	Query	1	8	use test; drop table t1

slave-bin.001	487	Rotate	2	3	slave-bin.002

slave-bin.001	519	Stop	2	4	

Log_name	Pos	Event_type	Server_id	Log_seq	Info

slave-bin.002	4	Start	2	1	Server ver: 4.0.0-debug-log, Binlog ver: 2

slave-bin.002	79	Slave	1	2	

slave-bin.002	132	Slave	1	3	

slave-bin.002	185	Query	1	4	use test; create table t1(n int not null auto_increment primary key)

slave-bin.002	278	Intvar	2	5	INSERT_ID=1

slave-bin.002	306	Query	1	6	use test; insert into t1 values (NULL)

slave-bin.002	369	Query	1	7	use test; drop table t1

slave-bin.002	417	Query	1	8	use test; create table t1 (word char(20) not null)

slave-bin.002	492	Query	1	9	use test; drop table t1

slave-bin.002	540	Rotate	2	10	slave-bin.003

slave-bin.002	572	Stop	2	11	
slave-bin.002	79	Slave	2	2	host=127.0.0.1,port=9306,log=master-bin.002,pos=4

mysql-test/t/drop.test

+15 −0
Original line number Diff line number Diff line
@@ -24,3 +24,18 @@ select * from foo.foo; 
drop database if exists foo;

create database foo;

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

create database foo;

unlock tables;

create database foo;

show databases;

flush tables with read lock;

--error 1208

drop database foo;

unlock tables;

drop database foo;

show databases;