mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Two bug fixes

Browse source 
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.
This commit is contained in:
unknown 2004-01-16 20:05:08 +02:00
parent 306a903b37
commit c217c4867b
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mysql-test/t/mysqldump.test
View file

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

3
sql/sql_union.cc
View file

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