diff options
| author | unknown <monty@mysql.com> | 2003-12-19 16:34:48 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-19 16:34:48 +0200 |
| commit | 245b1385a10a12a955c95338b08190cac5cfcbd4 (patch) | |
| tree | 05b144ca850fc0bb99c1922907bfb2e9ba19fc77 /sql-common | |
| parent | 060122db13c995908835ca338aeeab848024e266 (diff) | |
| parent | 9c2a63e35eec7a1af94dde1f10331361124a69f4 (diff) | |
| download | mariadb-git-245b1385a10a12a955c95338b08190cac5cfcbd4.tar.gz | |
merge
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
sql/field.cc:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
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 73e90d08b51..14b45942e15 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, |