bk commit into 5.1 tree (msvensson:1.2306)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-09-08 09:37:08+02:00, msvensson@shellback.(none) +14 -0
  Merge bk-internal:/home/bk/mysql-5.1-new-maint
  into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.2304.1.49

  configure.in@stripped, 2006-09-08 09:37:02+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.379.1.5

  include/mysql_com.h@stripped, 2006-09-08 09:37:03+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.110.1.3

  mysql-test/lib/mtr_process.pl@stripped, 2006-09-08 09:37:03+02:00,
msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.47.1.1

  mysql-test/mysql-test-run.pl@stripped, 2006-09-08 09:37:03+02:00,
msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.162.1.5

  mysql-test/r/grant.result@stripped, 2006-09-08 09:37:03+02:00, msvensson@shellback.(none) +0
-0
    Auto merged
    MERGE: 1.58.1.6

  mysql-test/r/partition.result@stripped, 2006-09-08 09:37:03+02:00,
msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.55.1.1

  mysql-test/r/partition_mgm.result@stripped, 2006-09-08 09:37:03+02:00,
msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.6.1.1

  mysql-test/t/disabled.def@stripped, 2006-09-08 09:37:03+02:00, msvensson@shellback.(none)
+0 -0
    Auto merged
    MERGE: 1.194.1.2

  mysql-test/t/grant.test@stripped, 2006-09-08 09:37:03+02:00, msvensson@shellback.(none) +0
-0
    Auto merged
    MERGE: 1.45.1.5

  sql/item_strfunc.cc@stripped, 2006-09-08 09:37:03+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.288.1.3

  sql/item_strfunc.h@stripped, 2006-09-08 09:37:03+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.118.1.3

  sql/mysqld.cc@stripped, 2006-09-08 09:37:03+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.578.1.7

  sql/sql_acl.cc@stripped, 2006-09-08 09:37:04+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.210.1.6

  sql/sql_show.cc@stripped, 2006-09-08 09:37:04+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.365.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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.380/configure.in	2006-09-08 09:37:17 +02:00
+++ 1.381/configure.in	2006-09-08 09:37:17 +02:00
@@ -1530,17 +1530,20 @@
 if test "$with_debug" = "yes"
 then
   # Medium debug.
-  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"
-  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS"
+  AC_DEFINE([DBUG_ON], [1], [Use libdbug])
+  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS"
+  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
 elif test "$with_debug" = "full"
 then
   # Full debug. Very slow in some cases
-  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
-  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
+  AC_DEFINE([DBUG_ON], [1], [Use libdbug])
+  CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
+  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
 else
   # Optimized version. No debug
-  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"
-  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"
+  AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])
+  CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"
+  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
 fi
 
 # If we should allow error injection tests

--- 1.579/sql/mysqld.cc	2006-09-08 09:37:17 +02:00
+++ 1.580/sql/mysqld.cc	2006-09-08 09:37:17 +02:00
@@ -326,8 +326,6 @@
 static char *default_collation_name; 
 static char *default_storage_engine_str;
 static char compiled_default_collation_name[]= MYSQL_DEFAULT_COLLATION_NAME;
-static char mysql_data_home_buff[2];
-static struct passwd *user_info;
 static I_List<THD> thread_cache;
 
 static pthread_cond_t COND_thread_cache, COND_flush_thread_cache;
@@ -508,7 +506,8 @@
 
 const char *opt_date_time_formats[3];
 
-char *mysql_data_home= mysql_real_data_home;
+char mysql_data_home_buff[2], *mysql_data_home=mysql_real_data_home;
+struct passwd *user_info;
 char server_version[SERVER_VERSION_LENGTH];
 char *mysqld_unix_port, *opt_mysql_tmpdir;
 const char **errmesg;			/* Error messages */
@@ -7593,10 +7592,10 @@
     }
     switch (method-1) {
     case 0: 
-      method_conv= MI_STATS_METHOD_NULLS_EQUAL;
+      method_conv= MI_STATS_METHOD_NULLS_NOT_EQUAL;
       break;
     case 1:
-      method_conv= MI_STATS_METHOD_NULLS_NOT_EQUAL;
+      method_conv= MI_STATS_METHOD_NULLS_EQUAL;
       break;
     case 2:
       method_conv= MI_STATS_METHOD_IGNORE_NULLS;

--- 1.211/sql/sql_acl.cc	2006-09-08 09:37:17 +02:00
+++ 1.212/sql/sql_acl.cc	2006-09-08 09:37:17 +02:00
@@ -5379,14 +5379,6 @@
       continue;
     }
 
-    if (user_name->host.length > HOSTNAME_LENGTH ||
-	user_name->user.length > USERNAME_LENGTH)
-    {
-      append_user(&wrong_users, user_name);
-      result= TRUE;
-      continue;
-    }
-
     /*
       Search all in-memory structures and grant tables
       for a mention of the new user name.

--- 1.163/mysql-test/mysql-test-run.pl	2006-09-08 09:37:17 +02:00
+++ 1.164/mysql-test/mysql-test-run.pl	2006-09-08 09:37:17 +02:00
@@ -216,7 +216,7 @@
 our $opt_extern;
 our $opt_fast;
 our $opt_force;
-our $opt_reorder= 1;
+our $opt_reorder= 0;
 our $opt_enable_disabled;
 
 our $opt_gcov;

--- 1.195/mysql-test/t/disabled.def	2006-09-08 09:37:17 +02:00
+++ 1.196/mysql-test/t/disabled.def	2006-09-08 09:37:17 +02:00
@@ -13,8 +13,7 @@
 #events_stress            : BUG#17619 2006-02-21 andrey  Race conditions
 #events                   : BUG#17619 2006-02-21 andrey  Race conditions
 #events_scheduling        : BUG#19170 2006-04-26 andrey  Test case of 19170 fails on some
platforms. Has to be checked.
-im_instance_conf          : Bug#20294 2006-06-06 monty   Instance manager test
im_instance_conf fails randomly
-im_options                : Bug#20294 2006-07-24 stewart   Instance manager test
im_instance_conf fails randomly
+im_options                : Bug#20294 2006-07-24 stewart   Instance manager test
im_options fails randomly
 #im_life_cycle             : Bug#20368 2006-06-10 alik    im_life_cycle test fails
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

--- 1.46/mysql-test/t/grant.test	2006-09-08 09:37:17 +02:00
+++ 1.47/mysql-test/t/grant.test	2006-09-08 09:37:17 +02:00
@@ -682,8 +682,6 @@
 
 drop table t1;
 
-
-
 #
 # Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non
 #            privileged view