diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-01-16 20:05:08 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-01-16 20:05:08 +0200 |
| commit | c217c4867bcf3933f7d889a9eeb41902b9e19261 (patch) | |
| tree | a3a923141e8d5eced121b526394773aa8e5ea3e2 | |
| parent | 306a903b3776f5aaf43318a6d1eef6c31f015cac (diff) | |
| download | mariadb-git-c217c4867bcf3933f7d889a9eeb41902b9e19261.tar.gz | |
Two bug fixes
mysql-test/t/mysqldump.test:
Fixing a test to encompass latest Jani's patch to mysqldump.c
sql/sql_union.cc:
Fix for the unlock problem with a typo correction.
| -rw-r--r-- | mysql-test/t/mysqldump.test | 12 | ||||
| -rw-r--r-- | sql/sql_union.cc | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 1299d73eb99..21004c8c305 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -6,7 +6,7 @@ DROP TABLE IF EXISTS t1, `"t"1`; CREATE TABLE t1(a int); INSERT INTO t1 VALUES (1), (2); ---exec $MYSQL_DUMP --skip-all --skip-comments -X test t1 +--exec $MYSQL_DUMP --disable-quote --skip-all --skip-comments -X test t1 DROP TABLE t1; # @@ -16,7 +16,7 @@ DROP TABLE t1; CREATE TABLE t1 (a decimal(240, 20)); INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"), ("0987654321098765432109876543210987654321"); ---exec $MYSQL_DUMP --skip-comments test t1 +--exec $MYSQL_DUMP --disable-quote --skip-comments test t1 DROP TABLE t1; # @@ -28,12 +28,12 @@ INSERT INTO t1 VALUES (-9e999999); # The following replaces is here because some systems replaces the above # double with '-inf' and others with MAX_DOUBLE --replace_result (-1.79769313486232e+308) (RES) (NULL) (RES) ---exec $MYSQL_DUMP --skip-comments test t1 +--exec $MYSQL_DUMP --disable-quote --skip-comments test t1 DROP TABLE t1; CREATE TABLE t1(a int, b text, c varchar(3)); INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES"); ---exec $MYSQL_DUMP --skip-all --skip-comments -X test t1 +--exec $MYSQL_DUMP --disable-quote --skip-all --skip-comments -X test t1 DROP TABLE t1; # @@ -42,7 +42,7 @@ DROP TABLE t1; CREATE TABLE t1 (`a"b"` char(2)); INSERT INTO t1 VALUES ("1\""), ("\"2"); ---exec $MYSQL_DUMP --skip-all --skip-comments -X test t1 +--exec $MYSQL_DUMP --disable-quote --skip-all --skip-comments -X test t1 DROP TABLE t1; # @@ -51,5 +51,5 @@ DROP TABLE t1; CREATE TABLE t1 (a VARCHAR(255)) DEFAULT CHARSET koi8r; INSERT INTO t1 VALUES (_koi8r x'C1C2C3C4C5'); ---exec $MYSQL_DUMP --skip-comments test t1 +--exec $MYSQL_DUMP --disable-quote --skip-comments test t1 DROP TABLE t1; diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 25620229844..cdf8173e1b3 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -145,8 +145,9 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result) for (;sl; sl= sl->next_select()) { + sl->options|= SELECT_NO_UNLOCK; JOIN *join= new JOIN(thd_arg, sl->item_list, - sl->options | thd_arg->options | SELECT_NO_UNLOCK, + sl->options | thd_arg->options, tmp_result); thd_arg->lex->current_select= sl; offset_limit_cnt= sl->offset_limit; |