database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Georgi Kodinov
2010-12-23 13:39:58 +02:00
parent 764873c0d6 c1fce59c3d
commit bb996a29cc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/r/binlog_unsafe.result
View File

@ -2418,7 +2418,7 @@ INSERT INTO t1 SELECT * FROM t2 LIMIT 1;
DROP TABLE t1,t2; DROP TABLE t1,t2;
"Should NOT have any warning message issued in the following func7() and trig" "Should NOT have any warning message issued in the following func7() and trig"
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
CREATE TABLE t2 (a CHAR(40)); CREATE TABLE t2 (a TEXT);
CREATE TABLE trigger_table (a CHAR(7)); CREATE TABLE trigger_table (a CHAR(7));
CREATE FUNCTION func7() CREATE FUNCTION func7()
RETURNS INT RETURNS INT

2
mysql-test/suite/binlog/t/binlog_unsafe.test
View File

@ -481,7 +481,7 @@ DROP TABLE t1,t2;
--echo "Should NOT have any warning message issued in the following func7() and trig" --echo "Should NOT have any warning message issued in the following func7() and trig"
CREATE TABLE t1 (a INT); CREATE TABLE t1 (a INT);
CREATE TABLE t2 (a CHAR(40)); CREATE TABLE t2 (a TEXT);
CREATE TABLE trigger_table (a CHAR(7)); CREATE TABLE trigger_table (a CHAR(7));
DELIMITER |; DELIMITER |;
CREATE FUNCTION func7() CREATE FUNCTION func7()