Merge with 4.0 to get fixes for Windows project files

4 files changed, 17 insertions, 24 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 858a3758fe1..c5e5f881a83 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5818,12 +5818,12 @@ static void get_options(int argc,char **argv)
 static void set_server_version(void)
 {
   char *end= strxmov(server_version, MYSQL_SERVER_VERSION,
-                     MYSQL_SERVER_SUFFIX, NullS);
+                     MYSQL_SERVER_SUFFIX_STR, NullS);
 #ifdef EMBEDDED_LIBRARY
   end= strmov(end, "-embedded");
 #endif
 #ifndef DBUG_OFF
-  if (!strstr(MYSQL_SERVER_SUFFIX, "-debug"))
+  if (!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"))
     end= strmov(end, "-debug");
 #endif
   if (opt_log || opt_update_log || opt_slow_log || opt_bin_log)
diff --git a/sql/mysqld_suffix.h b/sql/mysqld_suffix.h
index 502cdeed75f..405c5d855b7 100644
--- a/sql/mysqld_suffix.h
+++ b/sql/mysqld_suffix.h
@@ -15,24 +15,13 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /*
-  Set MYSQL_SERVER_SUFFIX
-  The following code is quite ugly as there is no portable way to set a
+  Set MYSQL_SERVER_SUFFIX_STR
+  The following code is quite ugly as there is no portable way to easily set a
   string to the value of a macro
 */
 
-#if defined(MYSQL_SERVER_SUFFIX_NT)
-#undef MYSQL_SERVER_SUFFIX
-#define MYSQL_SERVER_SUFFIX "-nt"
-#elif defined(MYSQL_SERVER_SUFFIX_MAX)
-#undef MYSQL_SERVER_SUFFIX
-#define MYSQL_SERVER_SUFFIX "-max"
-#elif defined(MYSQL_SERVER_SUFFIX_NT_MAX)
-#undef MYSQL_SERVER_SUFFIX
-#define MYSQL_SERVER_SUFFIX "-nt-max"
-#elif defined(MYSQL_SERVER_SUFFIX_PRO)
-#undef MYSQL_SERVER_SUFFIX
-#define MYSQL_SERVER_SUFFIX "-pro"
-#elif defined(MYSQL_SERVER_SUFFIX_PRO_NT)
-#undef MYSQL_SERVER_SUFFIX
-#define MYSQL_SERVER_SUFFIX "-pro-nt"
+#ifdef MYSQL_SERVER_SUFFIX
+#define MYSQL_SERVER_SUFFIX_STR STRINGIFY_ARG(MYSQL_SERVER_SUFFIX)
+#else
+#define MYSQL_SERVER_SUFFIX_STR MYSQL_SERVER_SUFFIX_DEF
 #endif
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 403304cc7c4..b3b0153652b 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -442,7 +442,7 @@ sys_var_thd_ulong               sys_group_concat_max_len("group_concat_max_len",
 
 sys_var_const_str		sys_os("version_compile_os", SYSTEM_TYPE);
 /* Global read-only variable describing server license */
-sys_var_const_str		sys_license("license", LICENSE);
+sys_var_const_str		sys_license("license", STRINGIFY_ARG(LICENSE));
 
 
 /*
diff --git a/sql/slave.cc b/sql/slave.cc
index a66e78f04bc..fa17a192b12 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2487,13 +2487,17 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
   thd->master_access= ~0;
   thd->priv_user = 0;
   thd->slave_thread = 1;
-  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.
+     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->variables.max_join_size= HA_POS_ERROR;    
+  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);