diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-07 22:24:25 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-07 22:24:25 +0200 |
| commit | 46cd739526938bd715c795c60481f7efa2fdc526 (patch) | |
| tree | 30f7f3e7da420450e2a939a64da9a864b2660e35 | |
| parent | e92dcb38f1331000ba47488088e869f7b8b688b2 (diff) | |
| parent | 14b95f511b23b884e95d14e00499fe9bc382884c (diff) | |
| download | mariadb-git-46cd739526938bd715c795c60481f7efa2fdc526.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/t/sp-code.test:
Auto merged
| -rw-r--r-- | mysql-test/include/is_debug_build.inc | 4 | ||||
| -rw-r--r-- | mysql-test/t/sp-code.test | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/include/is_debug_build.inc b/mysql-test/include/is_debug_build.inc deleted file mode 100644 index 23a2814e2bb..00000000000 --- a/mysql-test/include/is_debug_build.inc +++ /dev/null @@ -1,4 +0,0 @@ --- require r/is_debug_build.require ---disable_query_log -select instr(version(), "debug") > 0; ---enable_query_log diff --git a/mysql-test/t/sp-code.test b/mysql-test/t/sp-code.test index 3bfa2ad74ea..66d5323d2e2 100644 --- a/mysql-test/t/sp-code.test +++ b/mysql-test/t/sp-code.test @@ -2,7 +2,7 @@ # Test the debugging feature "show procedure/function code <name>" # --- source include/is_debug_build.inc +-- source include/have_debug.inc --disable_warnings drop procedure if exists empty; |