Commit bbd6c0d3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0 

into  mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_base.cc:
  Auto merged
parents 232d1ff4 b34d5bd2

mysql-test/r/rpl_ddl.result

+182 −0
Original line number Diff line number Diff line
@@ -1072,6 +1072,188 @@ Database (mysqltest3) 
mysqltest3



-------- switch to master -------



######## CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1"  ########



-------- switch to master -------

INSERT INTO t1 SET f1= 15 + 1;

SELECT MAX(f1) FROM t1;

MAX(f1)

16



-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

15



-------- switch to master -------

CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1";

SELECT MAX(f1) FROM t1;

MAX(f1)

16



-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

16



-------- switch to master -------

ROLLBACK;

SELECT MAX(f1) FROM t1;

MAX(f1)

16



TEST-INFO: MASTER: The INSERT is committed (Succeeded)



-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

16



TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)



-------- switch to master -------

flush logs;



-------- switch to slave --------

flush logs;



-------- switch to master -------

SHOW PROCEDURE STATUS LIKE 'p1';

Db	mysqltest1

Name	p1

Type	PROCEDURE

Definer	root@localhost

Modified	#

Created	#

Security_type	DEFINER

Comment	

	-------- switch to slave -------

SHOW PROCEDURE STATUS LIKE 'p1';

Db	mysqltest1

Name	p1

Type	PROCEDURE

Definer	@

Modified	#

Created	#

Security_type	DEFINER

Comment	



######## ALTER PROCEDURE p1 COMMENT "I have been altered"  ########



-------- switch to master -------

INSERT INTO t1 SET f1= 16 + 1;

SELECT MAX(f1) FROM t1;

MAX(f1)

17



-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

16



-------- switch to master -------

ALTER PROCEDURE p1 COMMENT "I have been altered";

SELECT MAX(f1) FROM t1;

MAX(f1)

17



-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

17



-------- switch to master -------

ROLLBACK;

SELECT MAX(f1) FROM t1;

MAX(f1)

17



TEST-INFO: MASTER: The INSERT is committed (Succeeded)



-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

17



TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)



-------- switch to master -------

flush logs;



-------- switch to slave --------

flush logs;



-------- switch to master -------

SHOW PROCEDURE STATUS LIKE 'p1';

Db	mysqltest1

Name	p1

Type	PROCEDURE

Definer	root@localhost

Modified	#

Created	#

Security_type	DEFINER

Comment	I have been altered

	-------- switch to slave -------

SHOW PROCEDURE STATUS LIKE 'p1';

Db	mysqltest1

Name	p1

Type	PROCEDURE

Definer	@

Modified	#

Created	#

Security_type	DEFINER

Comment	I have been altered



######## DROP PROCEDURE p1  ########



-------- switch to master -------

INSERT INTO t1 SET f1= 17 + 1;

SELECT MAX(f1) FROM t1;

MAX(f1)

18



-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

17



-------- switch to master -------

DROP PROCEDURE p1;

SELECT MAX(f1) FROM t1;

MAX(f1)

18



-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

18



-------- switch to master -------

ROLLBACK;

SELECT MAX(f1) FROM t1;

MAX(f1)

18



TEST-INFO: MASTER: The INSERT is committed (Succeeded)



-------- switch to slave --------

SELECT MAX(f1) FROM t1;

MAX(f1)

18



TEST-INFO: SLAVE:  The INSERT is committed (Succeeded)



-------- switch to master -------

flush logs;



-------- switch to slave --------

flush logs;



-------- switch to master -------

SHOW PROCEDURE STATUS LIKE 'p1';

	-------- switch to slave -------

SHOW PROCEDURE STATUS LIKE 'p1';

DROP DATABASE IF EXISTS mysqltest1;

DROP DATABASE IF EXISTS mysqltest2;

DROP DATABASE IF EXISTS mysqltest3;

mysql-test/r/rpl_view.result

+1 −2
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ drop view v1; 
select * from v1 order by a;

ERROR 42S02: Table 'test.v1' doesn't exist

drop table t1;

show binlog events;

show binlog events limit 1,100;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000001	#	Format_desc	2	#	Server ver: 5.0.13-beta-debug-log, Binlog ver: 4

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

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

slave-bin.000001	#	Query	1	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW v1 AS select a from t1

mysql-test/r/view.result

+3 −3
Original line number Diff line number Diff line
@@ -2210,15 +2210,15 @@ INSERT INTO t1 VALUES ('2005-09-06'); 
CREATE VIEW v1 AS SELECT DAYNAME(date) FROM t1;

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `v1` AS select dayname(`t1`.`date`) AS `DAYNAME(date)` from `t1`

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select dayname(`t1`.`date`) AS `DAYNAME(date)` from `t1`

CREATE VIEW v2 AS SELECT DAYOFWEEK(date) FROM t1;

SHOW CREATE VIEW v2;

View	Create View

v2	CREATE ALGORITHM=UNDEFINED VIEW `v2` AS select dayofweek(`t1`.`date`) AS `DAYOFWEEK(date)` from `t1`

v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select dayofweek(`t1`.`date`) AS `DAYOFWEEK(date)` from `t1`

CREATE VIEW v3 AS SELECT WEEKDAY(date) FROM t1;

SHOW CREATE VIEW v3;

View	Create View

v3	CREATE ALGORITHM=UNDEFINED VIEW `v3` AS select weekday(`t1`.`date`) AS `WEEKDAY(date)` from `t1`

v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select weekday(`t1`.`date`) AS `WEEKDAY(date)` from `t1`

SELECT DAYNAME('2005-09-06');

DAYNAME('2005-09-06')

Tuesday

mysql-test/t/rpl_ddl.test

+52 −1
Original line number Diff line number Diff line
@@ -340,6 +340,57 @@ connection master; 
SELECT '-------- switch to master -------' as "";

--enable_query_log



# End of 4.1 tests



###############################################################

# Cases with stored procedures

###############################################################

let $my_stmt= CREATE PROCEDURE p1() READS SQL DATA SELECT "this is p1";

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

--vertical_results

--replace_column 5 # 6 #

SHOW PROCEDURE STATUS LIKE 'p1';

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

--replace_column 5 # 6 #

SHOW PROCEDURE STATUS LIKE 'p1';

connection master;

--horizontal_results



let $my_stmt= ALTER PROCEDURE p1 COMMENT "I have been altered";

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

--vertical_results

--replace_column 5 # 6 #

SHOW PROCEDURE STATUS LIKE 'p1';

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

--replace_column 5 # 6 #

SHOW PROCEDURE STATUS LIKE 'p1';

connection master;

--horizontal_results



let $my_stmt= DROP PROCEDURE p1;

let $my_master_commit= true;

let $my_slave_commit= true;

--source include/rpl_stmt_seq.inc

--vertical_results

SHOW PROCEDURE STATUS LIKE 'p1';

--disable_query_log

SELECT '-------- switch to slave -------' as "";

--enable_query_log

connection slave;

SHOW PROCEDURE STATUS LIKE 'p1';

connection master;

--horizontal_results



###############################################################

# Cleanup

###############################################################
@@ -349,4 +400,4 @@ DROP DATABASE IF EXISTS mysqltest2; 
DROP DATABASE IF EXISTS mysqltest3;

--enable_warnings



# End of 4.1 tests

mysql-test/t/rpl_view.test

+1 −1
Original line number Diff line number Diff line
@@ -44,4 +44,4 @@ connection master; 
drop table t1;

sync_slave_with_master;

--replace_column 2 # 5 #

show binlog events;
 
show binlog events limit 1,100;