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
e3ced7ad
Commit
e3ced7ad
authored
Jun 06, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1-rpl
into mysql.com:/home/alexi/innodb/mysql-4.1-ss31
parents
774fae9c
3eb8a12c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
innobase/row/row0mysql.c
innobase/row/row0mysql.c
+10
-10
No files found.
innobase/row/row0mysql.c
View file @
e3ced7ad
...
@@ -2237,14 +2237,14 @@ do not allow the discard. We also reserve the data dictionary latch. */
...
@@ -2237,14 +2237,14 @@ do not allow the discard. We also reserve the data dictionary latch. */
}
}
}
}
funct_exit:
funct_exit:
trx_commit_for_mysql
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
if
(
graph
)
{
if
(
graph
)
{
que_graph_free
(
graph
);
que_graph_free
(
graph
);
}
}
trx_commit_for_mysql
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
return
((
int
)
err
);
return
((
int
)
err
);
...
@@ -2374,10 +2374,10 @@ row_import_tablespace_for_mysql(
...
@@ -2374,10 +2374,10 @@ row_import_tablespace_for_mysql(
}
}
funct_exit:
funct_exit:
row_mysql_unlock_data_dictionary
(
trx
);
trx_commit_for_mysql
(
trx
);
trx_commit_for_mysql
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
return
((
int
)
err
);
return
((
int
)
err
);
...
@@ -2769,6 +2769,8 @@ fputs(" InnoDB: You are trying to drop table ", stderr);
...
@@ -2769,6 +2769,8 @@ fputs(" InnoDB: You are trying to drop table ", stderr);
}
}
funct_exit:
funct_exit:
trx_commit_for_mysql
(
trx
);
if
(
locked_dictionary
)
{
if
(
locked_dictionary
)
{
row_mysql_unlock_data_dictionary
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
}
}
...
@@ -2779,8 +2781,6 @@ fputs(" InnoDB: You are trying to drop table ", stderr);
...
@@ -2779,8 +2781,6 @@ fputs(" InnoDB: You are trying to drop table ", stderr);
que_graph_free
(
graph
);
que_graph_free
(
graph
);
trx_commit_for_mysql
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
srv_wake_master_thread
();
srv_wake_master_thread
();
...
@@ -2857,10 +2857,10 @@ row_drop_database_for_mysql(
...
@@ -2857,10 +2857,10 @@ row_drop_database_for_mysql(
}
}
}
}
row_mysql_unlock_data_dictionary
(
trx
);
trx_commit_for_mysql
(
trx
);
trx_commit_for_mysql
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
return
(
err
);
return
(
err
);
...
@@ -3272,6 +3272,8 @@ row_rename_table_for_mysql(
...
@@ -3272,6 +3272,8 @@ row_rename_table_for_mysql(
}
}
}
}
funct_exit:
funct_exit:
trx_commit_for_mysql
(
trx
);
if
(
!
recovering_temp_table
)
{
if
(
!
recovering_temp_table
)
{
row_mysql_unlock_data_dictionary
(
trx
);
row_mysql_unlock_data_dictionary
(
trx
);
}
}
...
@@ -3284,8 +3286,6 @@ row_rename_table_for_mysql(
...
@@ -3284,8 +3286,6 @@ row_rename_table_for_mysql(
mem_heap_free
(
heap
);
mem_heap_free
(
heap
);
}
}
trx_commit_for_mysql
(
trx
);
trx
->
op_info
=
""
;
trx
->
op_info
=
""
;
return
((
int
)
err
);
return
((
int
)
err
);
...
...
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