diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
| commit | 5fa6df3081eea58dbd21e24315e27d166e66d23c (patch) | |
| tree | 9f6476af645cdeb53eefe6ca4f6bc6f4ac04bf84 /sql/ha_innodb.cc | |
| parent | 7bff1b0c345c6d8f334bd31f693fb9cbe69ea120 (diff) | |
| parent | 3a231663f034394fe341ebc98fa335f824fa3135 (diff) | |
| download | mariadb-git-5fa6df3081eea58dbd21e24315e27d166e66d23c.tar.gz | |
merge with 3.23.49
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/t/comments.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index e2657e5cad7..4cf06dfb731 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -987,7 +987,10 @@ ha_innobase::open( /* Get pointer to a table object in InnoDB dictionary cache */ - if (NULL == (ib_table = dict_table_get(norm_name, NULL))) { + ib_table = dict_table_get_and_increment_handle_count( + norm_name, NULL); + + if (NULL == ib_table) { sql_print_error("InnoDB error:\n\ Cannot find table %s from the internal data dictionary\n\ @@ -2831,7 +2834,9 @@ innobase_drop_database( memcpy(namebuf, ptr, len); namebuf[len] = '/'; namebuf[len + 1] = '\0'; - +#ifdef __WIN__ + casedn_str(namebuf); +#endif trx = trx_allocate_for_mysql(); error = row_drop_database_for_mysql(namebuf, trx); |