diff options
| author | unknown <tsmith@maint1.mysql.com> | 2007-06-15 18:03:59 +0200 |
|---|---|---|
| committer | unknown <tsmith@maint1.mysql.com> | 2007-06-15 18:03:59 +0200 |
| commit | 067833884a45cd8f4c74c06e210b919fd2b05e7e (patch) | |
| tree | a48831ef28c2a867be8cb0bc183d32636c397a13 /sql | |
| parent | 4df04e1ad23dc13261deeaef82b25c5eeea7d216 (diff) | |
| parent | 7cf764bcb89f11611c0571ca61ca011cb4a40bbc (diff) | |
| download | mariadb-git-067833884a45cd8f4c74c06e210b919fd2b05e7e.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 132fc5b0b4f..e7ed02f333e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1569,7 +1569,7 @@ bool sp_process_definer(THD *thd) if (lex->definer == NULL) DBUG_RETURN(TRUE); - if (thd->slave_thread) + if (thd->slave_thread && lex->sphead) lex->sphead->m_chistics->suid= SP_IS_NOT_SUID; } else |