diff options
| author | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
| commit | e2d25910f8d5a5edacf3b64ad24f7e9dcd06123f (patch) | |
| tree | 25cbffcf973dd7f352a4bcdc885aa172cb20a57a /innobase/include/row0mysql.h | |
| parent | 3f5e1ba9ea87087836dcf311a174f4aae3d4cb5b (diff) | |
| parent | 26821ee3f584a79cfaf4339c0b5c45307be21986 (diff) | |
| download | mariadb-git-e2d25910f8d5a5edacf3b64ad24f7e9dcd06123f.tar.gz | |
manual merge
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
include/my_global.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'innobase/include/row0mysql.h')
| -rw-r--r-- | innobase/include/row0mysql.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h index 768279fefd4..a576a637c79 100644 --- a/innobase/include/row0mysql.h +++ b/innobase/include/row0mysql.h @@ -161,11 +161,12 @@ row_lock_table_autoinc_for_mysql( row_prebuilt_t* prebuilt); /* in: prebuilt struct in the MySQL table handle */ /************************************************************************* -Unlocks a table lock possibly reserved by trx. */ +Unlocks all table locks explicitly requested by trx (with LOCK TABLES, +lock type LOCK_TABLE_EXP). */ void -row_unlock_table_for_mysql( -/*=======================*/ +row_unlock_tables_for_mysql( +/*========================*/ trx_t* trx); /* in: transaction */ /************************************************************************* Sets a table lock on the table mentioned in prebuilt. */ |