diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-11-30 17:50:56 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-11-30 17:50:56 +0200 |
| commit | 892cec855512e271fbffc66439fc3b3b06140e2a (patch) | |
| tree | 11ac976879496b8b599ebaa8f1a4927c5fe26b29 /innobase/row | |
| parent | 668d61b946d6487829c28a2860ecff7df7637d09 (diff) | |
| parent | 795045d9a01ac816360c1477625713beaad429cc (diff) | |
| download | mariadb-git-892cec855512e271fbffc66439fc3b3b06140e2a.tar.gz | |
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
Diffstat (limited to 'innobase/row')
| -rw-r--r-- | innobase/row/row0mysql.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/innobase/row/row0mysql.c b/innobase/row/row0mysql.c index 9613da2e286..dec2b19559c 100644 --- a/innobase/row/row0mysql.c +++ b/innobase/row/row0mysql.c @@ -782,10 +782,11 @@ row_lock_table_for_mysql( /* out: error code or DB_SUCCESS */ row_prebuilt_t* prebuilt, /* in: prebuilt struct in the MySQL table handle */ - dict_table_t* table) /* in: table to LOCK_IX, or NULL + dict_table_t* table, /* in: table to lock, or NULL if prebuilt->table should be locked as LOCK_TABLE_EXP | prebuilt->select_lock_type */ + ulint mode) /* in: lock mode of table */ { trx_t* trx = prebuilt->trx; que_thr_t* thr; @@ -819,7 +820,7 @@ run_again: trx_start_if_not_started(trx); if (table) { - err = lock_table(0, table, LOCK_IX, thr); + err = lock_table(0, table, mode, thr); } else { err = lock_table(LOCK_TABLE_EXP, prebuilt->table, prebuilt->select_lock_type, thr); |