Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/my/mysql-4.1

7 files changed, 46 insertions, 24 deletions

diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
index 7e5c519e108..f5754bb3332 100644
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@@ -271,8 +271,8 @@ delete P1.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Cou
 select * from t1;
 N	M
 3	0
-delete P1.*,P2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
-ERROR HY000: The target table P2 of the DELETE is not updatable
+delete P1.*,p2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS p2 ON P1.N = p2.N;
+ERROR HY000: The target table p2 of the DELETE is not updatable
 delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;
 ERROR 42S22: Unknown column 'aaa' in 'field list'
 drop table t1;
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index 93d4319ea86..9085849e582 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -119,15 +119,6 @@ ASIN(0.8+0.2)
 SELECT ASIN(1.2-0.2);
 ASIN(1.2-0.2)
 1.570796
-select floor(log(4)/log(2));
-floor(log(4)/log(2))
-2
-select floor(log(8)/log(2));
-floor(log(8)/log(2))
-3
-select floor(log(16)/log(2));
-floor(log(16)/log(2))
-4
 explain extended select degrees(pi()),radians(360);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result
index 1f78a505280..bb82dcb1e6a 100644
--- a/mysql-test/r/rpl000009.result
+++ b/mysql-test/r/rpl000009.result
@@ -112,6 +112,18 @@ n	s
 2	two test
 3	three test
 4	four test
+stop slave;
+reset slave;
+load data from master;
+start slave;
+insert into mysqltest.t1 values (5, 'five bar');
+select * from mysqltest.t1;
+n	s
+1	one test
+2	two test
+3	three test
+4	four test
+5	five bar
 load table mysqltest.t1 from master;
 ERROR 42S01: Table 't1' already exists
 drop table mysqltest.t1;
diff --git a/mysql-test/r/rpl_error_ignored_table.result b/mysql-test/r/rpl_error_ignored_table.result
index 247b88e42c1..dd277e41ad0 100644
--- a/mysql-test/r/rpl_error_ignored_table.result
+++ b/mysql-test/r/rpl_error_ignored_table.result
@@ -26,7 +26,7 @@ select (@id := id) - id from t3;
 0
 kill @id;
 drop table t2,t3;
-ERROR 08S01: Server shutdown in progress
+Got one of the listed errors
 show binlog events from 79;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.000001	79	Query	1	79	use `test`; create table t1 (a int primary key)
diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result
index 257b3b13f08..8da46564619 100644
--- a/mysql-test/r/system_mysql_db.result
+++ b/mysql-test/r/system_mysql_db.result
@@ -3,6 +3,10 @@ Tables_in_db
 columns_priv
 db
 func
+help_category
+help_keyword
+help_relation
+help_topic
 host
 tables_priv
 user
@@ -26,7 +30,7 @@ db	CREATE TABLE `db` (
   `Lock_tables_priv` enum('N','Y') NOT NULL default 'N',
   PRIMARY KEY  (`Host`,`Db`,`User`),
   KEY `User` (`User`)
-) TYPE=MyISAM COMMENT='Database privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Database privileges'
 show create table host;
 Table	Create Table
 host	CREATE TABLE `host` (
@@ -45,13 +49,13 @@ host	CREATE TABLE `host` (
   `Create_tmp_table_priv` enum('N','Y') NOT NULL default 'N',
   `Lock_tables_priv` enum('N','Y') NOT NULL default 'N',
   PRIMARY KEY  (`Host`,`Db`)
-) TYPE=MyISAM COMMENT='Host privileges;  Merged with database privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Host privileges;  Merged with database privileges'
 show create table user;
 Table	Create Table
 user	CREATE TABLE `user` (
   `Host` varchar(60) binary NOT NULL default '',
   `User` varchar(16) binary NOT NULL default '',
-  `Password` varchar(16) binary NOT NULL default '',
+  `Password` varchar(41) binary NOT NULL default '',
   `Select_priv` enum('N','Y') NOT NULL default 'N',
   `Insert_priv` enum('N','Y') NOT NULL default 'N',
   `Update_priv` enum('N','Y') NOT NULL default 'N',
@@ -81,16 +85,16 @@ user	CREATE TABLE `user` (
   `max_updates` int(11) unsigned NOT NULL default '0',
   `max_connections` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`Host`,`User`)
-) TYPE=MyISAM COMMENT='Users and global privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Users and global privileges'
 show create table func;
 Table	Create Table
 func	CREATE TABLE `func` (
-  `name` char(64) NOT NULL default '',
+  `name` char(64) binary NOT NULL default '',
   `ret` tinyint(1) NOT NULL default '0',
   `dl` char(128) NOT NULL default '',
   `type` enum('function','aggregate') NOT NULL default 'function',
   PRIMARY KEY  (`name`)
-) TYPE=MyISAM COMMENT='User defined functions'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='User defined functions'
 show create table tables_priv;
 Table	Create Table
 tables_priv	CREATE TABLE `tables_priv` (
@@ -99,12 +103,12 @@ tables_priv	CREATE TABLE `tables_priv` (
   `User` char(16) binary NOT NULL default '',
   `Table_name` char(64) binary NOT NULL default '',
   `Grantor` char(77) NOT NULL default '',
-  `Timestamp` timestamp(14) NOT NULL,
+  `Timestamp` timestamp NOT NULL,
   `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') NOT NULL default '',
   `Column_priv` set('Select','Insert','Update','References') NOT NULL default '',
   PRIMARY KEY  (`Host`,`Db`,`User`,`Table_name`),
   KEY `Grantor` (`Grantor`)
-) TYPE=MyISAM COMMENT='Table privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Table privileges'
 show create table columns_priv;
 Table	Create Table
 columns_priv	CREATE TABLE `columns_priv` (
@@ -113,7 +117,7 @@ columns_priv	CREATE TABLE `columns_priv` (
   `User` char(16) binary NOT NULL default '',
   `Table_name` char(64) binary NOT NULL default '',
   `Column_name` char(64) binary NOT NULL default '',
-  `Timestamp` timestamp(14) NOT NULL,
+  `Timestamp` timestamp NOT NULL,
   `Column_priv` set('Select','Insert','Update','References') NOT NULL default '',
   PRIMARY KEY  (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
-) TYPE=MyISAM COMMENT='Column privileges'
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Column privileges'
diff --git a/mysql-test/r/system_mysql_db_refs.result b/mysql-test/r/system_mysql_db_refs.result
index a08b46ffbbb..e15934b03ac 100644
--- a/mysql-test/r/system_mysql_db_refs.result
+++ b/mysql-test/r/system_mysql_db_refs.result
@@ -17,7 +17,7 @@ insert into test_tables_priv (Host,Db,User,Table_name) values (@name,@name,@name
 create table test_columns_priv select * from mysql.columns_priv;
 delete from test_columns_priv;
 insert into test_columns_priv (Host,Db,User,Table_name,Column_name) values (@name,@name,@name,@name,@name);
-select 

+select
 if(isnull(test_db.Host),'WRONG!!!','ok') as test_db_Host,

 if(isnull(test_host.Host),'WRONG!!!','ok') as test_host_Host,

 if(isnull(test_user.Host),'WRONG!!!','ok') as test_user_Host,

@@ -30,7 +30,7 @@ left join test_tables_priv  on test_db.Host=test_tables_priv.Host
 left join test_columns_priv on test_db.Host=test_columns_priv.Host;
 test_db_Host	test_host_Host	test_user_Host	test_tables_priv_Host	test_columns_priv_Host
 ok	ok	ok	ok	ok
-select 

+select
 if(isnull(test_db.Db),'WRONG!!!','ok') as test_db_Db,

 if(isnull(test_host.Db),'WRONG!!!','ok') as test_host_Db,

 if(isnull(test_tables_priv.Db),'WRONG!!!','ok') as test_tables_priv_Db,

diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index f89d41aa982..5eb447ab223 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -907,3 +907,18 @@ n
 9
 10
 drop  table t1;
+create table t1 (i int);
+insert into t1 values (1);
+select * from t1 UNION select * from t1;
+i
+1
+select * from t1 UNION ALL select * from t1;
+i
+1
+1
+select * from t1 UNION select * from t1 UNION ALL select * from t1;
+i
+1
+1
+1
+drop table t1;