diff options
| author | unknown <monty@narttu.mysql.fi> | 2008-02-21 02:51:51 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2008-02-21 02:51:51 +0200 |
| commit | 33c24d59f49f783a50b7a7374fb31bbd67e6d462 (patch) | |
| tree | 5a8d48b69b5cf1c039cbb34fb6fa62583e7a6c22 /dbug | |
| parent | 2e5a7aadc66bdca8e4b2d1f770403073d13773eb (diff) | |
| parent | df843c4ce26e2c5d152098302b209252c712382e (diff) | |
| download | mariadb-git-33c24d59f49f783a50b7a7374fb31bbd67e6d462.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
dbug/dbug.c:
Auto merged
mysys/lf_alloc-pin.c:
Auto merged
storage/maria/lockman.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_recovery.c:
Auto merged
storage/maria/unittest/ma_test_recovery.pl:
Manual merge
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/dbug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index d7e20b32c2c..6d4539ce889 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -124,7 +124,7 @@ #define SANITY_CHECK_ON (1 << 10) /* Check safemalloc on DBUG_ENTER */ #define FLUSH_ON_WRITE (1 << 11) /* Flush on every write */ #define OPEN_APPEND (1 << 12) /* Open for append */ -#define TRACE_ON (1 << 31) /* Trace enabled. MUST be the highest bit!*/ +#define TRACE_ON ((uint)1 << 31) /* Trace enabled. MUST be the highest bit!*/ #define TRACING (cs->stack->flags & TRACE_ON) #define DEBUGGING (cs->stack->flags & DEBUG_ON) |