diff options
| author | unknown <monty@mysql.com> | 2004-03-12 09:15:08 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-12 09:15:08 +0200 |
| commit | f85032f16ec19832d75d0420f9d4d2b1bb01fc75 (patch) | |
| tree | e7c9535543f97d8421abd43d67bf8d708b5468a5 /sql | |
| parent | 965158f28fa9527c62b3c316c458a8753a5da4e4 (diff) | |
| download | mariadb-git-f85032f16ec19832d75d0420f9d4d2b1bb01fc75.tar.gz | |
Portability fixes & fixing of test suite
mysql-test/r/func_math.result:
Updated tests after merge with 3.23
mysql-test/r/multi_update.result:
Fixed not portable test
mysql-test/r/mysqlbinlog.result:
Fixed test after push without doing 'make test'
mysql-test/t/multi_update.test:
Fixed not portable test
sql/sql_parse.cc:
Don't use static inline, as this is not portable
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 5b1487aa313..9d19458abf4 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -65,7 +65,7 @@ static bool create_total_list(THD *thd, LEX *lex, TABLE_LIST **result, bool skip_first); static bool check_one_table_access(THD *thd, ulong want_access, TABLE_LIST *table, bool no_errors); -static inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables); + const char *any_db="*any*"; // Special symbol for check_access @@ -108,6 +108,7 @@ static void unlock_locked_tables(THD *thd) } } + static bool end_active_trans(THD *thd) { int error=0; @@ -123,6 +124,14 @@ static bool end_active_trans(THD *thd) } +inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables) +{ + return (table_rules_on && tables && !tables_ok(thd,tables) && + ((thd->lex.sql_command != SQLCOM_DELETE_MULTI) || + !tables_ok(thd,(TABLE_LIST *)thd->lex.auxilliary_table_list.first))); +} + + static HASH hash_user_connections; extern pthread_mutex_t LOCK_user_conn; @@ -2967,12 +2976,6 @@ void mysql_init_multi_delete(LEX *lex) lex->select->table_list.save_and_clear(&lex->auxilliary_table_list); } -static inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables) -{ - return (table_rules_on && tables && !tables_ok(thd,tables) && - ((thd->lex.sql_command != SQLCOM_DELETE_MULTI) || - !tables_ok(thd,(TABLE_LIST *)thd->lex.auxilliary_table_list.first))); -} /* When you modify mysql_parse(), you may need to mofify |