diff options
| author | unknown <hf@deer.(none)> | 2005-01-11 21:00:53 +0400 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2005-01-11 21:00:53 +0400 |
| commit | 4f113ac4f385af6a8dd3de4e9a1b117f211cce23 (patch) | |
| tree | a016853c9385e1555657e606886d3588657139ab /sql/strfunc.cc | |
| parent | d067695909d6aa58e30dd43eedc2a8e3a7fc588c (diff) | |
| parent | 7bb97a4ad8aee442d657de23093d1c9f4a2013d5 (diff) | |
| download | mariadb-git-4f113ac4f385af6a8dd3de4e9a1b117f211cce23.tar.gz | |
Merging conflicts resolved
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/strfunc.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Libraries changed
mysys/default.c:
get_defaults_files implementation added
sql/sql_base.cc:
merging
sql/sql_show.cc:
merging
Diffstat (limited to 'sql/strfunc.cc')
| -rw-r--r-- | sql/strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc index 824aa15097e..ca1a4b64af9 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -147,7 +147,7 @@ uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match) uint find_type2(TYPELIB *typelib, const char *x, uint length, CHARSET_INFO *cs) { - int find,pos,findpos; + int find,pos; const char *j; DBUG_ENTER("find_type2"); DBUG_PRINT("enter",("x: '%.*s' lib: 0x%lx", length, x, typelib)); @@ -157,7 +157,7 @@ uint find_type2(TYPELIB *typelib, const char *x, uint length, CHARSET_INFO *cs) DBUG_PRINT("exit",("no count")); DBUG_RETURN(0); } - LINT_INIT(findpos); + for (find=0, pos=0 ; (j=typelib->type_names[pos]) ; pos++) { if (!my_strnncoll(cs, (const uchar*) x, length, |