bk commit into 5.0 tree (lars:1.2302)

[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 12:44:53+01:00, lars@stripped +3 -0
  Merge mysql.com:/home/bkroot/mysql-5.0-rpl
  into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
  MERGE: 1.2283.4.4

  BitKeeper/etc/collapsed@stripped, 2006-11-13 12:44:47+01:00, lars@stripped +0 -0
    auto-union
    MERGE: 1.10.1.1

  sql/mysql_priv.h@stripped, 2006-11-13 12:44:50+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.419.1.1

  sql/slave.cc@stripped, 2006-11-13 12:44:50+01:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.281.1.1

# 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.421/sql/mysql_priv.h	2006-11-13 12:44:57 +01:00
+++ 1.422/sql/mysql_priv.h	2006-11-13 12:44:57 +01:00
@@ -96,6 +96,17 @@
 extern CHARSET_INFO *national_charset_info, *table_alias_charset;
 
 
+enum Derivation
+{
+  DERIVATION_IGNORABLE= 5,
+  DERIVATION_COERCIBLE= 4,
+  DERIVATION_SYSCONST= 3,
+  DERIVATION_IMPLICIT= 2,
+  DERIVATION_NONE= 1,
+  DERIVATION_EXPLICIT= 0
+};
+
+
 typedef struct my_locale_st
 {
   const char *name;

--- 1.282/sql/slave.cc	2006-11-13 12:44:57 +01:00
+++ 1.283/sql/slave.cc	2006-11-13 12:44:57 +01:00
@@ -2854,8 +2854,21 @@
 
 void set_slave_thread_options(THD* thd)
 {
-  thd->options = ((opt_log_slave_updates) ? OPTION_BIN_LOG:0) |
-    OPTION_AUTO_IS_NULL;
+  /*
+     It's nonsense to constrain the slave threads with max_join_size; if a
+     query succeeded on master, we HAVE to execute it. So set
+     OPTION_BIG_SELECTS. Setting max_join_size to HA_POS_ERROR is not enough
+     (and it's not needed if we have OPTION_BIG_SELECTS) because an INSERT
+     SELECT examining more than 4 billion rows would still fail (yes, because
+     when max_join_size is 4G, OPTION_BIG_SELECTS is automatically set, but
+     only for client threads.
+  */
+  ulonglong options= thd->options | OPTION_BIG_SELECTS;
+  if (opt_log_slave_updates)
+    options|= OPTION_BIN_LOG;
+  else
+    options&= ~OPTION_BIN_LOG;
+  thd->options= options;
   thd->variables.completion_type= 0;
 }
 
@@ -2885,17 +2898,6 @@
   thd->net.read_timeout = slave_net_timeout;
   thd->slave_thread = 1;
   set_slave_thread_options(thd);
-  /* 
-     It's nonsense to constrain the slave threads with max_join_size; if a
-     query succeeded on master, we HAVE to execute it. So set
-     OPTION_BIG_SELECTS. Setting max_join_size to HA_POS_ERROR is not enough
-     (and it's not needed if we have OPTION_BIG_SELECTS) because an INSERT
-     SELECT examining more than 4 billion rows would still fail (yes, because
-     when max_join_size is 4G, OPTION_BIG_SELECTS is automatically set, but
-     only for client threads.
-  */
-  thd->options = ((opt_log_slave_updates) ? OPTION_BIN_LOG:0) |
-    OPTION_AUTO_IS_NULL | OPTION_BIG_SELECTS;
   thd->client_capabilities = CLIENT_LOCAL_FILES;
   thd->real_id=pthread_self();
   pthread_mutex_lock(&LOCK_thread_count);

--- 1.13/BitKeeper/etc/collapsed	2006-11-13 12:44:57 +01:00
+++ 1.14/BitKeeper/etc/collapsed	2006-11-13 12:44:57 +01:00
@@ -15,5 +15,7 @@
 45214442pBGT9KuZEGixBH71jTzbOA
 45214a07hVsIGwvwa-WrO-jpeaSwVw
 452a92d0-31-8wSzSfZi165fcGcXPA
+452c6c6dAjuNghfc1ObZ_UQ5SCl85g
+4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg
 454a7ef8gdvE_ddMlJyghvOAkKPNOQ
 454f8960jsVT_kMKJtZ9OCgXoba0xQ