after merge

client/mysql.cc

@@ -2626,7 +2626,7 @@ com_use(String *buffer __attribute__((unused)), char *line)
     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)
       skip_updates= 1;

mysql-test/r/select.result

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

mysql-test/t/select.test

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