summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-05-15 17:23:14 +0300
committerunknown <monty@hundin.mysql.fi>2002-05-15 17:23:14 +0300
commit68f972b5d470eed86347f0948fbf672d52ee1a5d (patch)
tree3ef66e167be8a5565c27caf74763a41737bb2f63 /sql/sql_class.cc
parent51594771687dfdee9d5d544863ccf77e8c8b74bd (diff)
parent23283a5b93a9d851451df33d22463107401bc461 (diff)
downloadmariadb-git-68f972b5d470eed86347f0948fbf672d52ee1a5d.tar.gz
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 03bb8ae2c97..c332181b410 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -147,7 +147,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
/* Initialize sub structures */
bzero((char*) &mem_root,sizeof(mem_root));
bzero((char*) &transaction.mem_root,sizeof(transaction.mem_root));
- user_connect=(UC *)0;
+ user_connect=(USER_CONN *)0;
hash_init(&user_vars, USER_VARS_HASH_SIZE, 0, 0,
(hash_get_key) get_var_key,
(void (*)(void*)) free_var,0);