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
caa031e0
Commit
caa031e0
authored
17 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge stella.local:/home2/mydev/mysql-5.1-ateam
into stella.local:/home2/mydev/mysql-5.1-axmrg
parents
1e94ef77
86421674
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
8 deletions
+5
-8
mysql-test/r/merge.result
mysql-test/r/merge.result
+0
-4
mysql-test/t/merge.test
mysql-test/t/merge.test
+0
-2
sql/sql_trigger.cc
sql/sql_trigger.cc
+5
-2
No files found.
mysql-test/r/merge.result
View file @
caa031e0
...
@@ -1875,10 +1875,6 @@ CHECK TABLE t1 EXTENDED;
...
@@ -1875,10 +1875,6 @@ CHECK TABLE t1 EXTENDED;
Table Op Msg_type Msg_text
Table Op Msg_type Msg_text
test.t1 check status OK
test.t1 check status OK
LOCK TABLES t2 WRITE, t1 WRITE;
LOCK TABLES t2 WRITE, t1 WRITE;
SELECT * FROM t2;
c1
1
LOCK TABLES t2 WRITE, t1 WRITE;
REPAIR TABLE t1;
REPAIR TABLE t1;
Table Op Msg_type Msg_text
Table Op Msg_type Msg_text
test.t1 repair status OK
test.t1 repair status OK
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/merge.test
View file @
caa031e0
...
@@ -1279,8 +1279,6 @@ CHECK TABLE t1 EXTENDED;
...
@@ -1279,8 +1279,6 @@ CHECK TABLE t1 EXTENDED;
#
#
# Not using FLUSH TABLES before REPAIR.
# Not using FLUSH TABLES before REPAIR.
LOCK
TABLES
t2
WRITE
,
t1
WRITE
;
LOCK
TABLES
t2
WRITE
,
t1
WRITE
;
SELECT
*
FROM
t2
;
LOCK
TABLES
t2
WRITE
,
t1
WRITE
;
REPAIR
TABLE
t1
;
REPAIR
TABLE
t1
;
CHECK
TABLE
t1
;
CHECK
TABLE
t1
;
REPAIR
TABLE
t1
;
REPAIR
TABLE
t1
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_trigger.cc
View file @
caa031e0
...
@@ -489,8 +489,11 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
...
@@ -489,8 +489,11 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create)
/* Under LOCK TABLES we must reopen the table to activate the trigger. */
/* Under LOCK TABLES we must reopen the table to activate the trigger. */
if
(
!
result
&&
thd
->
locked_tables
)
if
(
!
result
&&
thd
->
locked_tables
)
{
{
close_data_files_and_morph_locks
(
thd
,
table
->
s
->
db
.
str
,
/*
table
->
s
->
table_name
.
str
);
Must not use table->s->db.str or table->s->table_name.str here.
The strings are used in a loop even after the share may be freed.
*/
close_data_files_and_morph_locks
(
thd
,
tables
->
db
,
tables
->
table_name
);
thd
->
in_lock_tables
=
1
;
thd
->
in_lock_tables
=
1
;
result
=
reopen_tables
(
thd
,
1
,
0
);
result
=
reopen_tables
(
thd
,
1
,
0
);
thd
->
in_lock_tables
=
0
;
thd
->
in_lock_tables
=
0
;
...
...
This diff is collapsed.
Click to expand it.
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