Fixes after merge with 4.0

Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)


client/mysqldump.c:
  Fixed bugs found after merge
include/mysql_embed.h:
  Disable query cache when using embedded version
myisam/mi_check.c:
  Removed not used variable
mysql-test/r/auto_increment.result:
  Fixed bugs found after merge
mysql-test/r/bdb.result:
  Fixed bugs found after merge
mysql-test/r/func_group.result:
  Fixed bugs found after merge
mysql-test/r/func_str.result:
  Fixed bugs found after merge
mysql-test/r/func_time.result:
  Fixed bugs found after merge
mysql-test/r/group_by.result:
  Fixed bugs found after merge
mysql-test/r/innodb.result:
  Fixed bugs found after merge
mysql-test/r/insert.result:
  Fixed bugs found after merge
mysql-test/r/join_outer.result:
  Fixed bugs found after merge
mysql-test/r/loaddata.result:
  Fixed bugs found after merge
mysql-test/r/multi_update.result:
  Fixed bugs found after merge
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/rpl_EE_error.result:
  Fixed bugs found after merge
mysql-test/r/rpl_multi_update.result:
  Fixed bugs found after merge
mysql-test/r/symlink.result:
  Update results
mysql-test/r/type_blob.result:
  Update results
mysql-test/r/type_datetime.result:
  Update results
mysql-test/r/type_decimal.result:
  Update results
mysql-test/r/type_enum.result:
  Fixed bugs found after merge
mysql-test/r/type_timestamp.result:
  Update results
mysql-test/r/union.result:
  Update results
mysql-test/r/warnings.result:
  Update results
mysql-test/t/bdb.test:
  Fix test for 4.1
mysql-test/t/innodb.test:
  Fix test for 4.1
mysql-test/t/multi_update.test:
  Fix test for 4.1
mysql-test/t/mysqldump.test:
  Fix test for 4.1
mysql-test/t/rpl_EE_error.test:
  Fix test for 4.1
mysql-test/t/rpl_multi_update.test:
  Fix test for 4.1
mysql-test/t/union.test:
  Cleanup
mysys/charset.c:
  Check results from my_once_alloc()
mysys/my_handler.c:
  part of 4.0 merge
sql-common/client.c:
  Part of 4.0 merge
sql/field.cc:
  After merge fixes
sql/field.h:
  After merge fixes
sql/ha_innodb.cc:
  Remove duplicate include files
sql/item.cc:
  Changed automatic int conversion to be of type binary
sql/item.h:
  After merge fixes
sql/item_func.cc:
  Changed automatic int conversion to be of type binary
sql/item_func.h:
  After merge fixes
sql/item_strfunc.cc:
  Added comments
sql/item_subselect.cc:
  Indentation fixes
sql/item_sum.cc:
  Changed automatic int conversion to be of type binary
sql/item_sum.h:
  After merge fixes
sql/mysql_priv.h:
  Cleanup embedded library access checks
sql/mysqld.cc:
  Changed min stack size to 128K (to allow longer MyISAM keys)
sql/set_var.cc:
  Fixed compiler warnings
sql/share/czech/errmsg.txt:
  Better error message
sql/share/danish/errmsg.txt:
  Better error message
sql/share/dutch/errmsg.txt:
  Better error message
sql/share/english/errmsg.txt:
  Better error message
sql/share/estonian/errmsg.txt:
  Better error message
sql/share/french/errmsg.txt:
  Better error message
sql/share/greek/errmsg.txt:
  Better error message
sql/share/hungarian/errmsg.txt:
  Better error message
sql/share/italian/errmsg.txt:
  Better error message
sql/share/japanese/errmsg.txt:
  Better error message
sql/share/korean/errmsg.txt:
  Better error message
sql/share/norwegian-ny/errmsg.txt:
  Better error message
sql/share/norwegian/errmsg.txt:
  Better error message
sql/share/polish/errmsg.txt:
  Better error message
sql/share/romanian/errmsg.txt:
  Better error message
sql/share/russian/errmsg.txt:
  Better error message
sql/share/serbian/errmsg.txt:
  Better error message
sql/share/slovak/errmsg.txt:
  Better error message
sql/share/spanish/errmsg.txt:
  Better error message
sql/share/swedish/errmsg.txt:
  Better error message
sql/share/ukrainian/errmsg.txt:
  Better error message
sql/sql_acl.h:
  Cleaned up embedded library acccess checks
sql/sql_base.cc:
  After merge fixes
sql/sql_client.cc:
  After merge fixes
sql/sql_parse.cc:
  After merge fixes
  Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
  Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
sql/sql_prepare.cc:
  Add missing arguments
sql/sql_select.cc:
  After merge fixes
sql/sql_update.cc:
  After merge fixes
sql/sql_yacc.yy:
  Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
sql/table.cc:
  After merge fixes

1 files changed, 109 insertions, 0 deletions

diff --git a/mysql-test/r/func_time.result b/mysql-test/r/func_time.result
index c3f4b9475f9..0998f7b8bcf 100644
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -431,3 +431,112 @@ select * from t1, t3 where t1.start between t3.ctime1 and t3.ctime2;
 start	ctime1	ctime2
 2002-11-04 00:00:00	2002-10-29 16:51:06	2002-11-05 16:47:31
 drop table t1,t2,t3;
+select @a:=FROM_UNIXTIME(1);
+@a:=FROM_UNIXTIME(1)
+1970-01-01 03:00:01
+select unix_timestamp(@a);
+unix_timestamp(@a)
+1
+select unix_timestamp('1969-12-01 19:00:01');
+unix_timestamp('1969-12-01 19:00:01')
+0
+CREATE TABLE t1 (datetime datetime, timestamp timestamp, date date, time time);
+INSERT INTO t1 values ("2001-01-02 03:04:05", "2002-01-02 03:04:05", "2003-01-02", "06:07:08");
+SELECT * from t1;
+datetime	timestamp	date	time
+2001-01-02 03:04:05	2002-01-02 03:04:05	2003-01-02	06:07:08
+select date_add("1997-12-31",INTERVAL 1 SECOND);
+date_add("1997-12-31",INTERVAL 1 SECOND)
+1997-12-31 00:00:01
+select date_add("1997-12-31",INTERVAL "1 1" YEAR_MONTH);
+date_add("1997-12-31",INTERVAL "1 1" YEAR_MONTH)
+1999-01-31
+select date_add(datetime, INTERVAL 1 SECOND) from t1;
+date_add(datetime, INTERVAL 1 SECOND)
+2001-01-02 03:04:06
+select date_add(datetime, INTERVAL 1 YEAR) from t1;
+date_add(datetime, INTERVAL 1 YEAR)
+2002-01-02 03:04:05
+select date_add(date,INTERVAL 1 SECOND) from t1;
+date_add(date,INTERVAL 1 SECOND)
+2003-01-02 00:00:01
+select date_add(date,INTERVAL 1 MINUTE) from t1;
+date_add(date,INTERVAL 1 MINUTE)
+2003-01-02 00:01:00
+select date_add(date,INTERVAL 1 HOUR) from t1;
+date_add(date,INTERVAL 1 HOUR)
+2003-01-02 01:00:00
+select date_add(date,INTERVAL 1 DAY) from t1;
+date_add(date,INTERVAL 1 DAY)
+2003-01-03
+select date_add(date,INTERVAL 1 MONTH) from t1;
+date_add(date,INTERVAL 1 MONTH)
+2003-02-02
+select date_add(date,INTERVAL 1 YEAR) from t1;
+date_add(date,INTERVAL 1 YEAR)
+2004-01-02
+select date_add(date,INTERVAL "1:1" MINUTE_SECOND) from t1;
+date_add(date,INTERVAL "1:1" MINUTE_SECOND)
+2003-01-02 00:01:01
+select date_add(date,INTERVAL "1:1" HOUR_MINUTE) from t1;
+date_add(date,INTERVAL "1:1" HOUR_MINUTE)
+2003-01-02 01:01:00
+select date_add(date,INTERVAL "1:1" DAY_HOUR) from t1;
+date_add(date,INTERVAL "1:1" DAY_HOUR)
+2003-01-03 01:00:00
+select date_add(date,INTERVAL "1 1" YEAR_MONTH) from t1;
+date_add(date,INTERVAL "1 1" YEAR_MONTH)
+2004-02-02
+select date_add(date,INTERVAL "1:1:1" HOUR_SECOND) from t1;
+date_add(date,INTERVAL "1:1:1" HOUR_SECOND)
+2003-01-02 01:01:01
+select date_add(date,INTERVAL "1 1:1" DAY_MINUTE) from t1;
+date_add(date,INTERVAL "1 1:1" DAY_MINUTE)
+2003-01-03 01:01:00
+select date_add(date,INTERVAL "1 1:1:1" DAY_SECOND) from t1;
+date_add(date,INTERVAL "1 1:1:1" DAY_SECOND)
+2003-01-03 01:01:01
+select date_add(time,INTERVAL 1 SECOND) from t1;
+date_add(time,INTERVAL 1 SECOND)
+2006-07-08 00:00:01
+drop table t1;
+select last_day('2000-02-05') as f1, last_day('2002-12-31') as f2,
+last_day('2003-03-32') as f3, last_day('2003-04-01') as f4,
+last_day('2001-01-01 01:01:01') as f5, last_day(NULL),
+last_day('2001-02-12');
+f1	f2	f3	f4	f5	last_day(NULL)	last_day('2001-02-12')
+2000-02-29	2002-12-31	NULL	2003-04-30	2001-01-31	NULL	2001-02-28
+create table t1 select last_day('2000-02-05') as a;
+describe t1;
+Field	Type	Null	Key	Default	Extra
+a	date			0000-00-00	
+select * from t1;
+a
+2000-02-29
+drop table t1;
+select last_day('2000-02-05');
+last_day('2000-02-05')
+2000-02-29
+select strcmp(date_sub(localtimestamp(), interval 3 hour), utc_timestamp())=0;
+strcmp(date_sub(localtimestamp(), interval 3 hour), utc_timestamp())=0
+1
+select strcmp(date_format(date_sub(localtimestamp(), interval 3 hour),"%T"), utc_time())=0;
+strcmp(date_format(date_sub(localtimestamp(), interval 3 hour),"%T"), utc_time())=0
+1
+select strcmp(date_format(date_sub(localtimestamp(), interval 3 hour),"%Y-%m-%d"), utc_date())=0;
+strcmp(date_format(date_sub(localtimestamp(), interval 3 hour),"%Y-%m-%d"), utc_date())=0
+1
+select strcmp(date_format(utc_timestamp(),"%T"), utc_time())=0;
+strcmp(date_format(utc_timestamp(),"%T"), utc_time())=0
+1
+select strcmp(date_format(utc_timestamp(),"%Y-%m-%d"), utc_date())=0;
+strcmp(date_format(utc_timestamp(),"%Y-%m-%d"), utc_date())=0
+1
+select strcmp(concat(utc_date(),' ',utc_time()),utc_timestamp())=0;
+strcmp(concat(utc_date(),' ',utc_time()),utc_timestamp())=0
+1
+explain extended select period_add("9602",-12),period_diff(199505,"9404"),from_days(to_days("960101")),dayofmonth("1997-01-02"), month("1997-01-02"), monthname("1972-03-04"),dayofyear("0000-00-00"),HOUR("1997-03-03 23:03:22"),MINUTE("23:03:22"),SECOND(230322),QUARTER(980303),WEEK("1998-03-03"),yearweek("2000-01-01",1),week(19950101,1),year("98-02-03"),weekday(curdate())-weekday(now()),dayname("1962-03-03"),unix_timestamp(),sec_to_time(time_to_sec("0:30:47")/6.21),curtime(),utc_time(),curdate(),utc_date(),utc_timestamp(),date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w"),from_unixtime(unix_timestamp("1994-03-02 10:11:12")),"1997-12-31 23:59:59" + INTERVAL 1 SECOND,"1998-01-01 00:00:00" - INTERVAL 1 SECOND,INTERVAL 1 DAY + "1997-12-31", extract(YEAR FROM "1999-01-02 10:11:12"),date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND);
+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
+Warnings:
+Note	1003	select high_priority no_cache period_add(_latin1'9602',-(12)) AS `period_add("9602",-12)`,period_diff(199505,_latin1'9404') AS `period_diff(199505,"9404")`,from_days(to_days(_latin1'960101')) AS `from_days(to_days("960101"))`,dayofmonth(_latin1'1997-01-02') AS `dayofmonth("1997-01-02")`,month(_latin1'1997-01-02') AS `month("1997-01-02")`,monthname(_latin1'1972-03-04') AS `monthname("1972-03-04")`,dayofyear(_latin1'0000-00-00') AS `dayofyear("0000-00-00")`,hour(_latin1'1997-03-03 23:03:22') AS `HOUR("1997-03-03 23:03:22")`,minute(_latin1'23:03:22') AS `MINUTE("23:03:22")`,second(230322) AS `SECOND(230322)`,quarter(980303) AS `QUARTER(980303)`,week(_latin1'1998-03-03',0) AS `WEEK("1998-03-03")`,yearweek(_latin1'2000-01-01',1) AS `yearweek("2000-01-01",1)`,week(19950101,1) AS `week(19950101,1)`,year(_latin1'98-02-03') AS `year("98-02-03")`,(weekday(to_days(curdate())) - weekday(to_days(now()))) AS `weekday(curdate())-weekday(now())`,dayname(to_days(_latin1'1962-03-03')) AS `dayname("1962-03-03")`,unix_timestamp() AS `unix_timestamp()`,sec_to_time((time_to_sec(_latin1'0:30:47') / 6.21)) AS `sec_to_time(time_to_sec("0:30:47")/6.21)`,curtime() AS `curtime()`,utc_time() AS `utc_time()`,curdate() AS `curdate()`,utc_date() AS `utc_date()`,utc_timestamp() AS `utc_timestamp()`,date_format(_latin1'1997-01-02 03:04:05',_latin1'%M %W %D %Y %y %m %d %h %i %s %w') AS `date_format("1997-01-02 03:04:05", "%M %W %D %Y %y %m %d %h %i %s %w")`,from_unixtime(unix_timestamp(_latin1'1994-03-02 10:11:12')) AS `from_unixtime(unix_timestamp("1994-03-02 10:11:12"))`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `"1997-12-31 23:59:59" + INTERVAL 1 SECOND`,(_latin1'1998-01-01 00:00:00' - interval 1 second) AS `"1998-01-01 00:00:00" - INTERVAL 1 SECOND`,(_latin1'1997-12-31' + interval 1 day) AS `INTERVAL 1 DAY + "1997-12-31"`,extract(year from _latin1'1999-01-02 10:11:12') AS `extract(YEAR FROM "1999-01-02 10:11:12")`,(_latin1'1997-12-31 23:59:59' + interval 1 second) AS `date_add("1997-12-31 23:59:59",INTERVAL 1 SECOND)`