mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge siva.hindu.god:/home/tsmith/m/inno/jan04/51

Browse source 
into  siva.hindu.god:/home/tsmith/m/bk/51-build
This commit is contained in:
tsmith@siva.hindu.god 2007-01-05 16:05:48 -07:00
commit eb8cf09388
27 changed files with 336 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

3
storage/innobase/row/row0ins.c
View file

@ -1524,7 +1524,8 @@ row_ins_check_foreign_constraints(
if (foreign->foreign_index == index) {
if (foreign->referenced_table == NULL) {
dict_table_get(foreign->referenced_table_name);
dict_table_get(foreign->referenced_table_name,
FALSE);
}
if (0 == trx->dict_operation_lock_mode) {

8
storage/innobase/row/row0sel.c
View file

@ -1831,7 +1831,9 @@ stop_for_a_while:
mtr_commit(&mtr);
#ifdef UNIV_SYNC_DEBUG
ut_ad(sync_thread_levels_empty_gen(TRUE));
#endif /* UNIV_SYNC_DEBUG */
err = DB_SUCCESS;
goto func_exit;
@ -1850,7 +1852,9 @@ commit_mtr_for_a_while:
leaf_contains_updates = FALSE;
mtr_has_extra_clust_latch = FALSE;
#ifdef UNIV_SYNC_DEBUG
ut_ad(sync_thread_levels_empty_gen(TRUE));
#endif /* UNIV_SYNC_DEBUG */
goto table_loop;
@ -1866,7 +1870,9 @@ lock_wait_or_error:
mtr_commit(&mtr);
#ifdef UNIV_SYNC_DEBUG
ut_ad(sync_thread_levels_empty_gen(TRUE));
#endif /* UNIV_SYNC_DEBUG */
func_exit:
if (UNIV_LIKELY_NULL(heap)) {
@ -4447,7 +4453,7 @@ row_search_check_if_query_cache_permitted(
dict_table_t* table;
ibool ret = FALSE;
table = dict_table_get(norm_name);
table = dict_table_get(norm_name, FALSE);
if (table == NULL) {

3
storage/innobase/row/row0upd.c
View file

@ -202,7 +202,8 @@ row_upd_check_references_constraints(
foreign->n_fields))) {
if (foreign->foreign_table == NULL) {
dict_table_get(foreign->foreign_table_name);
dict_table_get(foreign->foreign_table_name,
FALSE);
}
if (foreign->foreign_table) {