diff options
| author | hf@deer.(none) <> | 2003-12-18 15:51:22 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-12-18 15:51:22 +0400 |
| commit | 42799cc584c29f513cf3d3f957addd1c44f704d0 (patch) | |
| tree | 2785059bf0f530b8d1cff70378904178e52fb05e /sql-common | |
| parent | 2b53eef5f00364464652847065a81a32571cc73f (diff) | |
| download | mariadb-git-42799cc584c29f513cf3d3f957addd1c44f704d0.tar.gz | |
Fix for #2126 (mysql_server_init call shouldn't be needed)
now mysql_server_init is called from mysql_init with fake parameters
mysql_once_init code included to mysql_server_init.
embedded-specific initialization is in init_embedded_server function
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 374cbb29112..73e90d08b51 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1310,7 +1310,8 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) MYSQL * STDCALL mysql_init(MYSQL *mysql) { - mysql_once_init(); + if (mysql_server_init(0, NULL, NULL)) + return 0; if (!mysql) { if (!(mysql=(MYSQL*) my_malloc(sizeof(*mysql),MYF(MY_WME | MY_ZEROFILL)))) |