mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ha_innodb.cc: Replace thd->tablespace_op with thd_tablespace_op(thd).

Browse source 
Plugins must treat class THD as an opaque type.
This commit is contained in:
marko 2007-02-15 14:10:41 +00:00
parent 8ea36d5647
commit 48d8e9819a
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
handler/ha_innodb.cc
View file

@ -2495,7 +2495,7 @@ ha_innobase::open(
DBUG_RETURN(HA_ERR_NO_SUCH_TABLE); DBUG_RETURN(HA_ERR_NO_SUCH_TABLE);
} }
if (ib_table->ibd_file_missing && !thd->tablespace_op) { if (ib_table->ibd_file_missing && !thd_tablespace_op(thd)) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
sql_print_error("MySQL is trying to open a table handle but " sql_print_error("MySQL is trying to open a table handle but "
"the .ibd file for\ntable %s does not exist.\n" "the .ibd file for\ntable %s does not exist.\n"
@ -6501,7 +6501,8 @@ ha_innobase::transactional_table_lock(
update_thd(thd); update_thd(thd);
if (prebuilt->table->ibd_file_missing && !current_thd->tablespace_op) { if (prebuilt->table->ibd_file_missing
&& !thd_tablespace_op(current_thd)) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB error:\n" fprintf(stderr, " InnoDB error:\n"
"MySQL is trying to use a table handle but the .ibd file for\n" "MySQL is trying to use a table handle but the .ibd file for\n"
@ -7015,7 +7016,7 @@ ha_innobase::store_lock(
&& lock_type <= TL_WRITE) && lock_type <= TL_WRITE)
&& !(in_lock_tables && !(in_lock_tables
&& thd->lex->sql_command == SQLCOM_LOCK_TABLES) && thd->lex->sql_command == SQLCOM_LOCK_TABLES)
&& !thd->tablespace_op && !thd_tablespace_op(thd)
&& thd->lex->sql_command != SQLCOM_TRUNCATE && thd->lex->sql_command != SQLCOM_TRUNCATE
&& thd->lex->sql_command != SQLCOM_OPTIMIZE && thd->lex->sql_command != SQLCOM_OPTIMIZE