Commit c6e42dfa authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org

merge fixes

parents 4833d9dd c729c0ea
...@@ -2984,7 +2984,7 @@ CHANGEABLE_VAR changeable_vars[] = { ...@@ -2984,7 +2984,7 @@ CHANGEABLE_VAR changeable_vars[] = {
#endif #endif
,0, 1, 0, 1 }, ,0, 1, 0, 1 },
{ "max_allowed_packet", (long*) &max_allowed_packet, { "max_allowed_packet", (long*) &max_allowed_packet,
1024*1024L, 80, 16L*1024L*1024L-1, MALLOC_OVERHEAD, 1024 }, 1024*1024L, 80, 16*1024*1024L, MALLOC_OVERHEAD, 1024 },
{ "max_binlog_cache_size", (long*) &max_binlog_cache_size, { "max_binlog_cache_size", (long*) &max_binlog_cache_size,
~0L, IO_SIZE, ~0L, 0, IO_SIZE }, ~0L, IO_SIZE, ~0L, 0, IO_SIZE },
{ "max_binlog_size", (long*) &max_binlog_size, { "max_binlog_size", (long*) &max_binlog_size,
......
...@@ -40,7 +40,7 @@ ulong max_allowed_packet=65536; ...@@ -40,7 +40,7 @@ ulong max_allowed_packet=65536;
extern ulong net_read_timeout,net_write_timeout; extern ulong net_read_timeout,net_write_timeout;
extern uint test_flags; extern uint test_flags;
#else #else
ulong max_allowed_packet=16*1024*1024L; ulong max_allowed_packet=16*1024*1024L-1;
ulong net_read_timeout= NET_READ_TIMEOUT; ulong net_read_timeout= NET_READ_TIMEOUT;
ulong net_write_timeout= NET_WRITE_TIMEOUT; ulong net_write_timeout= NET_WRITE_TIMEOUT;
#endif #endif
......
...@@ -1528,12 +1528,9 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, ...@@ -1528,12 +1528,9 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
/* We changed a temporary table */ /* We changed a temporary table */
if (error) if (error)
{ {
/* /*
* The following function call will also free a The following function call will free the new_table pointer,
* new_table pointer. in close_temporary_table(), so we can safely directly jump to err
* Therefore, here new_table pointer is not free'd as it is
* free'd in close_temporary() which is called by by the
* close_temporary_table() function.
*/ */
close_temporary_table(thd,new_db,tmp_name); close_temporary_table(thd,new_db,tmp_name);
goto err; goto err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment