database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-04 18:03:14 +03:00
Code

Applied innodb-4.1-ss31 snapshot.

Browse Source 
Fixed BUG#19727 "InnoDB crashed server and crashed tables
 are not recoverable".
This commit is contained in:
aivanov@mysql.com 2006-06-06 23:05:10 +04:00
parent 9595317cfa
commit 21f23fb76f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
innobase/row/row0mysql.c
View File

@ -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(
} }
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);
} }
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 @@ funct_exit:
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 @@ loop:
} }
} }
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(
} }
} }
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 @@ funct_exit:
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);