diff options
| author | unknown <monty@donna.mysql.com> | 2000-10-17 00:47:15 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-10-17 00:47:15 +0300 |
| commit | 0c511215f23809c4b9e8f5c26ad96520252e7758 (patch) | |
| tree | ab2709570d10aac2956fa63114d45c79b2b5ea19 /sql/item_strfunc.cc | |
| parent | 9c019f4e4fc4d34f3c82723d1182f0917b9c5360 (diff) | |
| download | mariadb-git-0c511215f23809c4b9e8f5c26ad96520252e7758.tar.gz | |
Automatic repair of MyISAM tables + small bug fixes
Docs/manual.texi:
Updates for 3.23.26
include/Makefile.am:
Install my_config.h
include/my_pthread.h:
Fix for Ia64
myisam/mi_check.c:
Wrong new record pos on dupplicate key error
myisam/mi_open.c:
Fix for automatic repair
myisam/myisamchk.c:
Fix for automatic repair
myisam/myisamdef.h:
Fix for automatic repair
mysys/mf_tempfile.c:
Fix usage of mkstemp
sql-bench/bench-init.pl.sh:
Better help text
sql-bench/test-insert.sh:
Fix for slow databases
sql/field.cc:
Fix of default values for CREATE TABLE ... SELECT
sql/ha_berkeley.cc:
Fix bug in BDB records_in_range
sql/ha_myisam.cc:
Fix for automatic repair
sql/ha_myisam.h:
Fix for automatic repair
sql/handler.cc:
Fixes for innobase
sql/item_strfunc.cc:
Fix for SUBSTR_INDEX and REPLACE
sql/log_event.h:
Portability fix
sql/mysqld.cc:
Added INNOBASE and fixes for automatic recover of MyISAM tables
sql/sql_base.cc:
Fix for automatic repair
sql/sql_table.cc:
Fix for IF EXISTS when used with CREATE TEMPORARY
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index b3494f7c81d..a52b9a85857 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -448,7 +448,7 @@ skipp: res->replace((uint) offset,from_length,*res3); offset+=(int) to_length; } - while ((offset=res->strstr(*res2,(uint) offset)) >0); + while ((offset=res->strstr(*res2,(uint) offset)) >= 0); return res; null: @@ -768,7 +768,7 @@ String *Item_func_substr_index::val_str(String *str) } else { // Start counting at end - for (offset=res->length() ; ; offset-=delimeter_length) + for (offset=res->length() ; ; offset-=delimeter_length-1) { if ((int) (offset=res->strrstr(*delimeter,offset)) < 0) return res; // Didn't find, return org string |