diff options
| author | unknown <ingo@mysql.com> | 2004-10-05 11:33:13 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2004-10-05 11:33:13 +0200 |
| commit | 7ce31065c67ffce9df6befd5d1e80896e68d135f (patch) | |
| tree | 24e6164ebb4c5b0cf55e6b85f83def054643e5ac /sql/sql_table.cc | |
| parent | c0364263d9dcc9f122529804576f65640587acd4 (diff) | |
| parent | 697cb7b106d74c047e616f9129129a9eea87ac95 (diff) | |
| download | mariadb-git-7ce31065c67ffce9df6befd5d1e80896e68d135f.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug4286
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 0dd5c65bf79..a15f8b65006 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -186,7 +186,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, for (table=tables ; table ; table=table->next) { char *db=table->db; - mysql_ha_close(thd, table, /*dont_send_ok*/ 1, /*dont_lock*/ 1); + mysql_ha_flush(thd, table, MYSQL_HA_CLOSE_FINAL); if (!close_temporary_table(thd, db, table->real_name)) { tmp_table_deleted=1; @@ -1253,7 +1253,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables, if (send_fields(thd, field_list, 1)) DBUG_RETURN(-1); - mysql_ha_close(thd, tables, /*dont_send_ok*/ 1, /*dont_lock*/ 1); + mysql_ha_flush(thd, tables, MYSQL_HA_CLOSE_FINAL); for (table = tables; table; table = table->next) { char table_name[NAME_LEN*2+2]; @@ -1514,7 +1514,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, } used_fields=create_info->used_fields; - mysql_ha_close(thd, table_list, /*dont_send_ok*/ 1, /*dont_lock*/ 1); + mysql_ha_flush(thd, table_list, MYSQL_HA_CLOSE_FINAL); if (!(table=open_ltable(thd,table_list,TL_WRITE_ALLOW_READ))) DBUG_RETURN(-1); |