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

WL#3023 (Use locks in statement-like manner):

Post-merge patches.


mysql-test/t/disabled.def:
  Disabling test that fails due to no-error patch.
sql/log_event.cc:
  Using definite constant instead of machine-dependent constant.
  Handling case where null_bytes can be zero.
sql/sql_base.cc:
  Using definite constant instead of machine-dependent constant.
sql/sql_class.cc:
  Using definite constant instead of machine-dependent constant.
sql/table.cc:
  Using definite constant instead of machine-dependent constant.
This commit is contained in:
unknown
2006-03-09 03:56:14 +01:00
parent 4286a0ada2
commit 5a9b94112b
5 changed files with 26 additions and 23 deletions

View File

@@ -2194,7 +2194,7 @@ THD::binlog_prepare_pending_rows_event(TABLE* table, uint32 serv_id,
{
DBUG_ENTER("binlog_prepare_pending_rows_event");
/* Pre-conditions */
DBUG_ASSERT(table->s->table_map_id != ULONG_MAX);
DBUG_ASSERT(table->s->table_map_id != ~0UL);
/* Fetch the type code for the RowsEventT template parameter */
int const type_code= RowsEventT::TYPE_CODE;
@@ -2541,7 +2541,7 @@ int THD::binlog_flush_pending_rows_event(bool stmt_end)
*/
Rows_log_event *ev=
new Write_rows_log_event(this, 0, ULONG_MAX, 0, FALSE);
new Write_rows_log_event(this, 0, ~0UL, 0, FALSE);
ev->set_flags(Rows_log_event::STMT_END_F);
binlog_set_pending_rows_event(ev);