diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-16 16:47:07 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-16 16:47:07 +0300 |
| commit | efe619585840b27ef156b35f2be6ef3c9809d2e5 (patch) | |
| tree | fa68ffcd1dbdaf248e483a5692358fe7330ec507 /netware | |
| parent | a1218bb782f646111c9302740b4c443e3fed6d88 (diff) | |
| parent | 8f32ccff6032e03782ad805b97328f2e5e047384 (diff) | |
| download | mariadb-git-efe619585840b27ef156b35f2be6ef3c9809d2e5.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/libmysqlmain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/netware/libmysqlmain.c b/netware/libmysqlmain.c index 03fdb832176..2b6ea9b7e27 100644 --- a/netware/libmysqlmain.c +++ b/netware/libmysqlmain.c @@ -18,7 +18,7 @@ #include "my_global.h" -my_bool init_available_charsets(myf myflags); +void init_available_charsets(void); /* this function is required so that global memory is allocated against this library nlm, and not against a paticular client */ @@ -31,7 +31,7 @@ int _NonAppStart(void *NLMHandle, void *errorScreen, const char *commandLine, { mysql_server_init(0, NULL, NULL); - init_available_charsets(MYF(0)); + init_available_charsets(); return 0; } |