1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  trift2.:/MySQL/M51/tmp-5.1
This commit is contained in:
joerg@trift2. 2006-12-21 12:18:28 +01:00
commit 1341cf1827
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/mysql_upgrade.c
View File

@ -144,6 +144,7 @@ void set_extra_default(int id, const struct my_option *opt)
case 'f': /* --force is ours */ case 'f': /* --force is ours */
case 'u': /* --user passed on cmdline */ case 'u': /* --user passed on cmdline */
case 'T': /* --debug-info is not accepted by mysqlcheck */ case 'T': /* --debug-info is not accepted by mysqlcheck */
case 'p': /* --password may change yet */
/* so, do nothing */ /* so, do nothing */
break; break;
default: default:
@ -175,7 +176,7 @@ void set_extra_default(int id, const struct my_option *opt)
d->id= id; d->id= id;
d->name= opt->name; d->name= opt->name;
d->n_len= strlen(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) { switch (opt->var_type & GET_TYPE_MASK) {
case GET_BOOL: case GET_BOOL:
if (*((int *)opt->value)) 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]"); 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) while (extra_defaults)
{ {
int len; int len;

2
mysql-test/t/myisam.test
View File

@ -498,7 +498,7 @@ insert into t1 values (1),(2),(3),(4),(5),(6);
insert into t2 values (1,1),(2,1); insert into t2 values (1,1),(2,1);
lock tables t1 read local, t2 read local; lock tables t1 read local, t2 read local;
select straight_join * from t1,t2 force index (primary) where t1.a=t2.a; 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); insert into t2 values(2,0);
disconnect root; disconnect root;
connection default; connection default;

4
mysql-test/t/query_cache_notembedded.test
View File

@ -81,12 +81,12 @@ drop table t1, t2, t3, t11, t21;
# #
# do not use QC if tables locked (BUG#12385) # 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; connection root;
CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE = CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE =
MyISAM; MyISAM;
LOCK TABLE t1 READ LOCAL; 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; connection root2;
INSERT INTO t1 VALUES (), (), (); INSERT INTO t1 VALUES (), (), ();
connection root; connection root;

2
mysql-test/t/rpl_000015.test
View File

@ -5,7 +5,7 @@
##################### #####################
connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); 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; connection master;
reset master; reset master;
show master status; show master status;

2
mysql-test/t/rpl_rotate_logs.test
View File

@ -19,7 +19,7 @@ connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
--disable_warnings --disable_warnings
drop table if exists t1, t2, t3, t4; drop table if exists t1, t2, t3, t4;
--enable_warnings --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 cat /dev/null > $MYSQLTEST_VARDIR/slave-data/master.info;
system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info; system chmod 000 $MYSQLTEST_VARDIR/slave-data/master.info;
connection slave; connection slave;