mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge Bug #57345, Bug #56982, Bug#53307 test from mysql-5.1-innodb

Browse source
This commit is contained in:
Marko Makela 2010-10-11 21:28:51 +02:00
commit 60ce7ea801
5 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/t/disabled.def
View file

@ -11,6 +11,5 @@
############################################################################## ##############################################################################
kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild. kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
partition_innodb_plugin : Bug#53307 2010-04-30 VasilDimov valgrind warnings
main.mysqlhotcopy_myisam : bug#54129 2010-06-04 Horst main.mysqlhotcopy_myisam : bug#54129 2010-06-04 Horst
main.mysqlhotcopy_archive: bug#54129 2010-06-04 Horst main.mysqlhotcopy_archive: bug#54129 2010-06-04 Horst

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

@ -3259,6 +3259,7 @@ row_search_for_mysql(
mem_heap_t* heap = NULL; mem_heap_t* heap = NULL;
ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_; ulint* offsets = offsets_;
ibool table_lock_waited = FALSE;
*offsets_ = (sizeof offsets_) / sizeof *offsets_; *offsets_ = (sizeof offsets_) / sizeof *offsets_;
@ -3622,13 +3623,15 @@ shortcut_fails_too_big_rec:
trx_assign_read_view(trx); trx_assign_read_view(trx);
prebuilt->sql_stat_start = FALSE; prebuilt->sql_stat_start = FALSE;
} else { } else {
wait_table_again:
err = lock_table(0, index->table, err = lock_table(0, index->table,
prebuilt->select_lock_type == LOCK_S prebuilt->select_lock_type == LOCK_S
? LOCK_IS : LOCK_IX, thr); ? LOCK_IS : LOCK_IX, thr);
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
goto lock_wait_or_error; table_lock_waited = TRUE;
goto lock_table_wait;
} }
prebuilt->sql_stat_start = FALSE; prebuilt->sql_stat_start = FALSE;
} }
@ -4408,6 +4411,7 @@ lock_wait_or_error:
btr_pcur_store_position(pcur, &mtr); btr_pcur_store_position(pcur, &mtr);
lock_table_wait:
mtr_commit(&mtr); mtr_commit(&mtr);
mtr_has_extra_clust_latch = FALSE; mtr_has_extra_clust_latch = FALSE;
@ -4425,6 +4429,14 @@ lock_wait_or_error:
thr->lock_state = QUE_THR_LOCK_NOLOCK; thr->lock_state = QUE_THR_LOCK_NOLOCK;
mtr_start(&mtr); mtr_start(&mtr);
/* Table lock waited, go try to obtain table lock
again */
if (table_lock_waited) {
table_lock_waited = FALSE;
goto wait_table_again;
}
sel_restore_position_for_mysql(&same_user_rec, sel_restore_position_for_mysql(&same_user_rec,
BTR_SEARCH_LEAF, pcur, BTR_SEARCH_LEAF, pcur,
moves_up, &mtr); moves_up, &mtr);

6
storage/innodb_plugin/ChangeLog
View file

@ -1,3 +1,9 @@
2010-10-11 The InnoDB Team
* row/row0sel.c
Fix Bug #57345 btr_pcur_store_position abort for load with
concurrent lock/unlock tables
2010-10-11 The InnoDB Team 2010-10-11 The InnoDB Team
* row/row0mysql.c, innodb_bug56947.result, innodb_bug56947.test: * row/row0mysql.c, innodb_bug56947.result, innodb_bug56947.test:

6
storage/innodb_plugin/handler/ha_innodb.cc
View file

@ -9409,7 +9409,11 @@ ha_innobase::innobase_peek_autoinc(void)
auto_inc = dict_table_autoinc_read(innodb_table); auto_inc = dict_table_autoinc_read(innodb_table);
ut_a(auto_inc > 0); if (auto_inc == 0) {
ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB: AUTOINC next value generation "
"is disabled for '%s'\n", innodb_table->name);
}
dict_table_autoinc_unlock(innodb_table); dict_table_autoinc_unlock(innodb_table);

14
storage/innodb_plugin/row/row0sel.c
View file

@ -3356,6 +3356,7 @@ row_search_for_mysql(
mem_heap_t* heap = NULL; mem_heap_t* heap = NULL;
ulint offsets_[REC_OFFS_NORMAL_SIZE]; ulint offsets_[REC_OFFS_NORMAL_SIZE];
ulint* offsets = offsets_; ulint* offsets = offsets_;
ibool table_lock_waited = FALSE;
rec_offs_init(offsets_); rec_offs_init(offsets_);
@ -3742,13 +3743,15 @@ release_search_latch_if_needed:
trx_assign_read_view(trx); trx_assign_read_view(trx);
prebuilt->sql_stat_start = FALSE; prebuilt->sql_stat_start = FALSE;
} else { } else {
wait_table_again:
err = lock_table(0, index->table, err = lock_table(0, index->table,
prebuilt->select_lock_type == LOCK_S prebuilt->select_lock_type == LOCK_S
? LOCK_IS : LOCK_IX, thr); ? LOCK_IS : LOCK_IX, thr);
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
goto lock_wait_or_error; table_lock_waited = TRUE;
goto lock_table_wait;
} }
prebuilt->sql_stat_start = FALSE; prebuilt->sql_stat_start = FALSE;
} }
@ -4559,6 +4562,7 @@ lock_wait_or_error:
btr_pcur_store_position(pcur, &mtr); btr_pcur_store_position(pcur, &mtr);
lock_table_wait:
mtr_commit(&mtr); mtr_commit(&mtr);
mtr_has_extra_clust_latch = FALSE; mtr_has_extra_clust_latch = FALSE;
@ -4576,6 +4580,14 @@ lock_wait_or_error:
thr->lock_state = QUE_THR_LOCK_NOLOCK; thr->lock_state = QUE_THR_LOCK_NOLOCK;
mtr_start(&mtr); mtr_start(&mtr);
/* Table lock waited, go try to obtain table lock
again */
if (table_lock_waited) {
table_lock_waited = FALSE;
goto wait_table_again;
}
sel_restore_position_for_mysql(&same_user_rec, sel_restore_position_for_mysql(&same_user_rec,
BTR_SEARCH_LEAF, pcur, BTR_SEARCH_LEAF, pcur,
moves_up, &mtr); moves_up, &mtr);