mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/mysql-5.1-new
This commit is contained in:
@@ -994,12 +994,25 @@ create view v2 as select * from v0;
|
||||
|
||||
select * from v2;
|
||||
--exec $MYSQL_DUMP -x --skip-comments --databases test
|
||||
|
||||
drop view v2;
|
||||
drop view v0;
|
||||
drop view v1;
|
||||
drop table t1;
|
||||
|
||||
# Check new --replace option
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1;
|
||||
--enable_warnings
|
||||
|
||||
CREATE TABLE t1(a int, b int);
|
||||
INSERT INTO t1 VALUES (1,1);
|
||||
INSERT INTO t1 VALUES (2,3);
|
||||
INSERT INTO t1 VALUES (3,4), (4,5);
|
||||
--exec $MYSQL_DUMP --replace --skip-comments test t1
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
#
|
||||
# BUG#14554 - mysqldump does not separate words "ROW" and "BEGIN"
|
||||
# for tables with trigger created in the IGNORE_SPACE sql mode.
|
||||
@@ -1022,4 +1035,3 @@ SET SQL_MODE = @old_sql_mode;
|
||||
--exec $MYSQL_DUMP --skip-comments --databases test
|
||||
|
||||
DROP TRIGGER tr1;
|
||||
DROP TABLE t1;
|
||||
|
||||
Reference in New Issue
Block a user