diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-10-01 14:17:05 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-10-01 14:17:05 +0300 |
| commit | 9e6d10146cd9aef0132aa1ee27cb11dd4de5d094 (patch) | |
| tree | 9677f13f29c93b0c65083bc23680739efeb821b9 /innobase/lock | |
| parent | bff40d61ae67455dd7ae70bd75923dac63fbae51 (diff) | |
| parent | a418a35ceba85354328b5f75bb4e908f88b6759f (diff) | |
| download | mariadb-git-9e6d10146cd9aef0132aa1ee27cb11dd4de5d094.tar.gz | |
Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
innobase/btr/btr0btr.c:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0row.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'innobase/lock')
| -rw-r--r-- | innobase/lock/lock0lock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c index 5705c8b0b3e..e91be39a0cd 100644 --- a/innobase/lock/lock0lock.c +++ b/innobase/lock/lock0lock.c @@ -398,7 +398,7 @@ lock_check_trx_id_sanity( stderr); rec_print(stderr, rec); fputs("InnoDB: in ", stderr); - dict_index_name_print(stderr, index); + dict_index_name_print(stderr, NULL, index); fprintf(stderr, "\n" "InnoDB: is %lu %lu which is higher than the global trx id counter %lu %lu!\n" "InnoDB: The table is corrupt. You have to do dump + drop + reimport.\n", @@ -1672,7 +1672,7 @@ lock_rec_enqueue_waiting( fputs( " InnoDB: Error: a record lock wait happens in a dictionary operation!\n" "InnoDB: Table name ", stderr); - ut_print_name(stderr, index->table_name); + ut_print_name(stderr, trx, index->table_name); fputs(".\n" "InnoDB: Submit a detailed bug report to http://bugs.mysql.com\n", stderr); @@ -1709,7 +1709,7 @@ lock_rec_enqueue_waiting( if (lock_print_waits) { fprintf(stderr, "Lock wait for trx %lu in index ", (ulong) ut_dulint_get_low(trx->id)); - ut_print_name(stderr, index->name); + ut_print_name(stderr, trx, index->name); } return(DB_LOCK_WAIT); @@ -3314,7 +3314,7 @@ lock_table_enqueue_waiting( fputs( " InnoDB: Error: a table lock wait happens in a dictionary operation!\n" "InnoDB: Table name ", stderr); - ut_print_name(stderr, table->name); + ut_print_name(stderr, trx, table->name); fputs(".\n" "InnoDB: Submit a detailed bug report to http://bugs.mysql.com\n", stderr); @@ -3841,7 +3841,7 @@ lock_table_print( fputs("EXPLICIT ", file); } fputs("TABLE LOCK table ", file); - ut_print_name(file, lock->un_member.tab_lock.table->name); + ut_print_name(file, lock->trx, lock->un_member.tab_lock.table->name); fprintf(file, " trx id %lu %lu", (ulong) (lock->trx)->id.high, (ulong) (lock->trx)->id.low); @@ -3892,7 +3892,7 @@ lock_rec_print( fprintf(file, "RECORD LOCKS space id %lu page no %lu n bits %lu ", (ulong) space, (ulong) page_no, (ulong) lock_rec_get_n_bits(lock)); - dict_index_name_print(file, lock->index); + dict_index_name_print(file, lock->trx, lock->index); fprintf(file, " trx id %lu %lu", (ulong) (lock->trx)->id.high, (ulong) (lock->trx)->id.low); |