diff options
| author | unknown <monty@mysql.com> | 2004-07-09 10:55:16 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-07-09 10:55:16 +0300 |
| commit | b42209774aa80452bee797238fbe9bd4006fffce (patch) | |
| tree | 7e2ff70f1febc7a09674e0680a73d7c941c2a9ff /sql/sql_parse.cc | |
| parent | 53ca595451d53fccd60b1112c444e5278021c1ee (diff) | |
| download | mariadb-git-b42209774aa80452bee797238fbe9bd4006fffce.tar.gz | |
Cleanup of db option cacheing
Some bug fixes to last pushed code
mysql-test/mysql-test-run.sh:
Fix for new valgrind (2.1.1)
mysql-test/r/bdb.result:
Updated results
mysql-test/t/ps_1general.test:
removed wrong error condition
sql/ha_berkeley.cc:
Fix for index_flags() in new code
sql/item_strfunc.cc:
Cleanup (fixed indentation, removed short variable names)
sql/mysql_priv.h:
Cleanup of db option cacheing
sql/mysqld.cc:
Cleanup of db option cacheing
sql/sql_db.cc:
Cleanup of db option cacheing
sql/sql_parse.cc:
Cleanup of db option cacheing
sql/sql_table.cc:
sprintf -> strxmov
sql/table.cc:
key_read should be tested on key parts, not the whole key
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 3ce1c334f96..61b57b2f350 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4562,6 +4562,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, register TABLE_LIST *ptr; char *alias_str; DBUG_ENTER("add_table_to_list"); + DBUG_PRINT("enter",("lock_option: %d", lock_type)); if (!table) DBUG_RETURN(0); // End of memory @@ -4805,7 +4806,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables, if (lock_global_read_lock(thd)) return 1; } - my_dbopt_free(); + my_dbopt_cleanup(); result=close_cached_tables(thd,(options & REFRESH_FAST) ? 0 : 1, tables); } if (options & REFRESH_HOSTS) |