diff options
| author | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-05-19 12:28:05 +0300 |
| commit | 224108a19ec945ac1c3da6c5ec36b6777fd59444 (patch) | |
| tree | 0c9eed2ea6f66b7a2416b6a663906a7841e33deb /sql/log_event_old.cc | |
| parent | b94f191a776791e7a120c7e7829be4ffe8109823 (diff) | |
| parent | db020fb30f56c1ec1b1e65304ad5a0830fddab34 (diff) | |
| download | mariadb-git-224108a19ec945ac1c3da6c5ec36b6777fd59444.tar.gz | |
Fixed problems in merge
mysql-test/r/information_schema.result:
Fixed a result file.
mysql-test/r/innodb-autoinc.result:
Fixed a result file.
mysql-test/t/connect.test:
Fixed a problem with merge, needed to close
connections and use the default
Diffstat (limited to 'sql/log_event_old.cc')
| -rw-r--r-- | sql/log_event_old.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 37eeee05a4d..6c3b368eccd 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -724,7 +724,7 @@ static int find_and_fetch_row(TABLE *table, uchar *key) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("table->record[0]", table->record[0], table->s->reclength); DBUG_DUMP("table->record[1]", table->record[1], table->s->reclength); #endif @@ -750,7 +750,7 @@ static int find_and_fetch_row(TABLE *table, uchar *key) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("table->record[0]", table->record[0], table->s->reclength); DBUG_DUMP("table->record[1]", table->record[1], table->s->reclength); #endif @@ -1404,7 +1404,7 @@ int Old_rows_log_event::do_add_row_data(uchar *row_data, size_t length) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("row_data", row_data, min(length, 32)); #endif @@ -2353,7 +2353,7 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_DUMP("key data", m_key, table->key_info->key_length); #endif @@ -2383,7 +2383,7 @@ int Old_rows_log_event::find_row(const Relay_log_info *rli) Don't print debug messages when running valgrind since they can trigger false warnings. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind DBUG_PRINT("info",("found first matching record")); DBUG_DUMP("record[0]", table->record[0], table->s->reclength); #endif @@ -2878,7 +2878,7 @@ Update_rows_log_event_old::do_exec_row(const Relay_log_info *const rli) Now we have the right row to update. The old row (the one we're looking for) is in record[1] and the new row is in record[0]. */ -#ifndef HAVE_purify +#ifndef HAVE_valgrind /* Don't print debug messages when running valgrind since they can trigger false warnings. |