merge fixes

3 files changed, 5 insertions, 8 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 87fb613fe88..e2adc1a068e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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,
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 750079b39a5..2583f0767f4 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -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
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index e2fa8bc00d5..4691c2fd494 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1528,12 +1528,9 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
     /* We changed a temporary table */
     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;