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 /strings | |
| 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 'strings')
| -rw-r--r-- | strings/bcmp.c | 4 | ||||
| -rw-r--r-- | strings/decimal.c | 2 | ||||
| -rw-r--r-- | strings/strmake.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/strings/bcmp.c b/strings/bcmp.c index 1b6ed22fc22..39b5f24e055 100644 --- a/strings/bcmp.c +++ b/strings/bcmp.c @@ -24,7 +24,7 @@ #include <my_global.h> #include "m_string.h" -#ifdef HAVE_purify +#ifdef HAVE_valgrind #undef bcmp #undef HAVE_BCMP #endif @@ -50,7 +50,7 @@ uint len; /* 0 <= len <= 65535 */ #else -#ifndef HAVE_purify +#ifndef HAVE_valgrind size_t bcmp(register const uchar *s1,register const uchar *s2, register size_t len) #else diff --git a/strings/decimal.c b/strings/decimal.c index a7770fbb2e1..d8380839889 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -144,7 +144,7 @@ static double scaler1[]= { 1.0, 10.0, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9 }; -#ifdef HAVE_purify +#ifdef HAVE_valgrind #define sanity(d) DBUG_ASSERT((d)->len > 0) #else #define sanity(d) DBUG_ASSERT((d)->len >0 && ((d)->buf[0] | \ diff --git a/strings/strmake.c b/strings/strmake.c index 903a1b83626..56bd3a8f084 100644 --- a/strings/strmake.c +++ b/strings/strmake.c @@ -51,11 +51,11 @@ char *strmake(register char *dst, register const char *src, size_t length) */ if (length) { -#ifdef HAVE_purify +#ifdef HAVE_valgrind dst[length-1]= 'Z'; #else bfill(dst, length-1, (int) 'Z'); -#endif /* HAVE_purify */ +#endif /* HAVE_valgrind */ } #endif /* EXTRA_DEBUG */ return dst-1; |