bk commit into 5.1 tree (joerg:1.2367)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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-12-21 12:10:41+01:00, joerg@trift2. +6 -0
  Merge trift2.:/MySQL/M50/clone-5.0
  into  trift2.:/MySQL/M51/tmp-5.1
  MERGE: 1.1810.2399.9

  client/mysql_upgrade.c@stripped, 2006-12-21 12:03:19+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.6.1.9

  mysql-test/t/myisam.test@stripped, 2006-12-21 12:03:19+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.55.1.16

  mysql-test/t/query_cache_notembedded.test@stripped, 2006-12-21 12:03:19+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.2.1.3

  mysql-test/t/rpl000017.test@stripped, 2006-12-21 12:04:28+01:00, joerg@trift2. +0 -2
    Fix of socket name (5.0) does not apply in 5.1, so this is a null-merge.
    MERGE: 1.13.1.2

  mysql-test/t/rpl_000015.test@stripped, 2006-12-21 12:10:38+01:00, joerg@trift2. +0 -6
    Manual merge.
    MERGE: 1.31.6.2

  mysql-test/t/rpl_000015.test@stripped, 2006-12-21 12:03:19+01:00, joerg@trift2. +0 -0
    Merge rename: mysql-test/t/rpl000015.test -> mysql-test/t/rpl_000015.test

  mysql-test/t/rpl_rotate_logs.test@stripped, 2006-12-21 12:03:20+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.63.1.3

# 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:	joerg
# Host:	trift2.
# Root:	/MySQL/M51/tmp-5.1/RESYNC

--- 1.6/mysql-test/t/query_cache_notembedded.test	2006-12-21 12:10:50 +01:00
+++ 1.7/mysql-test/t/query_cache_notembedded.test	2006-12-21 12:10:50 +01:00
@@ -81,12 +81,12 @@
 #
 # do not use QC if tables locked (BUG#12385)
 #
-connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 connection root;
 CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE =
 MyISAM;
 LOCK TABLE t1 READ LOCAL;
-connect (root2,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root2,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 connection root2;
 INSERT INTO t1 VALUES (), (), ();
 connection root;

--- 1.19/client/mysql_upgrade.c	2006-12-21 12:10:50 +01:00
+++ 1.20/client/mysql_upgrade.c	2006-12-21 12:10:50 +01:00
@@ -144,6 +144,7 @@
   case 'f':             /* --force is ours */
   case 'u':             /* --user passed on cmdline */
   case 'T':             /* --debug-info is not accepted by mysqlcheck */
+  case 'p':             /* --password may change yet */
     /* so, do nothing */
     break;
   default:
@@ -175,7 +176,7 @@
       d->id= id;
       d->name= opt->name;
       d->n_len= strlen(opt->name);
-      if (opt->arg_type != NO_ARG)
+      if (opt->arg_type != NO_ARG && opt->value)
         switch (opt->var_type & GET_TYPE_MASK) {
         case GET_BOOL:
           if (*((int *)opt->value))
@@ -321,6 +322,15 @@
   }
   
   dynstr_set(&buf, "\n[client]");
+  if (opt_password) 
+  {
+    if (dynstr_append(&buf, "\npassword=")
+       || dynstr_append(&buf, opt_password))
+    {
+      ret = 1;
+      goto error;
+    }
+  }
   while (extra_defaults) 
   {
     int len;

--- 1.71/mysql-test/t/myisam.test	2006-12-21 12:10:50 +01:00
+++ 1.72/mysql-test/t/myisam.test	2006-12-21 12:10:50 +01:00
@@ -498,7 +498,7 @@
 insert into t2 values (1,1),(2,1);
 lock tables t1 read local, t2 read local;
 select straight_join * from t1,t2 force index (primary) where t1.a=t2.a;
-connect (root,localhost,root,,test,$MASTER_MYPORT,master.sock);
+connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 insert into t2 values(2,0);
 disconnect root;
 connection default;

--- 1.31.6.1/mysql-test/t/rpl000015.test	2006-12-21 12:10:50 +01:00
+++ 1.39/mysql-test/t/rpl_000015.test	2006-12-21 12:10:50 +01:00
@@ -30,12 +30,12 @@
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
-create table t1 (n int);
+create table t1 (n int, PRIMARY KEY(n));
 insert into t1 values (10),(45),(90);
 sync_slave_with_master;
-select * from t1;
+connection slave;
+SELECT * FROM t1 ORDER BY n;
 connection master;
+SELECT * FROM t1 ORDER BY n;
 drop table t1;
 sync_slave_with_master;
-
-# End of 4.1 tests

--- 1.67/mysql-test/t/rpl_rotate_logs.test	2006-12-21 12:10:50 +01:00
+++ 1.68/mysql-test/t/rpl_rotate_logs.test	2006-12-21 12:10:50 +01:00
@@ -19,7 +19,7 @@
 --disable_warnings
 drop table if exists t1, t2, t3, t4;
 --enable_warnings
-connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
 system cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
 system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
 connection slave;