bk commit into 5.0 tree (lars:1.2303)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lars. When lars does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-13 17:54:01+01:00, lars@stripped +6 -0
  Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
  into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
  MERGE: 1.1616.2839.7

  BitKeeper/triggers/post-commit@stripped, 2006-11-13 17:52:13+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.22.1.13

  mysql-test/t/func_gconcat.test@stripped, 2006-11-13 17:52:13+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.23.1.17

  sql/item_sum.cc@stripped, 2006-11-13 17:52:13+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.89.1.62

  sql/log_event.h@stripped, 2006-11-13 17:53:58+01:00, lars@stripped +2 -2
    Manual merge
    MERGE: 1.90.1.11

  sql/slave.cc@stripped, 2006-11-13 17:53:58+01:00, lars@stripped +0 -1
    Manual merge
    MERGE: 1.188.1.96

  sql/sql_repl.cc@stripped, 2006-11-13 17:52:13+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.102.1.38

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	black.(none)
# Root:	/home/bk/MERGE/mysql-5.0-merge/RESYNC

--- 1.124/sql/log_event.h	2006-06-12 14:54:40 +02:00
+++ 1.125/sql/log_event.h	2006-11-13 17:53:58 +01:00
@@ -200,8 +200,16 @@
 #define EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN (4 + 4 + 4 + 1)
 #define EXECUTE_LOAD_QUERY_HEADER_LEN  (QUERY_HEADER_LEN +
EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN)
 
-/*
-   Event header offsets;
+/* 
+  Max number of possible extra bytes in a replication event compared to a
+  packet (i.e. a query) sent from client to master.
+*/
+#define MAX_LOG_EVENT_HEADER   (LOG_EVENT_HEADER_LEN + /* write_header */ \
+				QUERY_HEADER_LEN     + /* write_data */   \
+				NAME_LEN + 1)
+
+/* 
+   Event header offsets; 
    these point to places inside the fixed header.
 */
 

--- 1.283/sql/slave.cc	2006-11-13 12:44:50 +01:00
+++ 1.284/sql/slave.cc	2006-11-13 17:53:58 +01:00
@@ -2895,6 +2895,13 @@
     SYSTEM_THREAD_SLAVE_SQL : SYSTEM_THREAD_SLAVE_IO; 
   thd->security_ctx->skip_grants();
   my_net_init(&thd->net, 0);
+/*
+  Adding MAX_LOG_EVENT_HEADER_LEN to the max_allowed_packet on all
+  slave threads, since a replication event can become this much larger
+  than the corresponding packet (query) sent from client to master.
+*/
+  thd->variables.max_allowed_packet= global_system_variables.max_allowed_packet
+    + MAX_LOG_EVENT_HEADER;  /* note, incr over the global not session var */
   thd->net.read_timeout = slave_net_timeout;
   thd->slave_thread = 1;
   set_slave_thread_options(thd);
@@ -3483,11 +3490,19 @@
   thd->proc_info = "Connecting to master";
   // we can get killed during safe_connect
   if (!safe_connect(thd, mysql, mi))
+  {
     sql_print_information("Slave I/O thread: connected to master '%s@%s:%d',\
   replication started in log '%s' at position %s", mi->user,
-		    mi->host, mi->port,
-		    IO_RPL_LOG_NAME,
-		    llstr(mi->master_log_pos,llbuff));
+			  mi->host, mi->port,
+			  IO_RPL_LOG_NAME,
+			  llstr(mi->master_log_pos,llbuff));
+  /*
+    Adding MAX_LOG_EVENT_HEADER_LEN to the max_packet_size on the I/O
+    thread, since a replication event can become this much larger than
+    the corresponding packet (query) sent from client to master.
+  */
+    mysql->net.max_packet_size= thd->net.max_packet_size+= MAX_LOG_EVENT_HEADER;
+  }
   else
   {
     sql_print_information("Slave I/O thread killed while connecting to master");

--- 1.40/BitKeeper/triggers/post-commit	2006-09-14 16:56:57 +02:00
+++ 1.41/BitKeeper/triggers/post-commit	2006-11-13 17:52:13 +01:00
@@ -35,9 +35,17 @@
 
 CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
 CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`
-BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *#
*\([0-9][0-9]*\).*$/\1/p'`
-WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/
WL#\1/p'`
-
+#
+# composing subject lines of commit mails.
+# if a fix targets to a WL and there is a bug referred
+# then X-Bug mail header will contain the first found bug's number
+#
+BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | \
+     sed -ne 's/[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/BUG#\1/
+              s/.*BUG#\([0-9][0-9]*\)/\1/p'`
+WL=`bk -R prs -r+ -h -d':C:' ChangeSet | \
+     sed -ne 's/[Ww][Ll] *# *\([0-9][0-9]*\).*$/WL#\1/
+              s/.*\(WL#[0-9][0-9]*\)/ \1/p'`
 if [ "$BUG" = "" ]
 then
   TO=dev-public@stripped

--- 1.151/sql/sql_repl.cc	2006-09-04 13:46:55 +02:00
+++ 1.152/sql/sql_repl.cc	2006-11-13 17:52:13 +01:00
@@ -430,6 +430,12 @@
     goto err;
   }
   packet->set("\0", 1, &my_charset_bin);
+  /*
+    Adding MAX_LOG_EVENT_HEADER_LEN, since a binlog event can become
+    this larger than the corresponding packet (query) sent 
+    from client to master.
+  */
+  thd->variables.max_allowed_packet+= MAX_LOG_EVENT_HEADER;
 
   /*
     We can set log_lock now, it does not move (it's a member of