diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:45:18 +0200 |
commit | 76f0b94bb0b2994d639353530c5b251d0f1a204b (patch) | |
tree | 9ed50628aac34f89a37637bab2fc4915b86b5eb4 /sql/sql_update.h | |
parent | 4e46d8e5bff140f2549841167dc4b65a3c0a645d (diff) | |
parent | 5dc1a2231f55bacc9aaf0e24816f3d9c2ee1f21d (diff) | |
download | mariadb-git-76f0b94bb0b2994d639353530c5b251d0f1a204b.tar.gz |
merge with 5.3
sql/sql_insert.cc:
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
******
CREATE ... IF NOT EXISTS may do nothing, but
it is still not a failure. don't forget to my_ok it.
sql/sql_table.cc:
small cleanup
******
small cleanup
Diffstat (limited to 'sql/sql_update.h')
-rw-r--r-- | sql/sql_update.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.h b/sql/sql_update.h index 50ff50f025d..9552ff0ab2d 100644 --- a/sql/sql_update.h +++ b/sql/sql_update.h @@ -39,6 +39,6 @@ bool mysql_multi_update(THD *thd, TABLE_LIST *table_list, SELECT_LEX_UNIT *unit, SELECT_LEX *select_lex, multi_update **result); bool records_are_comparable(const TABLE *table); -bool compare_records(const TABLE *table); +bool compare_record(const TABLE *table); #endif /* SQL_UPDATE_INCLUDED */ |