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

merge fixes

parents 4833d9dd c729c0ea

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -2984,7 +2984,7 @@ CHANGEABLE_VAR changeable_vars[] = { 
#endif

    ,0, 1, 0, 1 },

  { "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,

      ~0L, IO_SIZE, ~0L, 0, IO_SIZE },

  { "max_binlog_size",         (long*) &max_binlog_size,

sql/net_serv.cc

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ ulong max_allowed_packet=65536; 
extern ulong net_read_timeout,net_write_timeout;

extern uint test_flags;

#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_write_timeout= NET_WRITE_TIMEOUT;

#endif

sql/sql_table.cc

+3 −6
Original line number Diff line number Diff line
@@ -1529,11 +1529,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, 
    if (error)

    {

      /*

       * The following function call will also free a 

       * new_table pointer.

       * 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.

	The following function call will free the new_table pointer,

	in close_temporary_table(), so we can safely directly jump to err

      */

      close_temporary_table(thd,new_db,tmp_name);

      goto err;