diff options
| author | monty@mashka.mysql.fi <> | 2002-09-19 18:46:35 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-09-19 18:46:35 +0300 |
| commit | 76d7ab0ad2b57e843ea05e1e10ebd6ddb41339d1 (patch) | |
| tree | 9f00115eb7182d7833a4091c56ad43281a11537e /client | |
| parent | 96ebe3816f5e0c966ac165bed7a4dbff576c5379 (diff) | |
| parent | d2b077324444a58a5966ff5e58f54e0019686b08 (diff) | |
| download | mariadb-git-76d7ab0ad2b57e843ea05e1e10ebd6ddb41339d1.tar.gz | |
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 3 | ||||
| -rw-r--r-- | client/mysqldump.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 0b7add434c9..b2100ac1596 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -407,7 +407,8 @@ static void dump_local_log_entries(const char* logname) File fd = -1; IO_CACHE cache,*file= &cache; ulonglong rec_count = 0; - char last_db[FN_REFLEN+1], tmp_buff[BIN_LOG_HEADER_SIZE]; + char last_db[FN_REFLEN+1]; + byte tmp_buff[BIN_LOG_HEADER_SIZE]; bool old_format = 0; last_db[0]=0; diff --git a/client/mysqldump.c b/client/mysqldump.c index 612746c205b..e957e33ae04 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -232,7 +232,7 @@ static struct my_option my_long_options[] = NO_ARG, 0, 0, 0, 0, 0, 0}, {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET, "", (gptr*) &max_allowed_packet, (gptr*) &max_allowed_packet, 0, - GET_ULONG, REQUIRED_ARG, 24*1024*1024, 4096, 512*1024L*1024L, + GET_ULONG, REQUIRED_ARG, 24*1024*1024, 4096, 1024*1024L*1024L, MALLOC_OVERHEAD, 1024, 0}, {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "", (gptr*) &net_buffer_length, (gptr*) &net_buffer_length, 0, |