mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge.
include/my_sys.h: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_heap.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/sql_class.h: Merge
This commit is contained in:
@ -733,7 +733,7 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
|
||||
outparam->db_low_byte_first=outparam->file->low_byte_first();
|
||||
|
||||
my_pthread_setspecific_ptr(THR_MALLOC,old_root);
|
||||
opened_tables++;
|
||||
current_thd->status_var.opened_tables++;
|
||||
#ifndef DBUG_OFF
|
||||
if (use_hash)
|
||||
(void) hash_check(&outparam->name_hash);
|
||||
|
Reference in New Issue
Block a user