diff options
| author | unknown <mats@mysql.com> | 2006-03-09 03:56:14 +0100 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-03-09 03:56:14 +0100 |
| commit | 5a9b94112bc8a4838259e7b04b18cc36a95651ef (patch) | |
| tree | 78acd1416bee65b7809fad4f7b068915f3a3682c /sql/sql_class.cc | |
| parent | 4286a0ada243ccca0eb78b53adced35bc68f3690 (diff) | |
| download | mariadb-git-5a9b94112bc8a4838259e7b04b18cc36a95651ef.tar.gz | |
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.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 8ff36536743..f656f03ddc2 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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); |