Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
d0123ed5
Commit
d0123ed5
authored
Jan 22, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
parents
63f3d3d2
862b0622
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
mysql-test/t/mysqldump.test
mysql-test/t/mysqldump.test
+6
-6
sql/sql_union.cc
sql/sql_union.cc
+1
-0
No files found.
mysql-test/t/mysqldump.test
View file @
d0123ed5
...
@@ -6,7 +6,7 @@ DROP TABLE IF EXISTS t1, `"t"1`;
...
@@ -6,7 +6,7 @@ DROP TABLE IF EXISTS t1, `"t"1`;
CREATE
TABLE
t1
(
a
int
);
CREATE
TABLE
t1
(
a
int
);
INSERT
INTO
t1
VALUES
(
1
),
(
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
;
DROP
TABLE
t1
;
#
#
...
@@ -16,7 +16,7 @@ DROP TABLE t1;
...
@@ -16,7 +16,7 @@ DROP TABLE t1;
CREATE
TABLE
t1
(
a
decimal
(
240
,
20
));
CREATE
TABLE
t1
(
a
decimal
(
240
,
20
));
INSERT
INTO
t1
VALUES
(
"1234567890123456789012345678901234567890"
),
INSERT
INTO
t1
VALUES
(
"1234567890123456789012345678901234567890"
),
(
"0987654321098765432109876543210987654321"
);
(
"0987654321098765432109876543210987654321"
);
--
exec
$MYSQL_DUMP
--
skip
-
comments
test
t1
--
exec
$MYSQL_DUMP
--
disable
-
quote
--
skip
-
comments
test
t1
DROP
TABLE
t1
;
DROP
TABLE
t1
;
#
#
...
@@ -28,12 +28,12 @@ INSERT INTO t1 VALUES (-9e999999);
...
@@ -28,12 +28,12 @@ INSERT INTO t1 VALUES (-9e999999);
# The following replaces is here because some systems replaces the above
# The following replaces is here because some systems replaces the above
# double with '-inf' and others with MAX_DOUBLE
# double with '-inf' and others with MAX_DOUBLE
--
replace_result
(
-
1.79769313486232e+308
)
(
RES
)
(
NULL
)
(
RES
)
--
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
;
DROP
TABLE
t1
;
CREATE
TABLE
t1
(
a
int
,
b
text
,
c
varchar
(
3
));
CREATE
TABLE
t1
(
a
int
,
b
text
,
c
varchar
(
3
));
INSERT
INTO
t1
VALUES
(
1
,
"test"
,
"tes"
),
(
2
,
"TEST"
,
"TES"
);
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
;
DROP
TABLE
t1
;
#
#
...
@@ -42,7 +42,7 @@ DROP TABLE t1;
...
@@ -42,7 +42,7 @@ DROP TABLE t1;
CREATE
TABLE
t1
(
`a"b"`
char
(
2
));
CREATE
TABLE
t1
(
`a"b"`
char
(
2
));
INSERT
INTO
t1
VALUES
(
"1
\"
"
),
(
"
\"
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
;
DROP
TABLE
t1
;
#
#
...
@@ -51,5 +51,5 @@ DROP TABLE t1;
...
@@ -51,5 +51,5 @@ DROP TABLE t1;
CREATE
TABLE
t1
(
a
VARCHAR
(
255
))
DEFAULT
CHARSET
koi8r
;
CREATE
TABLE
t1
(
a
VARCHAR
(
255
))
DEFAULT
CHARSET
koi8r
;
INSERT
INTO
t1
VALUES
(
_koi8r
x
'C1C2C3C4C5'
);
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
;
DROP
TABLE
t1
;
sql/sql_union.cc
View file @
d0123ed5
...
@@ -146,6 +146,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
...
@@ -146,6 +146,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
for
(;
sl
;
sl
=
sl
->
next_select
())
for
(;
sl
;
sl
=
sl
->
next_select
())
{
{
sl
->
options
|=
SELECT_NO_UNLOCK
;
JOIN
*
join
=
new
JOIN
(
thd_arg
,
sl
->
item_list
,
JOIN
*
join
=
new
JOIN
(
thd_arg
,
sl
->
item_list
,
sl
->
options
|
thd_arg
->
options
|
additional_options
,
sl
->
options
|
thd_arg
->
options
|
additional_options
,
tmp_result
);
tmp_result
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment