diff options
author | unknown <jani@linux-th5m.site> | 2007-05-24 19:47:58 +0300 |
---|---|---|
committer | unknown <jani@linux-th5m.site> | 2007-05-24 19:47:58 +0300 |
commit | 635728a6e69f95c0a4008fb4b65992d58486bc51 (patch) | |
tree | 2958d280359513f6d2b3ce1f9b1dfd0f818bfb98 /mysys/typelib.c | |
parent | 6356f5631c1b6dab40b747abe54797f1779aef80 (diff) | |
download | mariadb-git-635728a6e69f95c0a4008fb4b65992d58486bc51.tar.gz |
Merged from main 5.1
Diffstat (limited to 'mysys/typelib.c')
-rw-r--r-- | mysys/typelib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/typelib.c b/mysys/typelib.c index 817145bbaee..e745a9fb917 100644 --- a/mysys/typelib.c +++ b/mysys/typelib.c @@ -163,11 +163,11 @@ const char *get_type(TYPELIB *typelib, uint nr) a integer representation of the supplied string */ -my_ulonglong find_typeset(my_string x, TYPELIB *lib, int *err) +my_ulonglong find_typeset(char *x, TYPELIB *lib, int *err) { my_ulonglong result; int find; - my_string i; + char *i; DBUG_ENTER("find_set"); DBUG_PRINT("enter",("x: '%s' lib: 0x%lx", x, (long) lib)); |