Commit b763c011 authored by unknown's avatar unknown
Browse files

merge 


sql/ha_federated.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents 9a7ec951 b34d5bd2

mysql-test/r/func_time.result

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ explain extended select period_add("9602",-12),period_diff(199505,"9404"),from_d 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

Warnings:

Note	1003	select sql_no_cache period_add(_latin1'9602',-(12)) AS `period_add("9602",-12)`,period_diff(199505,_latin1'9404') AS `period_diff(199505,"9404")`,from_days(to_days(_latin1'960101')) AS `from_days(to_days("960101"))`,dayofmonth(_latin1'1997-01-02') AS `dayofmonth("1997-01-02")`,month(_latin1'1997-01-02') AS `month("1997-01-02")`,monthname(_latin1'1972-03-04') AS `monthname("1972-03-04")`,dayofyear(_latin1'0000-00-00') AS `dayofyear("0000-00-00")`,hour(_latin1'1997-03-03 23:03:22') AS `HOUR("1997-03-03 23:03:22")`,minute(_latin1'23:03:22') AS `MINUTE("23:03:22")`,second(230322) AS `SECOND(230322)`,quarter(980303) AS `QUARTER(980303)`,week(_latin1'1998-03-03',0) AS `WEEK("1998-03-03")`,yearweek(_latin1'2000-01-01',1) AS `yearweek("2000-01-01",1)`,week(19950101,1) AS `week(19950101,1)`,year(_latin1'98-02-03') AS `year("98-02-03")`,(weekday(to_days(curdate())) - weekday(to_days(now()))) AS `weekday(curdate())-weekday(now())`,dayname(to_days(_latin1'1962-03-03')) AS `dayname("1962-03-03")`,unix_timestamp() AS `unix_timestamp()`,sec_to_time((time_to_sec(_latin1'0:30:47') / 6.21)) AS `sec_to_time(time_to_sec("0:30:47")/6.21)`,curtime() AS `curtime()`,utc_time() AS `utc_time()`,curdate() AS `curdate()`,utc_date() AS `utc_date()`,utc_timestamp() AS `utc_timestamp()`,date_format(_latin1'1997-01-02 03:04:05',_latin1'%M %W %D %Y %y %m %d %h %i %s %w') AS `date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w")`,from_unixtime(unix_timestamp(_latin1'1994-03-02 10:11:12')) AS `from_unixtime(unix_timestamp("1994-03-02 10:11:12"))`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `"1997-12-31 23:59:59" + INTERVAL 1 SECOND`,(_latin1'1998-01-01 00:00:00' - interval 1 second) AS `"1998-01-01 00:00:00" - INTERVAL 1 SECOND`,(_latin1'1997-12-31' + interval 1 day) AS `INTERVAL 1 DAY + "1997-12-31"`,extract(year from _latin1'1999-01-02 10:11:12') AS `extract(YEAR FROM "1999-01-02 10:11:12")`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND)`

Note	1003	select sql_no_cache period_add(_latin1'9602',-(12)) AS `period_add("9602",-12)`,period_diff(199505,_latin1'9404') AS `period_diff(199505,"9404")`,from_days(to_days(_latin1'960101')) AS `from_days(to_days("960101"))`,dayofmonth(_latin1'1997-01-02') AS `dayofmonth("1997-01-02")`,month(_latin1'1997-01-02') AS `month("1997-01-02")`,monthname(_latin1'1972-03-04') AS `monthname("1972-03-04")`,dayofyear(_latin1'0000-00-00') AS `dayofyear("0000-00-00")`,hour(_latin1'1997-03-03 23:03:22') AS `HOUR("1997-03-03 23:03:22")`,minute(_latin1'23:03:22') AS `MINUTE("23:03:22")`,second(230322) AS `SECOND(230322)`,quarter(980303) AS `QUARTER(980303)`,week(_latin1'1998-03-03',0) AS `WEEK("1998-03-03")`,yearweek(_latin1'2000-01-01',1) AS `yearweek("2000-01-01",1)`,week(19950101,1) AS `week(19950101,1)`,year(_latin1'98-02-03') AS `year("98-02-03")`,(weekday(curdate()) - weekday(now())) AS `weekday(curdate())-weekday(now())`,dayname(_latin1'1962-03-03') AS `dayname("1962-03-03")`,unix_timestamp() AS `unix_timestamp()`,sec_to_time((time_to_sec(_latin1'0:30:47') / 6.21)) AS `sec_to_time(time_to_sec("0:30:47")/6.21)`,curtime() AS `curtime()`,utc_time() AS `utc_time()`,curdate() AS `curdate()`,utc_date() AS `utc_date()`,utc_timestamp() AS `utc_timestamp()`,date_format(_latin1'1997-01-02 03:04:05',_latin1'%M %W %D %Y %y %m %d %h %i %s %w') AS `date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w")`,from_unixtime(unix_timestamp(_latin1'1994-03-02 10:11:12')) AS `from_unixtime(unix_timestamp("1994-03-02 10:11:12"))`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `"1997-12-31 23:59:59" + INTERVAL 1 SECOND`,(_latin1'1998-01-01 00:00:00' - interval 1 second) AS `"1998-01-01 00:00:00" - INTERVAL 1 SECOND`,(_latin1'1997-12-31' + interval 1 day) AS `INTERVAL 1 DAY + "1997-12-31"`,extract(year from _latin1'1999-01-02 10:11:12') AS `extract(YEAR FROM "1999-01-02 10:11:12")`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND)`

SET @TMP=NOW();

CREATE TABLE t1 (d DATETIME);

INSERT INTO t1 VALUES (NOW());

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

+43 −0
Original line number Diff line number Diff line
@@ -2205,3 +2205,46 @@ select * from (select f1 as f2 from v1) v where v.f2='a'; 
f2

drop view v1;

drop table t1;

CREATE TABLE t1 (date DATE NOT NULL);

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 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 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 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

SELECT DAYNAME(date) FROM t1;

DAYNAME(date)

Tuesday

SELECT * FROM v1;

DAYNAME(date)

Tuesday

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

DAYOFWEEK('2005-09-06')

3

SELECT DAYOFWEEK(date) FROM t1;

DAYOFWEEK(date)

3

SELECT * FROM v2;

DAYOFWEEK(date)

3

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

WEEKDAY('2005-09-06')

1

SELECT WEEKDAY(date) FROM t1;

WEEKDAY(date)

1

SELECT * FROM v3;

WEEKDAY(date)

1

DROP TABLE t1;

DROP VIEW  v1, v2, v3;

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