diff options
| author | unknown <monty@mysql.com> | 2005-11-24 02:56:12 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-11-24 02:56:12 +0200 |
| commit | 81b2bbac056f21b0783f21a5830c07aba4850d85 (patch) | |
| tree | 586e1c8d17361d92a7ddb4190893e1d6527e6fc9 /sql/sql_acl.cc | |
| parent | fe245ed8ba1258e1f3920e449338ea92e3a3a96e (diff) | |
| parent | 97bfd41fe1382ff33a9fc458c0bd092342b217e5 (diff) | |
| download | mariadb-git-81b2bbac056f21b0783f21a5830c07aba4850d85.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/grant.result:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/examples/ha_tina.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/tztime.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/examples/ha_tina.cc:
manual merge
sql/share/errmsg.txt:
manual merge
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index cb46682470f..6da27b271bb 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -157,6 +157,7 @@ my_bool acl_init(bool dont_read_acl_tables) */ if (!(thd=new THD)) DBUG_RETURN(1); /* purecov: inspected */ + thd->thread_stack= (char*) &thd; thd->store_globals(); /* It is safe to call acl_reload() since acl_* arrays and hashes which @@ -3263,6 +3264,7 @@ my_bool grant_init() if (!(thd= new THD)) DBUG_RETURN(1); /* purecov: deadcode */ + thd->thread_stack= (char*) &thd; thd->store_globals(); return_val= grant_reload(thd); delete thd; |