diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-02-27 17:07:08 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-02-27 17:07:08 -0500 |
| commit | 5454146123e0d017b99c67ce715552cfd8dc87cb (patch) | |
| tree | b6b21f8b8534dfc76c8ca026056a3696710704f2 /sql/sql_class.cc | |
| parent | 9d66be72b0ee079cecc39e09d4f4c0f7e1849dbc (diff) | |
| parent | 89fd0e9f9e2fa26a3e46c5b48f278d395feba245 (diff) | |
| download | mariadb-git-5454146123e0d017b99c67ce715552cfd8dc87cb.tar.gz | |
Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-release/
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
BitKeeper/etc/collapsed:
auto-union
include/config-win.h:
Auto merged
myisam/mi_open.c:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
configure.in:
Manual merge. Verified "5.0.37".
mysql-test/r/information_schema.result:
Manual merge.
mysql-test/t/information_schema.test:
Manual merge.
sql/mysql_priv.h:
Manual merge.
sql/mysqld.cc:
Manual merge.
sql/sql_select.cc:
Manual merge.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 3b612dadcd0..5f292aa04f9 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -247,6 +247,9 @@ THD::THD() init(); /* Initialize sub structures */ init_sql_alloc(&warn_root, WARN_ALLOC_BLOCK_SIZE, WARN_ALLOC_PREALLOC_SIZE); +#ifdef ENABLED_PROFILING + profiling.set_thd(this); +#endif user_connect=(USER_CONN *)0; hash_init(&user_vars, system_charset_info, USER_VARS_HASH_SIZE, 0, 0, (hash_get_key) get_var_key, |