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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
48450308
Commit
48450308
authored
Oct 09, 2008
by
Gleb Shchepa
Browse files
Options
Browse Files
Download
Plain Diff
manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc
parents
d72b63f6
abf603bc
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
239 additions
and
1 deletion
+239
-1
mysql-test/r/lock_multi.result
mysql-test/r/lock_multi.result
+18
-0
mysql-test/t/lock_multi.test
mysql-test/t/lock_multi.test
+201
-0
sql/sql_union.cc
sql/sql_union.cc
+0
-1
sql/sql_update.cc
sql/sql_update.cc
+20
-0
No files found.
mysql-test/r/lock_multi.result
View file @
48450308
...
@@ -112,6 +112,24 @@ CREATE TABLE t3 SELECT * FROM t1;
...
@@ -112,6 +112,24 @@ CREATE TABLE t3 SELECT * FROM t1;
# normal mode
# normal mode
# PS mode
# PS mode
DROP TABLE t1, t2, t3;
DROP TABLE t1, t2, t3;
CREATE TABLE t1( a INT, b INT );
INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4);
# 1. test regular tables
# 1.1. test altering of columns that multiupdate doesn't use
# 1.1.1. normal mode
# 1.1.2. PS mode
# 1.2. test altering of columns that multiupdate uses
# 1.2.1. normal mode
# 1.2.2. PS mode
ALTER TABLE t1 ADD COLUMN a INT;
# 2. test UNIONs
# 2.1. test altering of columns that multiupdate doesn't use
# 2.1.1. normal mode
# 2.1.2. PS mode
# 2.2. test altering of columns that multiupdate uses
# 2.2.1. normal mode
# 2.2.2. PS mode
DROP TABLE t1;
End of 5.0 tests
End of 5.0 tests
create table t1 (i int);
create table t1 (i int);
lock table t1 read;
lock table t1 read;
...
...
mysql-test/t/lock_multi.test
View file @
48450308
...
@@ -412,6 +412,207 @@ while ($i) {
...
@@ -412,6 +412,207 @@ while ($i) {
DROP
TABLE
t1
,
t2
,
t3
;
DROP
TABLE
t1
,
t2
,
t3
;
#
#
# Bug#38499: flush tables and multitable table update with derived table cause
# crash
#
CREATE
TABLE
t1
(
a
INT
,
b
INT
);
INSERT
INTO
t1
VALUES
(
1
,
1
),
(
2
,
2
),
(
3
,
3
),
(
4
,
4
);
--
echo
# 1. test regular tables
--
echo
# 1.1. test altering of columns that multiupdate doesn't use
--
echo
# 1.1.1. normal mode
--
disable_query_log
let
$i
=
100
;
while
(
$i
)
{
--
dec
$i
--
connection
writer
send
UPDATE
t1
,
(
SELECT
1
FROM
t1
t1i
)
d
SET
a
=
0
WHERE
1
=
0
;
--
connection
locker
ALTER
TABLE
t1
ADD
COLUMN
(
c
INT
);
ALTER
TABLE
t1
DROP
COLUMN
c
;
--
connection
writer
--
reap
}
--
echo
# 1.1.2. PS mode
--
connection
writer
PREPARE
stmt
FROM
'UPDATE t1, (SELECT 1 FROM t1 t1i) d SET a = 0 WHERE 1=0'
;
let
$i
=
100
;
while
(
$i
)
{
--
dec
$i
--
connection
writer
--
send
EXECUTE
stmt
--
connection
locker
ALTER
TABLE
t1
ADD
COLUMN
(
c
INT
);
ALTER
TABLE
t1
DROP
COLUMN
c
;
--
connection
writer
--
reap
}
--
enable_query_log
--
echo
# 1.2. test altering of columns that multiupdate uses
--
echo
# 1.2.1. normal mode
--
connection
default
--
disable_query_log
let
$i
=
100
;
while
(
$i
)
{
dec
$i
;
--
connection
locker
--
error
0
,
1060
ALTER
TABLE
t1
ADD
COLUMN
a
int
(
11
)
unsigned
default
NULL
;
UPDATE
t1
SET
a
=
b
;
--
connection
writer
--
send
UPDATE
t1
,
(
SELECT
1
FROM
t1
t1i
)
d
SET
a
=
0
WHERE
1
=
0
;
--
connection
locker
--
error
0
,
1091
ALTER
TABLE
t1
DROP
COLUMN
a
;
--
connection
writer
--
error
0
,
1054
# unknown column error
--
reap
}
--
enable_query_log
--
echo
# 1.2.2. PS mode
--
disable_query_log
let
$i
=
100
;
while
(
$i
)
{
dec
$i
;
--
connection
locker
--
error
0
,
1060
ALTER
TABLE
t1
ADD
COLUMN
a
INT
;
UPDATE
t1
SET
a
=
b
;
--
connection
writer
PREPARE
stmt
FROM
'UPDATE t1, (SELECT 1 FROM t1 t1i) d SET a = 0 WHERE 1=0'
;
--
send
EXECUTE
stmt
--
connection
locker
--
error
0
,
1091
ALTER
TABLE
t1
DROP
COLUMN
a
;
--
connection
writer
--
error
0
,
1054
# Unknown column 'a' in 'field list'
--
reap
}
--
enable_query_log
--
connection
default
ALTER
TABLE
t1
ADD
COLUMN
a
INT
;
--
echo
# 2. test UNIONs
--
echo
# 2.1. test altering of columns that multiupdate doesn't use
--
echo
# 2.1.1. normal mode
--
disable_query_log
let
$i
=
100
;
while
(
$i
)
{
--
dec
$i
--
connection
writer
send
UPDATE
t1
,
((
SELECT
1
FROM
t1
t1i
)
UNION
(
SELECT
2
FROM
t1
t1ii
))
e
SET
a
=
0
WHERE
1
=
0
;
--
connection
locker
ALTER
TABLE
t1
ADD
COLUMN
(
c
INT
);
ALTER
TABLE
t1
DROP
COLUMN
c
;
--
connection
writer
--
reap
}
--
echo
# 2.1.2. PS mode
--
connection
writer
PREPARE
stmt
FROM
'UPDATE t1, ((SELECT 1 FROM t1 t1i) UNION (SELECT 2 FROM t1 t1ii)) e SET a = 0 WHERE 1=0'
;
let
$i
=
100
;
while
(
$i
)
{
--
dec
$i
--
connection
writer
--
send
EXECUTE
stmt
--
connection
locker
ALTER
TABLE
t1
ADD
COLUMN
(
c
INT
);
ALTER
TABLE
t1
DROP
COLUMN
c
;
--
connection
writer
--
reap
}
--
enable_query_log
--
echo
# 2.2. test altering of columns that multiupdate uses
--
echo
# 2.2.1. normal mode
--
connection
default
--
disable_query_log
let
$i
=
100
;
while
(
$i
)
{
dec
$i
;
--
connection
locker
--
error
0
,
1060
ALTER
TABLE
t1
ADD
COLUMN
a
int
(
11
)
unsigned
default
NULL
;
UPDATE
t1
SET
a
=
b
;
--
connection
writer
--
send
UPDATE
t1
,
((
SELECT
1
FROM
t1
t1i
)
UNION
(
SELECT
2
FROM
t1
t1ii
))
e
SET
a
=
0
WHERE
1
=
0
;
--
connection
locker
--
error
0
,
1091
ALTER
TABLE
t1
DROP
COLUMN
a
;
--
connection
writer
--
error
0
,
1054
# Unknown column 'a' in 'field list'
--
reap
}
--
enable_query_log
--
echo
# 2.2.2. PS mode
--
disable_query_log
let
$i
=
100
;
while
(
$i
)
{
dec
$i
;
--
connection
locker
--
error
0
,
1060
ALTER
TABLE
t1
ADD
COLUMN
a
INT
;
UPDATE
t1
SET
a
=
b
;
--
connection
writer
PREPARE
stmt
FROM
'UPDATE t1, ((SELECT 1 FROM t1 t1i) UNION (SELECT 2 FROM t1 t1ii)) e SET a = 0 WHERE 1=0'
;
--
send
EXECUTE
stmt
--
connection
locker
--
error
0
,
1091
ALTER
TABLE
t1
DROP
COLUMN
a
;
--
connection
writer
--
error
0
,
1054
# Unknown column 'a' in 'field list'
--
reap
}
--
enable_query_log
--
connection
default
DROP
TABLE
t1
;
--
echo
End
of
5.0
tests
--
echo
End
of
5.0
tests
...
...
sql/sql_union.cc
View file @
48450308
...
@@ -399,7 +399,6 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
...
@@ -399,7 +399,6 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
}
}
else
else
{
{
DBUG_ASSERT
(
!
thd
->
stmt_arena
->
is_conventional
());
/*
/*
We're in execution of a prepared statement or stored procedure:
We're in execution of a prepared statement or stored procedure:
reset field items to point at fields from the created temporary table.
reset field items to point at fields from the created temporary table.
...
...
sql/sql_update.cc
View file @
48450308
...
@@ -1099,6 +1099,26 @@ int mysql_multi_update_prepare(THD *thd)
...
@@ -1099,6 +1099,26 @@ int mysql_multi_update_prepare(THD *thd)
for
(
TABLE_LIST
*
tbl
=
table_list
;
tbl
;
tbl
=
tbl
->
next_global
)
for
(
TABLE_LIST
*
tbl
=
table_list
;
tbl
;
tbl
=
tbl
->
next_global
)
tbl
->
cleanup_items
();
tbl
->
cleanup_items
();
/*
To not to hog memory (as a result of the
unit->reinit_exec_mechanism() call below):
*/
lex
->
unit
.
cleanup
();
for
(
SELECT_LEX
*
sl
=
lex
->
all_selects_list
;
sl
;
sl
=
sl
->
next_select_in_list
())
{
SELECT_LEX_UNIT
*
unit
=
sl
->
master_unit
();
unit
->
reinit_exec_mechanism
();
// reset unit->prepared flags
/*
Reset 'clean' flag back to force normal execution of
unit->cleanup() in Prepared_statement::cleanup_stmt()
(call to lex->unit.cleanup() above sets this flag to TRUE).
*/
unit
->
unclean
();
}
/*
/*
Also we need to cleanup Natural_join_column::table_field items.
Also we need to cleanup Natural_join_column::table_field items.
To not to traverse a join tree we will cleanup whole
To not to traverse a join tree we will cleanup whole
...
...
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