summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-11-24 11:31:36 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-11-24 11:31:36 +0300
commitf16b372b378c6ae74c4421cec4b2f6d085ad5a76 (patch)
treec7017f926485e3c5647276d684f4adc4847f9faf /mysys
parent95cad94738c3ccfcd9aa855c246d09a71b07392b (diff)
parent049dc018dab45229c21d38dd82eaff79eb433f6a (diff)
downloadmariadb-git-f16b372b378c6ae74c4421cec4b2f6d085ad5a76.tar.gz
Manual merge from the mysql-5.1-bugteam.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/typelib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/typelib.c b/mysys/typelib.c
index a0fe8a96a89..cb72c91e20d 100644
--- a/mysys/typelib.c
+++ b/mysys/typelib.c
@@ -184,7 +184,7 @@ my_ulonglong find_typeset(char *x, TYPELIB *lib, int *err)
i= x;
while (*x && *x != field_separator)
x++;
- if (x[0] && x[1]) // skip separator if found
+ if (x[0] && x[1]) /* skip separator if found */
x++;
if ((find= find_type(i, lib, 2 | 8) - 1) < 0)
DBUG_RETURN(0);