diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 16:43:03 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 16:43:03 +0300 |
| commit | c8555bdb35d998e99b6fb568f03c63479ff9272d (patch) | |
| tree | 3b69ab5126c40ef71ad69a5bb469de82c4be90a0 /sql/sql_prepare.cc | |
| parent | 962d77de368e0cc90431e24d09e884f3760c7939 (diff) | |
| parent | 3d915225611a921fad03934e58bf281b48fc15b0 (diff) | |
| download | mariadb-git-c8555bdb35d998e99b6fb568f03c63479ff9272d.tar.gz | |
Merge next-mr -> next-4284
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index a1253e42b07..254baf24c71 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2002 MySQL AB +/* Copyright (C) 1995-2002 MySQL AB, 2008-2009 Sun Microsystems, Inc This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1414,7 +1414,7 @@ static int mysql_test_select(Prepared_statement *stmt, if (check_table_access(thd, privilege, tables, FALSE, UINT_MAX, FALSE)) goto error; } - else if (check_access(thd, privilege, any_db,0,0,0,0)) + else if (check_access(thd, privilege, any_db, NULL, NULL, 0, 0)) goto error; if (!lex->result && !(lex->result= new (stmt->mem_root) select_send)) |