Commit 5438ab9c authored by unknown's avatar unknown
Browse files

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 

into  dsl-hkigw8-febefb00-148.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug22027_create_select_exists


sql/sql_show.cc:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  SCCS merged
parents 81eb1ccd 61c9a7d5

mysql-test/extra/binlog_tests/binlog.test

+13 −0
Original line number Diff line number Diff line
@@ -59,4 +59,17 @@ insert into t1 values(null); 
select * from t1;

drop table t1;



# bug#22027 

create table t1 (a int);

create table if not exists t2 select * from t1;



# bug#22762

create temporary table tt1 (a int);

create table if not exists t3 like tt1;



--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

show binlog events;

drop table t1,t2,t3,tt1;



-- source extra/binlog_tests/binlog_insert_delayed.test

mysql-test/r/binlog_row_binlog.result

+27 −0
Original line number Diff line number Diff line
@@ -245,6 +245,25 @@ select * from t1; 
id

127

drop table t1;

create table t1 (a int);

create table if not exists t2 select * from t1;

create temporary table tt1 (a int);

create table if not exists t3 like tt1;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Format_desc	1	#	Server ver: 5.1.12-beta-debug-log, Binlog ver: 4

master-bin.000001	#	Query	1	#	use `test`; create table t1 (id tinyint auto_increment primary key)

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; drop table t1

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE IF NOT EXISTS `t2` (

  `a` int(11) DEFAULT NULL

)

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE IF NOT EXISTS `t3` (

  `a` int(11) DEFAULT NULL

)

drop table t1,t2,t3,tt1;

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

insert delayed into t1 values (207);
@@ -256,6 +275,14 @@ master-bin.000001 # Query 1 # use `test`; create table t1 (id tinyint auto_incre 
master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `test`; drop table t1

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE IF NOT EXISTS `t2` (

  `a` int(11) DEFAULT NULL

)

master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE IF NOT EXISTS `t3` (

  `a` int(11) DEFAULT NULL

)

master-bin.000001	#	Query	1	#	use `test`; DROP TABLE `t1`,`t2`,`t3` /* generated by server */

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

mysql-test/r/binlog_stm_binlog.result

+21 −0
Original line number Diff line number Diff line
@@ -155,6 +155,22 @@ select * from t1; 
id

127

drop table t1;

create table t1 (a int);

create table if not exists t2 select * from t1;

create temporary table tt1 (a int);

create table if not exists t3 like tt1;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Format_desc	1	#	Server ver: 5.1.12-beta-debug-log, Binlog ver: 4

master-bin.000001	#	Query	1	#	use `test`; create table t1 (id tinyint auto_increment primary key)

master-bin.000001	#	Intvar	1	#	INSERT_ID=127

master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(null)

master-bin.000001	#	Query	1	#	use `test`; drop table t1

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)

master-bin.000001	#	Query	1	#	use `test`; create table if not exists t2 select * from t1

master-bin.000001	#	Query	1	#	use `test`; create temporary table tt1 (a int)

master-bin.000001	#	Query	1	#	use `test`; create table if not exists t3 like tt1

drop table t1,t2,t3,tt1;

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

insert delayed into t1 values (207);
@@ -166,6 +182,11 @@ master-bin.000001 # Query 1 # use `test`; create table t1 (id tinyint auto_incre 
master-bin.000001	#	Intvar	1	#	INSERT_ID=127

master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(null)

master-bin.000001	#	Query	1	#	use `test`; drop table t1

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)

master-bin.000001	#	Query	1	#	use `test`; create table if not exists t2 select * from t1

master-bin.000001	#	Query	1	#	use `test`; create temporary table tt1 (a int)

master-bin.000001	#	Query	1	#	use `test`; create table if not exists t3 like tt1

master-bin.000001	#	Query	1	#	use `test`; drop table t1,t2,t3,tt1

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

sql/sql_show.cc

+3 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, 
    packet->append(STRING_WITH_LEN("CREATE TEMPORARY TABLE "));

  else

    packet->append(STRING_WITH_LEN("CREATE TABLE "));

  if (create_info_arg &&

      (create_info_arg->options & HA_LEX_CREATE_IF_NOT_EXISTS))

    packet->append(STRING_WITH_LEN("IF NOT EXISTS "));

  if (table_list->schema_table)

    alias= table_list->schema_table->table_name;

  else