diff options
| author | unknown <gluh@mysql.com> | 2005-09-14 12:11:19 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com> | 2005-09-14 12:11:19 +0500 |
| commit | 2828c5f594c39eef28558be68e263423853783fd (patch) | |
| tree | 3382345d475439d8eb7047a78596b7e28f16858e /sql/sql_prepare.cc | |
| parent | ab5b9baf53d056b1dd3db1888b0fb32f3da95601 (diff) | |
| parent | 77a7ba13dbb805ef085f5a09530053225938f107 (diff) | |
| download | mariadb-git-2828c5f594c39eef28558be68e263423853783fd.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 624eccd2d67..92af61e2524 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1235,7 +1235,7 @@ static int mysql_test_select(Prepared_statement *stmt, if (check_table_access(thd, privilege, tables,0)) goto error; } - else if (check_access(thd, privilege, any_db,0,0,0)) + else if (check_access(thd, privilege, any_db,0,0,0,0)) goto error; #endif |