Commit 1d1cd094 authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M50/clone-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 69a11590 eff34099

client/mysql_upgrade.c

+11 −1
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ void set_extra_default(int id, const struct my_option *opt) 
  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 @@ void set_extra_default(int id, const struct my_option *opt) 
      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 @@ static int create_defaults_file(const char *path, const char *forced_path) 
  }

  

  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;

mysql-test/t/myisam.test

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5),(6); 
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;

mysql-test/t/query_cache_notembedded.test

+2 −2
Original line number Diff line number Diff line
@@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21; 
#

# 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;

mysql-test/t/rpl000015.test

+1 −1
Original line number Diff line number Diff line 
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);

connection master;

reset master;

show master status;

mysql-test/t/rpl000017.test

+1 −1
Original line number Diff line number Diff line 
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,slave.sock);

connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);

connection master;

reset master;

grant replication slave on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';