diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-28 03:47:15 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-28 03:47:15 +0200 |
| commit | 38da1f9853ec773e6c32cdf931b1fafef2736995 (patch) | |
| tree | 1591378c44e709fb0ac9df322ad1e001c517ae50 /sql/sql_string.cc | |
| parent | da9b7e0c87b8fe7349256c3068aed09d02fb3a47 (diff) | |
| download | mariadb-git-38da1f9853ec773e6c32cdf931b1fafef2736995.tar.gz | |
Fix for IO_CACHE.
Portability fixes.
BUILD/compile-alpha-debug:
Update to newer version
libmysqld/lib_vio.c:
dbug_assert -> DBUG_ASSERT
mysql-test/r/symlink.result:
Update for new tests
mysql-test/t/symlink.test:
Update for new test format
mysys/mf_iocache2.c:
Fixed bug when reading in old buffer
sql-bench/test-transactions.sh:
Update with delete tests
sql/mysqld.cc:
Updates for amiga
sql/sql_string.cc:
Fix typo
sql/stacktrace.c:
Portability fix
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 28cb5213acd..4649af918d5 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -779,10 +779,10 @@ int wild_compare(const char *str,const char *str_end, { while (str != str_end && *str != cmp) str++; - if (str++ == str_end) + if (str++ == str_end) { - DBUG_RETURN(-1) - }; + DBUG_RETURN(-1); + } { int tmp=wild_compare(str,str_end,wildstr,wildend,escape); if (tmp <= 0) |