diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-02 17:46:20 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-02 17:46:20 +0400 |
| commit | 4a12418583b0527ea4f91c96de6e6991fdc45a15 (patch) | |
| tree | 2d7c5ed9b6302c1df095afafd490d9239cd4d68d /sql/sql_prepare.cc | |
| parent | 62576974dec88d0c663e7e8a93065e05e9ca484a (diff) | |
| download | mariadb-git-4a12418583b0527ea4f91c96de6e6991fdc45a15.tar.gz | |
embedded-server related fixes
libmysqld/lib_sql.cc:
error message moved to 'stmt'
mysql-test/t/distinct.test:
temporary disabled in embedded server
mysql-test/t/mysqladmin.test:
disabled in embedded server
sql/sql_prepare.cc:
superfluous #ifndef removed
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 2688841d96c..75c6dacc4a7 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1063,7 +1063,6 @@ static int mysql_test_select(Prepared_statement *stmt, int result= 1; DBUG_ENTER("mysql_test_select"); -#ifndef NO_EMBEDDED_ACCESS_CHECKS ulong privilege= lex->exchange ? SELECT_ACL | FILE_ACL : SELECT_ACL; if (tables) { @@ -1072,7 +1071,6 @@ static int mysql_test_select(Prepared_statement *stmt, } else if (check_access(thd, privilege, any_db,0,0,0)) DBUG_RETURN(1); -#endif if (!lex->result && !(lex->result= new (stmt->mem_root) select_send)) { |