diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-07 00:19:36 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-07 00:19:36 +0200 |
| commit | d207a0c2f022d0a65e95cddf8a1dc957f0e0a34e (patch) | |
| tree | f1c7979e7d8282f034f3cabdfe558293a7f7c2f4 /sql/ha_innobase.cc | |
| parent | 228408a8c54e34922832082c0e36c1e87f224873 (diff) | |
| parent | 3c0487c4c31c516c745a020f2c1b2e836cb28d86 (diff) | |
| download | mariadb-git-d207a0c2f022d0a65e95cddf8a1dc957f0e0a34e.tar.gz | |
merge
innobase/include/srv0srv.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_innobase.cc:
Auto merged
Diffstat (limited to 'sql/ha_innobase.cc')
| -rw-r--r-- | sql/ha_innobase.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 4f3560290cf..3ff3e15e88e 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -1472,7 +1472,9 @@ ha_innobase::write_row( The lock is released at each SQL statement's end. */ + srv_conc_enter_innodb(prebuilt->trx); error = row_lock_table_autoinc_for_mysql(prebuilt); + srv_conc_exit_innodb(); if (error != DB_SUCCESS) { @@ -1523,7 +1525,9 @@ ha_innobase::write_row( auto_inc = table->next_number_field->val_int(); + srv_conc_enter_innodb(prebuilt->trx); error = row_lock_table_autoinc_for_mysql(prebuilt); + srv_conc_exit_innodb(); if (error != DB_SUCCESS) { @@ -2803,6 +2807,8 @@ ha_innobase::delete_table( srv_active_wake_master_thread(); + trx_commit_for_mysql(trx); + trx_free_for_mysql(trx); error = convert_error_code_to_mysql(error); @@ -2856,6 +2862,7 @@ innobase_drop_database( srv_active_wake_master_thread(); + trx_commit_for_mysql(trx); trx_free_for_mysql(trx); error = convert_error_code_to_mysql(error); @@ -2908,6 +2915,7 @@ ha_innobase::rename_table( srv_active_wake_master_thread(); + trx_commit_for_mysql(trx); trx_free_for_mysql(trx); error = convert_error_code_to_mysql(error); |