database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

after merge

Browse Source
This commit is contained in:
unknown
2004-09-07 22:10:15 +02:00
parent 2f96e073d2
commit 3f70b62ceb
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@ -2626,7 +2626,7 @@ com_use(String *buffer __attribute__((unused)), char *line)
mysql_free_result(res); mysql_free_result(res);
} }
if (!current_db || cmp_database(current_db,tmp)) if (!current_db || cmp_database(charset_info, current_db,tmp))
{ {
if (one_database) if (one_database)
skip_updates= 1; skip_updates= 1;

10
mysql-test/r/select.result
View File

@ -2353,14 +2353,14 @@ i int(11) NOT NULL default '0',
c char(10) NOT NULL default '', c char(10) NOT NULL default '',
PRIMARY KEY (i), PRIMARY KEY (i),
UNIQUE KEY c (c) UNIQUE KEY c (c)
) TYPE=MyISAM; ) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1,'a'); INSERT INTO t1 VALUES (1,'a');
INSERT INTO t1 VALUES (2,'b'); INSERT INTO t1 VALUES (2,'b');
INSERT INTO t1 VALUES (3,'c'); INSERT INTO t1 VALUES (3,'c');
EXPLAIN SELECT i FROM t1 WHERE i=1; EXPLAIN SELECT i FROM t1 WHERE i=1;
table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
t1 const PRIMARY PRIMARY 4 const 1 Using index 1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 Using index
EXPLAIN SELECT i FROM t1 WHERE i=1; EXPLAIN SELECT i FROM t1 WHERE i=1;
table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
t1 const PRIMARY PRIMARY 4 const 1 Using index 1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 Using index
DROP TABLE t1; DROP TABLE t1;

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

@ -1890,7 +1890,7 @@ CREATE TABLE t1 (
c char(10) NOT NULL default '', c char(10) NOT NULL default '',
PRIMARY KEY (i), PRIMARY KEY (i),
UNIQUE KEY c (c) UNIQUE KEY c (c)
) TYPE=MyISAM; ) ENGINE=MyISAM;
INSERT INTO t1 VALUES (1,'a'); INSERT INTO t1 VALUES (1,'a');
INSERT INTO t1 VALUES (2,'b'); INSERT INTO t1 VALUES (2,'b');