diff options
| author | unknown <mattiasj@mattiasj-laptop.(none)> | 2007-11-12 21:09:48 +0100 |
|---|---|---|
| committer | unknown <mattiasj@mattiasj-laptop.(none)> | 2007-11-12 21:09:48 +0100 |
| commit | 1b98a962d5fd2f77034ba42b173eeb1d8588becd (patch) | |
| tree | e45fd7d0c5fc62764cf02dce0038b6571c4fa001 /sql/sql_acl.cc | |
| parent | c4f94b70bdaa26e9b8782771f079a2dc3c1594d6 (diff) | |
| parent | e116210a36f784411fe81c662b65836e9f9c2568 (diff) | |
| download | mariadb-git-1b98a962d5fd2f77034ba42b173eeb1d8588becd.tar.gz | |
Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-main
into mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-last_with_main
libmysqld/lib_sql.cc:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
sql/event_scheduler.cc:
Auto merged
sql/events.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_connect.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 070a943da9e..311b76c6149 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -277,6 +277,7 @@ my_bool acl_init(bool dont_read_acl_tables) DBUG_RETURN(1); /* purecov: inspected */ thd->thread_stack= (char*) &thd; thd->store_globals(); + lex_start(thd); /* It is safe to call acl_reload() since acl_* arrays and hashes which will be freed there are global static objects and thus are initialized @@ -3493,6 +3494,7 @@ my_bool grant_init() DBUG_RETURN(1); /* purecov: deadcode */ thd->thread_stack= (char*) &thd; thd->store_globals(); + lex_start(thd); return_val= grant_reload(thd); delete thd; /* Remember that we don't have a THD */ |