diff options
| author | monty@mysql.com <> | 2003-12-19 16:25:50 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-12-19 16:25:50 +0200 |
| commit | 031390a9a4904924c21929314dcd42886c84c175 (patch) | |
| tree | 87e8ff9b43e2e71fc79bfa2e296018b89b08a9e1 /sql-common | |
| parent | e0cc6799ecc831d296c568c5068947c1421fcaa5 (diff) | |
| download | mariadb-git-031390a9a4904924c21929314dcd42886c84c175.tar.gz | |
Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 374cbb29112..5b702f0e966 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -967,7 +967,8 @@ void mysql_read_default_options(struct st_mysql_options *options, #endif break; case 27: - options->max_allowed_packet= atoi(opt_arg); + if (opt_arg) + options->max_allowed_packet= atoi(opt_arg); break; case 28: /* protocol */ if ((options->protocol = find_type(opt_arg, @@ -1310,7 +1311,9 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) MYSQL * STDCALL mysql_init(MYSQL *mysql) { - mysql_once_init(); + if (mysql_once_init()) + return 0; + if (!mysql) { if (!(mysql=(MYSQL*) my_malloc(sizeof(*mysql),MYF(MY_WME | MY_ZEROFILL)))) |