summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2004-04-08 10:48:49 +0300
committerunknown <marko@hundin.mysql.fi>2004-04-08 10:48:49 +0300
commita5d016ecb4e495efde82a6f0484c51bc2d0fa842 (patch)
treeebe801336e2694c1e6a9c0120bb39a0d733e51ea
parent26764a7bfac0881974849c0d53a58646177fbd58 (diff)
parent97f6935e19ba36f5107f20b035134a128be6b920 (diff)
downloadmariadb-git-a5d016ecb4e495efde82a6f0484c51bc2d0fa842.tar.gz
Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
-rw-r--r--innobase/sync/sync0sync.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/innobase/sync/sync0sync.c b/innobase/sync/sync0sync.c
index c534dc6823d..952510c49e3 100644
--- a/innobase/sync/sync0sync.c
+++ b/innobase/sync/sync0sync.c
@@ -1036,11 +1036,12 @@ sync_thread_add_level(
} else if (level == SYNC_DICT_HEADER) {
ut_a(sync_thread_levels_g(array, SYNC_DICT_HEADER));
} else if (level == SYNC_DICT) {
- ut_a(
#ifdef UNIV_DEBUG
- buf_debug_prints ||
-#endif /* UNIV_DEBUG */
+ ut_a(buf_debug_prints ||
sync_thread_levels_g(array, SYNC_DICT));
+#else /* UNIV_DEBUG */
+ ut_a(sync_thread_levels_g(array, SYNC_DICT));
+#endif /* UNIV_DEBUG */
} else {
ut_error;
}