1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

BUG#11758263: Modification of indentation in the added code.

Fixed a typo in the comment.
              Fixing test cases which were previouslyno throwing  due
              disable warnings macro.
This commit is contained in:
Rohit Kalhans
2012-02-13 14:12:13 +05:30
parent 53e5e4255a
commit b836b02fc9
5 changed files with 26 additions and 14 deletions

View File

@@ -5681,20 +5681,20 @@ bool lock_tables(THD *thd, TABLE_LIST *tables, uint count,
*(ptr++)= table->table;
}
/*
DML statements that modify a table with an auto_increment column based on
rows selected from a table are unsafe as the order in which the rows are
fetched fron the select tables cannot be determined and may differ on
master and slave.
*/
if (thd->variables.binlog_format != BINLOG_FORMAT_ROW && tables &&
has_write_table_with_auto_increment_and_select(tables))
thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_WRITE_AUTOINC_SELECT);
/* We have to emulate LOCK TABLES if we are statement needs prelocking. */
if (thd->lex->requires_prelocking())
{
/*
DML statements that modify a table with an auto_increment column based on
rows selected from a table are unsafe as the order in which the rows are
fetched fron the select tables cannot be determined and may differ on
master and slave.
*/
if (thd->variables.binlog_format != BINLOG_FORMAT_ROW && tables &&
has_write_table_with_auto_increment_and_select(tables))
thd->lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_WRITE_AUTOINC_SELECT);
/*
A query that modifies autoinc column in sub-statement can make the
master and slave inconsistent.
@@ -9093,7 +9093,7 @@ has_write_table_with_auto_increment(TABLE_LIST *tables)
}
/*
checks if the tables have select tables in the table list and write tables
checks if we have select tables in the table list and write tables
with auto-increment column.
SYNOPSIS