diff options
| author | monty@mashka.mysql.fi <> | 2004-02-22 09:50:59 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2004-02-22 09:50:59 +0200 |
| commit | 3b83cce5ebc4ba1a7a6eccebc6feba76e9752f76 (patch) | |
| tree | dceddcd17cf1278b50f8838476df5644f764efe9 /innobase/ut | |
| parent | e1bc99c1314ba849d001d3c130b3cbcc0bbbb7d6 (diff) | |
| parent | e74182fe52e70efea99e96b8eaa950b96f6205e1 (diff) | |
| download | mariadb-git-3b83cce5ebc4ba1a7a6eccebc6feba76e9752f76.tar.gz | |
merge with 4.0
Diffstat (limited to 'innobase/ut')
| -rw-r--r-- | innobase/ut/ut0dbg.c | 1 | ||||
| -rw-r--r-- | innobase/ut/ut0mem.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/innobase/ut/ut0dbg.c b/innobase/ut/ut0dbg.c index 6cd0ed62454..534fdf072f1 100644 --- a/innobase/ut/ut0dbg.c +++ b/innobase/ut/ut0dbg.c @@ -18,7 +18,6 @@ ibool ut_dbg_stop_threads = FALSE; /* Null pointer used to generate memory trap */ ulint* ut_dbg_null_ptr = NULL; - const char* ut_dbg_msg_assert_fail = "InnoDB: Assertion failure in thread %lu in file %s line %lu\n"; const char* ut_dbg_msg_trap = diff --git a/innobase/ut/ut0mem.c b/innobase/ut/ut0mem.c index a3c78dd9709..65229335a09 100644 --- a/innobase/ut/ut0mem.c +++ b/innobase/ut/ut0mem.c @@ -281,4 +281,4 @@ ut_str_contains( } return(FALSE); -}
\ No newline at end of file +} |