1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge with MySQL 5.1.50

- Changed to still use bcmp() in certain cases becasue
  - Faster for short unaligneed strings than memcmp()
  - Bettern when using valgrind
- Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems
- Changed code to use MariaDB version of select->skip_record()
- Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
This commit is contained in:
Michael Widenius
2010-08-27 17:12:44 +03:00
246 changed files with 3488 additions and 1500 deletions

View File

@ -3913,6 +3913,17 @@ void select_create::abort()
if (table)
{
if (thd->lex->sql_command == SQLCOM_CREATE_TABLE &&
thd->current_stmt_binlog_row_based &&
!(thd->lex->create_info.options & HA_LEX_CREATE_TMP_TABLE) &&
mysql_bin_log.is_open())
{
/*
This should be removed after BUG#47899.
*/
mysql_bin_log.reset_gathered_updates(thd);
}
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
table->file->extra(HA_EXTRA_WRITE_CANNOT_REPLACE);
if (!create_info->table_existed)