merge

60 files changed, 2492 insertions, 640 deletions

diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result
index 08618f81808..b3a634b07e2 100644
--- a/mysql-test/r/archive.result
+++ b/mysql-test/r/archive.result
@@ -12707,7 +12707,7 @@ DATA_LENGTH	AVG_ROW_LENGTH
 8700	4350
 DROP TABLE t1;
 SET @save_join_buffer_size= @@join_buffer_size;
-SET @@join_buffer_size= 8228;
+SET @@join_buffer_size= 8192;
 CREATE TABLE t1(a CHAR(255)) ENGINE=archive;
 INSERT INTO t1 VALUES('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
 ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
diff --git a/mysql-test/r/archive_gis.result b/mysql-test/r/archive_gis.result
index 178c5716911..ad7bd374629 100644
--- a/mysql-test/r/archive_gis.result
+++ b/mysql-test/r/archive_gis.result
@@ -266,7 +266,7 @@ fid	AsText(EndPoint(g))
 107	POINT(40 10)
 SELECT fid, GLength(g) FROM gis_line ORDER by fid;
 fid	GLength(g)
-105	24.142135623731
+105	24.14213562373095
 106	40
 107	30
 SELECT fid, NumPoints(g) FROM gis_line ORDER by fid;
@@ -292,7 +292,7 @@ Note	1003	select astext(startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint
 SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid;
 fid	AsText(Centroid(g))
 108	POINT(15 15)
-109	POINT(25.4166666666667 25.4166666666667)
+109	POINT(25.416666666666668 25.416666666666668)
 110	POINT(20 10)
 SELECT fid, Area(g) FROM gis_polygon ORDER by fid;
 fid	Area(g)
@@ -326,8 +326,8 @@ fid	IsClosed(g)
 116	0
 SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
 fid	AsText(Centroid(g))
-117	POINT(55.5885277530424 17.426536064114)
-118	POINT(55.5885277530424 17.426536064114)
+117	POINT(55.58852775304245 17.426536064113982)
+118	POINT(55.58852775304245 17.426536064113982)
 119	POINT(2 2)
 SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
 fid	Area(g)
diff --git a/mysql-test/r/bug46080.result b/mysql-test/r/bug46080.result
index 2173768cdad..f1abcde7766 100644
--- a/mysql-test/r/bug46080.result
+++ b/mysql-test/r/bug46080.result
@@ -8,6 +8,8 @@ CREATE TABLE t1(a CHAR(255));
 INSERT INTO t1 VALUES ('a');
 SET @@SESSION.sort_buffer_size=5*16*1000000;
 SET @@SESSION.max_heap_table_size=5*1000000;
+Warnings:
+Warning	1292	Truncated incorrect max_heap_table_size value: '5000000'
 # Must not crash.
 SELECT GROUP_CONCAT(a ORDER BY a) FROM t1 GROUP BY a;
 DROP TABLE t1;
diff --git a/mysql-test/r/cache_innodb.result b/mysql-test/r/cache_innodb.result
index b59298727c5..600ed84c3c9 100644
--- a/mysql-test/r/cache_innodb.result
+++ b/mysql-test/r/cache_innodb.result
@@ -134,7 +134,7 @@ connection default
 SHOW VARIABLES LIKE 'have_query_cache';
 Variable_name	Value
 have_query_cache	YES
-SET GLOBAL query_cache_size = 200000;
+SET GLOBAL query_cache_size = 204800;
 flush status;
 SET @@autocommit=1;
 SET SESSION STORAGE_ENGINE = InnoDB;
diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result
index c53de220b60..3e1ea824db5 100644
--- a/mysql-test/r/cast.result
+++ b/mysql-test/r/cast.result
@@ -342,11 +342,11 @@ INSERT INTO t1 SET f1 = -1.0e+30 ;
 INSERT INTO t1 SET f1 = +1.0e+30 ;
 SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;
 double_val	cast_val
--1e+30	-9223372036854775808
-1e+30	9223372036854775807
+-1e30	-9223372036854775808
+1e30	9223372036854775807
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1e+30'
-Warning	1292	Truncated incorrect INTEGER value: '1e+30'
+Warning	1292	Truncated incorrect INTEGER value: '-1e30'
+Warning	1292	Truncated incorrect INTEGER value: '1e30'
 DROP TABLE t1;
 select isnull(date(NULL)), isnull(cast(NULL as DATE));
 isnull(date(NULL))	isnull(cast(NULL as DATE))
@@ -363,7 +363,7 @@ cast('1.2' as decimal(3,2))
 1.20
 select 1e18 * cast('1.2' as decimal(3,2));
 1e18 * cast('1.2' as decimal(3,2))
-1.2e+18
+1.2e18
 select cast(cast('1.2' as decimal(3,2)) as signed);
 cast(cast('1.2' as decimal(3,2)) as signed)
 1
diff --git a/mysql-test/r/change_user.result b/mysql-test/r/change_user.result
index f8d5d900a80..1ed7fcbb8fa 100644
--- a/mysql-test/r/change_user.result
+++ b/mysql-test/r/change_user.result
@@ -18,7 +18,7 @@ change_user
 SELECT @@session.sql_big_selects;
 @@session.sql_big_selects
 0
-SET @@global.max_join_size = -1;
+SET @@global.max_join_size = 18446744073709551615;
 SET @@session.max_join_size = default;
 change_user
 SELECT @@session.sql_big_selects;
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 471cc6e9a3d..019aeba27b6 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -228,7 +228,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 drop table t1;
 SET SESSION storage_engine="gemini";
-ERROR 42000: Unknown table engine 'gemini'
+ERROR 42000: Unknown storage engine 'gemini'
 SELECT @@storage_engine;
 @@storage_engine
 MEMORY
@@ -389,7 +389,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 drop table t1;
 SET SESSION storage_engine="gemini";
-ERROR 42000: Unknown table engine 'gemini'
+ERROR 42000: Unknown storage engine 'gemini'
 SELECT @@storage_engine;
 @@storage_engine
 MEMORY
diff --git a/mysql-test/r/date_formats.result b/mysql-test/r/date_formats.result
index b0b8316fe33..432b9b14a85 100644
--- a/mysql-test/r/date_formats.result
+++ b/mysql-test/r/date_formats.result
@@ -15,71 +15,6 @@ variable_name	variable_value
 DATETIME_FORMAT	%Y-%m-%d %H:%i:%s
 DATE_FORMAT	%d.%m.%Y
 TIME_FORMAT	%H.%i.%s
-SET time_format='%H%i%s';
-SET time_format='%H:%i:%s.%f';
-SET time_format='%h-%i-%s.%f%p';
-SET time_format='%h:%i:%s.%f %p';
-SET time_format='%h:%i:%s%p';
-SET date_format='%Y%m%d';
-SET date_format='%Y.%m.%d';
-SET date_format='%d.%m.%Y';
-SET date_format='%m-%d-%Y';
-set datetime_format= '%Y%m%d%H%i%s';
-set datetime_format= '%Y-%m-%d %H:%i:%s';
-set datetime_format= '%m-%d-%y %H:%i:%s.%f';
-set datetime_format= '%d-%m-%Y %h:%i:%s%p';
-set datetime_format= '%H:%i:%s %Y-%m-%d';
-set datetime_format= '%H:%i:%s.%f %m-%d-%Y';
-set datetime_format= '%h:%i:%s %p %Y-%m-%d';
-set datetime_format= '%h:%i:%s.%f %p %Y-%m-%d';
-SELECT variable_name, variable_value
-FROM information_schema.session_variables
-WHERE variable_name IN ('date_format', 'datetime_format', 'time_format')
-ORDER BY variable_name;
-variable_name	variable_value
-DATETIME_FORMAT	%h:%i:%s.%f %p %Y-%m-%d
-DATE_FORMAT	%m-%d-%Y
-TIME_FORMAT	%h:%i:%s%p
-SET time_format='%h:%i:%s';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%h:%i:%s'
-SET time_format='%H %i:%s';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H %i:%s'
-SET time_format='%H::%i:%s';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H::%i:%s'
-SET time_format='%H:%i:%s%f';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H:%i:%s%f'
-SET time_format='%H:%i.%f:%s';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H:%i.%f:%s'
-SET time_format='%H:%i:%s%p';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H:%i:%s%p'
-SET time_format='%h:%i:%s.%f %p %Y-%m-%d';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%h:%i:%s.%f %p %Y-%m-%d'
-SET time_format='%H%i%s.%f';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H%i%s.%f'
-SET time_format='%H:%i-%s.%f';
-ERROR 42000: Variable 'time_format' can't be set to the value of '%H:%i-%s.%f'
-SET date_format='%d.%m.%d';
-ERROR 42000: Variable 'date_format' can't be set to the value of '%d.%m.%d'
-SET datetime_format='%h.%m.%y %d.%i.%s';
-ERROR 42000: Variable 'datetime_format' can't be set to the value of '%h.%m.%y %d.%i.%s'
-set datetime_format= '%H:%i:%s.%f %p %Y-%m-%d';
-ERROR 42000: Variable 'datetime_format' can't be set to the value of '%H:%i:%s.%f %p %Y-%m-%d'
-set GLOBAL datetime_format= '%H:%i:%s %Y-%m-%d';
-SET SESSION datetime_format=default;
-select @@global.datetime_format, @@session.datetime_format;
-@@global.datetime_format	@@session.datetime_format
-%H:%i:%s %Y-%m-%d	%H:%i:%s %Y-%m-%d
-SET GLOBAL datetime_format=default;
-SET SESSION datetime_format=default;
-select @@global.datetime_format, @@session.datetime_format;
-@@global.datetime_format	@@session.datetime_format
-%Y-%m-%d %H:%i:%s	%Y-%m-%d %H:%i:%s
-SET GLOBAL date_format=default;
-SET GLOBAL time_format=default;
-SET GLOBAL datetime_format=default;
-SET time_format=default;
-SET date_format=default;
-SET datetime_format=default;
 select str_to_date(concat('15-01-2001',' 2:59:58.999'),
 concat('%d-%m-%Y',' ','%H:%i:%s.%f'));
 str_to_date(concat('15-01-2001',' 2:59:58.999'),
diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result
index b5863b94026..79474b960f5 100644
--- a/mysql-test/r/errors.result
+++ b/mysql-test/r/errors.result
@@ -109,10 +109,10 @@ SET sql_quote_show_create= _utf8 x'5452C39C45';
 ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE'
 SET sql_quote_show_create=_latin1 x'5452DC45';
 ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE'
-SET sql_quote_show_create='TR.E';
-ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR.E'
-SET sql_quote_show_create=TR.E;
-ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'E'
+SET sql_quote_show_create='TRÜE';
+ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE'
+SET sql_quote_show_create=TRÜE;
+ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TRÜE'
 SET NAMES binary;
 SET sql_quote_show_create= _binary x'5452C39C45';
 ERROR 42000: Variable 'sql_quote_show_create' can't be set to the value of 'TR\xC3\x9CE'
diff --git a/mysql-test/r/events_2.result b/mysql-test/r/events_2.result
index 44eaa668b04..530d8559f11 100644
--- a/mysql-test/r/events_2.result
+++ b/mysql-test/r/events_2.result
@@ -13,12 +13,6 @@ ERROR HY000: Incorrect AT value: 'definitely not a datetime'
 set names utf8;
 create event задачка on schedule every 123 minute starts now() ends now() + interval 1 month do select 1;
 drop event задачка;
-set event_scheduler=off;
-ERROR HY000: Variable 'event_scheduler' is a GLOBAL variable and should be set with SET GLOBAL
-set global event_scheduler=3;
-ERROR 42000: Variable 'event_scheduler' can't be set to the value of '3'
-set global event_scheduler=disabled;
-ERROR 42000: Variable 'event_scheduler' can't be set to the value of 'disabled'
 "DISABLE the scheduler. Testing that it does not work when the variable is 0"
 set global event_scheduler=off;
 select definer, name, db from mysql.event;
diff --git a/mysql-test/r/events_bugs.result b/mysql-test/r/events_bugs.result
index efe6df41ac6..a5003c936e8 100644
--- a/mysql-test/r/events_bugs.result
+++ b/mysql-test/r/events_bugs.result
@@ -725,16 +725,15 @@ DROP USER mysqltest_u1@localhost;
 
 drop procedure if exists p;
 set @old_mode= @@sql_mode;
-set @@sql_mode= pow(2,32)-1;
+set @@sql_mode= cast(pow(2,32)-1 as unsigned integer);
 create event e1 on schedule every 1 day do select 1;
-select @@sql_mode;
-@@sql_mode
-REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,?,ONLY_FULL_GROUP_BY,NO_UNSIGNED_SUBTRACTION,NO_DIR_IN_CREATE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40,ANSI,NO_AUTO_VALUE_ON_ZERO,NO_BACKSLASH_ESCAPES,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ALLOW_INVALID_DATES,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,HIGH_NOT_PRECEDENCE,NO_ENGINE_SUBSTITUTION,PAD_CHAR_TO_FULL_LENGTH
+select @@sql_mode into @full_mode;
 set @@sql_mode= @old_mode;
-select replace(@full_mode, '?', 'NOT_USED') into @full_mode;
+select replace(@full_mode, ',,,', ',NOT_USED,') into @full_mode;
 select replace(@full_mode, 'ALLOW_INVALID_DATES', 'INVALID_DATES') into @full_mode;
-select name from mysql.event where name = 'p' and sql_mode = @full_mode;
+select name from mysql.event where name = 'e1' and sql_mode = @full_mode;
 name
+e1
 drop event e1;
 SET @old_server_id = @@GLOBAL.server_id;
 SET GLOBAL server_id = (1 << 32) - 1;
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index b36f561578b..6838dcf944c 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -61,7 +61,7 @@ grp	sum
 NULL	NULL
 1	7
 2	20.25
-3	45.4831632475944
+3	45.48316324759439
 create table t2 (grp int, a bigint unsigned, c char(10));
 insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp;
 replace into t2 select grp, a, c from t1 limit 2,1;
@@ -891,7 +891,7 @@ select 1e8 * sum(distinct df) from t1;
 330000000
 select 1e8 * min(df) from t1;
 1e8 * min(df)
-110000000
+110000000.00000001
 create table t3 (ifl int);
 insert into t3 values(1), (2);
 select cast(min(ifl) as decimal(5,2)) from t3;
@@ -1186,7 +1186,7 @@ std(s1/s2)
 0.21325764
 select std(o1/o2) from bug22555;
 std(o1/o2)
-0.213257635866493
+0.2132576358664934
 select std(e1/e2) from bug22555;
 std(e1/e2)
 0.21325764
@@ -1209,13 +1209,13 @@ i	count(*)	std(e1/e2)
 3	4	0.000000000000000000000000000000
 select round(std(s1/s2), 17) from bug22555;
 round(std(s1/s2), 17)
-0.21325763586649341
+0.21325763586649340
 select std(o1/o2) from bug22555;
 std(o1/o2)
-0.213257635866493
+0.2132576358664934
 select round(std(e1/e2), 17) from bug22555;
 round(std(e1/e2), 17)
-0.21325763586649341
+0.21325763586649340
 set div_precision_increment=20;
 select i, count(*), std(s1/s2) from bug22555 group by i order by i;
 i	count(*)	std(s1/s2)
@@ -1234,13 +1234,13 @@ i	count(*)	std(e1/e2)
 3	4	0.000000000000000000000000000000
 select round(std(s1/s2), 17) from bug22555;
 round(std(s1/s2), 17)
-0.21325763586649341
+0.21325763586649340
 select std(o1/o2) from bug22555;
 std(o1/o2)
-0.213257635866493
+0.2132576358664934
 select round(std(e1/e2), 17) from bug22555;
 round(std(e1/e2), 17)
-0.21325763586649341
+0.21325763586649340
 set @@div_precision_increment=@saved_div_precision_increment;
 drop table bug22555;
 create table bug22555 (s smallint, o double, e decimal);
diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result
index 063f4d37f4a..537b1db9781 100644
--- a/mysql-test/r/func_math.result
+++ b/mysql-test/r/func_math.result
@@ -44,7 +44,7 @@ Warnings:
 Note	1003	select abs(-(10)) AS `abs(-10)`,sign(-(5)) AS `sign(-5)`,sign(5) AS `sign(5)`,sign(0) AS `sign(0)`
 select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2);
 log(exp(10))	exp(log(sqrt(10))*2)	log(-1)	log(NULL)	log(1,1)	log(3,9)	log(-1,2)	log(NULL,2)
-10	10	NULL	NULL	NULL	2	NULL	NULL
+10	10.000000000000002	NULL	NULL	NULL	2	NULL	NULL
 explain extended select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -52,7 +52,7 @@ Warnings:
 Note	1003	select log(exp(10)) AS `log(exp(10))`,exp((log(sqrt(10)) * 2)) AS `exp(log(sqrt(10))*2)`,log(-(1)) AS `log(-1)`,log(NULL) AS `log(NULL)`,log(1,1) AS `log(1,1)`,log(3,9) AS `log(3,9)`,log(-(1),2) AS `log(-1,2)`,log(NULL,2) AS `log(NULL,2)`
 select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL);
 ln(exp(10))	exp(ln(sqrt(10))*2)	ln(-1)	ln(0)	ln(NULL)
-10	10	NULL	NULL	NULL
+10	10.000000000000002	NULL	NULL	NULL
 explain extended select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -60,7 +60,7 @@ Warnings:
 Note	1003	select ln(exp(10)) AS `ln(exp(10))`,exp((ln(sqrt(10)) * 2)) AS `exp(ln(sqrt(10))*2)`,ln(-(1)) AS `ln(-1)`,ln(0) AS `ln(0)`,ln(NULL) AS `ln(NULL)`
 select log2(8),log2(15),log2(-2),log2(0),log2(NULL);
 log2(8)	log2(15)	log2(-2)	log2(0)	log2(NULL)
-3	3.90689059560852	NULL	NULL	NULL
+3	3.9068905956085187	NULL	NULL	NULL
 explain extended select log2(8),log2(15),log2(-2),log2(0),log2(NULL);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -68,7 +68,7 @@ Warnings:
 Note	1003	select log2(8) AS `log2(8)`,log2(15) AS `log2(15)`,log2(-(2)) AS `log2(-2)`,log2(0) AS `log2(0)`,log2(NULL) AS `log2(NULL)`
 select log10(100),log10(18),log10(-4),log10(0),log10(NULL);
 log10(100)	log10(18)	log10(-4)	log10(0)	log10(NULL)
-2	1.25527250510331	NULL	NULL	NULL
+2	1.255272505103306	NULL	NULL	NULL
 explain extended select log10(100),log10(18),log10(-4),log10(0),log10(NULL);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -85,7 +85,7 @@ Note	1003	select pow(10,log10(10)) AS `pow(10,log10(10))`,pow(2,4) AS `power(2,4
 set @@rand_seed1=10000000,@@rand_seed2=1000000;
 select rand(999999),rand();
 rand(999999)	rand()
-0.0142313651873091	0.028870999839968
+0.014231365187309091	0.028870999839968048
 explain extended select rand(999999),rand();
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -101,7 +101,7 @@ Warnings:
 Note	1003	select pi() AS `pi()`,format(sin((pi() / 2)),6) AS `format(sin(pi()/2),6)`,format(cos((pi() / 2)),6) AS `format(cos(pi()/2),6)`,format(abs(tan(pi())),6) AS `format(abs(tan(pi())),6)`,format((1 / tan(1)),6) AS `format(cot(1),6)`,format(asin(1),6) AS `format(asin(1),6)`,format(acos(0),6) AS `format(acos(0),6)`,format(atan(1),6) AS `format(atan(1),6)`
 select degrees(pi()),radians(360);
 degrees(pi())	radians(360)
-180	6.28318530717959
+180	6.283185307179586
 select format(atan(-2, 2), 6);
 format(atan(-2, 2), 6)
 -0.785398
@@ -119,7 +119,7 @@ ACOS(1.0)
 0
 SELECT ASIN(1.0);
 ASIN(1.0)
-1.5707963267949
+1.5707963267948966
 SELECT ACOS(0.2*5.0);
 ACOS(0.2*5.0)
 0
@@ -128,10 +128,10 @@ ACOS(0.5*2.0)
 0
 SELECT ASIN(0.8+0.2);
 ASIN(0.8+0.2)
-1.5707963267949
+1.5707963267948966
 SELECT ASIN(1.2-0.2);
 ASIN(1.2-0.2)
-1.5707963267949
+1.5707963267948966
 select format(4.55, 1), format(4.551, 1);
 format(4.55, 1)	format(4.551, 1)
 4.6	4.6
@@ -368,7 +368,7 @@ mod(5, cast(-2 as unsigned))	mod(5, 18446744073709551614)	mod(5, -2)
 5	5	1
 select pow(cast(-2 as unsigned), 5), pow(18446744073709551614, 5), pow(-2, 5);
 pow(cast(-2 as unsigned), 5)	pow(18446744073709551614, 5)	pow(-2, 5)
-2.13598703592091e+96	2.13598703592091e+96	-32
+2.13598703592091e96	2.13598703592091e96	-32
 CREATE TABLE t1 (a timestamp, b varchar(20), c bit(1));
 INSERT INTO t1 VALUES('1998-09-23', 'str1', 1), ('2003-03-25', 'str2', 0);
 SELECT a DIV 900 y FROM t1 GROUP BY y;
@@ -437,10 +437,10 @@ a	ROUND(a)
 2.5	2
 -2.9	-3
 2.9	3
--1e+16	-10000000000000000
-1e+16	10000000000000000
--1e+16	-10000000000000002
-1e+16	10000000000000002
+-1e16	-10000000000000000
+1e16	10000000000000000
+-1.0000000000000002e16	-10000000000000002
+1.0000000000000002e16	10000000000000002
 DROP TABLE t1;
 CREATE TABLE t1(f1 LONGTEXT) engine=myisam;
 INSERT INTO t1 VALUES ('a');
@@ -475,16 +475,16 @@ NULL
 CREATE OR REPLACE VIEW v1 AS SELECT NULL AS a;
 SELECT RAND(a) FROM v1;
 RAND(a)
-0.155220427694936
+0.15522042769493574
 DROP VIEW v1;
 SELECT RAND(a) FROM (SELECT NULL AS a) b;
 RAND(a)
-0.155220427694936
+0.15522042769493574
 CREATE TABLE t1 (i INT);
 INSERT INTO t1 VALUES (NULL);
 SELECT RAND(i) FROM t1;
 RAND(i)
-0.155220427694936
+0.15522042769493574
 DROP TABLE t1;
 #
 select 123456789012345678901234567890.123456789012345678901234567890 div 1 as x;
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 64988f9de50..3d43cbbfd76 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -1354,10 +1354,10 @@ cast(rtrim(ltrim('  20.06 ')) as decimal(19,2))
 20.06
 select conv("18383815659218730760",10,10) + 0;
 conv("18383815659218730760",10,10) + 0
-1.83838156592187e+19
+1.838381565921873e19
 select "18383815659218730760" + 0;
 "18383815659218730760" + 0
-1.83838156592187e+19
+1.838381565921873e19
 CREATE TABLE t1 (code varchar(10));
 INSERT INTO t1 VALUES ('a12'), ('A12'), ('a13');
 SELECT ASCII(code), code FROM t1 WHERE code='A12';
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
index 3e28227d542..60e24819fa5 100644
--- a/mysql-test/r/gis.result
+++ b/mysql-test/r/gis.result
@@ -258,7 +258,7 @@ fid	AsText(EndPoint(g))
 107	POINT(40 10)
 SELECT fid, GLength(g) FROM gis_line;
 fid	GLength(g)
-105	24.142135623731
+105	24.14213562373095
 106	40
 107	30
 SELECT fid, NumPoints(g) FROM gis_line;
@@ -284,7 +284,7 @@ Note	1003	select astext(startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint
 SELECT fid, AsText(Centroid(g)) FROM gis_polygon;
 fid	AsText(Centroid(g))
 108	POINT(15 15)
-109	POINT(25.4166666666667 25.4166666666667)
+109	POINT(25.416666666666668 25.416666666666668)
 110	POINT(20 10)
 SELECT fid, Area(g) FROM gis_polygon;
 fid	Area(g)
@@ -318,8 +318,8 @@ fid	IsClosed(g)
 116	0
 SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
 fid	AsText(Centroid(g))
-117	POINT(55.5885277530424 17.426536064114)
-118	POINT(55.5885277530424 17.426536064114)
+117	POINT(55.58852775304245 17.426536064113982)
+118	POINT(55.58852775304245 17.426536064113982)
 119	POINT(2 2)
 SELECT fid, Area(g) FROM gis_multi_polygon;
 fid	Area(g)
@@ -651,11 +651,11 @@ insert into t1 values ('85984',GeomFromText('MULTIPOLYGON(((-115.006363
 select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
 t1 where object_id=85998;
 object_id	geometrytype(geo)	ISSIMPLE(GEO)	ASTEXT(centroid(geo))
-85998	MULTIPOLYGON	0	POINT(115.318773152032 -36.2374728210215)
+85998	MULTIPOLYGON	0	POINT(115.31877315203187 -36.23747282102153)
 select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
 t1 where object_id=85984;
 object_id	geometrytype(geo)	ISSIMPLE(GEO)	ASTEXT(centroid(geo))
-85984	MULTIPOLYGON	0	POINT(-114.877871869233 36.3310176346905)
+85984	MULTIPOLYGON	0	POINT(-114.87787186923313 36.33101763469059)
 drop table t1;
 create table t1 (fl geometry not null);
 insert into t1 values (1);
diff --git a/mysql-test/r/have_profiling.require b/mysql-test/r/have_profiling.require
index 453ee5bb084..54caeba1dae 100644
--- a/mysql-test/r/have_profiling.require
+++ b/mysql-test/r/have_profiling.require
@@ -1,2 +1,2 @@
 Variable_name	Value
-have_profiling  YES
+have_profiling	YES
diff --git a/mysql-test/r/index_merge_myisam.result b/mysql-test/r/index_merge_myisam.result
index c639b20de91..922f7241102 100644
--- a/mysql-test/r/index_merge_myisam.result
+++ b/mysql-test/r/index_merge_myisam.result
@@ -341,9 +341,7 @@ drop table t4;
 create table t4 (a int);
 insert into t4 values (1),(4),(3);
 set @save_join_buffer_size=@@join_buffer_size;
-set join_buffer_size= 4000;
-Warnings:
-Warning	1292	Truncated incorrect join_buffer_size value: '4000'
+set join_buffer_size= 4096;
 explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5)
 from t0 as A force index(i1,i2), t0 as B force index (i1,i2)
 where (A.key1 < 500000 or A.key2 < 3)
@@ -1435,7 +1433,6 @@ select @@optimizer_switch;
 @@optimizer_switch
 index_merge=on,index_merge_union=on,index_merge_sort_union=off,index_merge_intersection=on
 set optimizer_switch=4;
-ERROR 42000: Variable 'optimizer_switch' can't be set to the value of '4'
 set optimizer_switch=NULL;
 ERROR 42000: Variable 'optimizer_switch' can't be set to the value of 'NULL'
 set optimizer_switch='default,index_merge';
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 7208c529e89..6cee55482e3 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1788,7 +1788,7 @@ Variable_name	Value
 innodb_thread_concurrency	0
 set global innodb_thread_concurrency=1001;
 Warnings:
-Warning	1292	Truncated incorrect thread_concurrency value: '1001'
+Warning	1292	Truncated incorrect innodb_thread_concurrency value: '1001'
 show variables like "innodb_thread_concurrency";
 Variable_name	Value
 innodb_thread_concurrency	1000
@@ -1809,7 +1809,7 @@ Variable_name	Value
 innodb_concurrency_tickets	1000
 set global innodb_concurrency_tickets=0;
 Warnings:
-Warning	1292	Truncated incorrect concurrency_tickets value: '0'
+Warning	1292	Truncated incorrect innodb_concurrency_tickets value: '0'
 show variables like "innodb_concurrency_tickets";
 Variable_name	Value
 innodb_concurrency_tickets	1
diff --git a/mysql-test/r/innodb_bug42101-nonzero.result b/mysql-test/r/innodb_bug42101-nonzero.result
index 277dfffdd35..f43cb9da239 100644
--- a/mysql-test/r/innodb_bug42101-nonzero.result
+++ b/mysql-test/r/innodb_bug42101-nonzero.result
@@ -1,5 +1,5 @@
 set global innodb_commit_concurrency=0;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '0'
 select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 1
@@ -16,7 +16,7 @@ select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 1
 set global innodb_commit_concurrency=0;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '0'
 select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 1
diff --git a/mysql-test/r/innodb_bug42101.result b/mysql-test/r/innodb_bug42101.result
index 805097ffe9d..4e3367d5a54 100644
--- a/mysql-test/r/innodb_bug42101.result
+++ b/mysql-test/r/innodb_bug42101.result
@@ -3,12 +3,12 @@ select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 0
 set global innodb_commit_concurrency=1;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '1'
 select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 0
 set global innodb_commit_concurrency=42;
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'innodb_commit_concurrency' can't be set to the value of '42'
 select @@innodb_commit_concurrency;
 @@innodb_commit_concurrency
 0
diff --git a/mysql-test/r/innodb_gis.result b/mysql-test/r/innodb_gis.result
index c6c775afc9f..0ce1ebe56ad 100644
--- a/mysql-test/r/innodb_gis.result
+++ b/mysql-test/r/innodb_gis.result
@@ -266,7 +266,7 @@ fid	AsText(EndPoint(g))
 107	POINT(40 10)
 SELECT fid, GLength(g) FROM gis_line ORDER by fid;
 fid	GLength(g)
-105	24.142135623731
+105	24.14213562373095
 106	40
 107	30
 SELECT fid, NumPoints(g) FROM gis_line ORDER by fid;
@@ -292,7 +292,7 @@ Note	1003	select astext(startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint
 SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid;
 fid	AsText(Centroid(g))
 108	POINT(15 15)
-109	POINT(25.4166666666667 25.4166666666667)
+109	POINT(25.416666666666668 25.416666666666668)
 110	POINT(20 10)
 SELECT fid, Area(g) FROM gis_polygon ORDER by fid;
 fid	Area(g)
@@ -326,8 +326,8 @@ fid	IsClosed(g)
 116	0
 SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid;
 fid	AsText(Centroid(g))
-117	POINT(55.5885277530424 17.426536064114)
-118	POINT(55.5885277530424 17.426536064114)
+117	POINT(55.58852775304245 17.426536064113982)
+118	POINT(55.58852775304245 17.426536064113982)
 119	POINT(2 2)
 SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid;
 fid	Area(g)
diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
index 36d2b9ef348..b322c5da73a 100644
--- a/mysql-test/r/insert.result
+++ b/mysql-test/r/insert.result
@@ -175,12 +175,12 @@ Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	4
 original_value	1e+1111111111a
-f_double	1.79769313486232e+308
-f_float	3.40282e+38
+f_double	1.7976931348623157e308
+f_float	3.40282e38
 f_double_7_2	99999.99
 f_float_4_3	9.999
-f_double_u	1.79769313486232e+308
-f_float_u	3.40282e+38
+f_double_u	1.7976931348623157e308
+f_float_u	3.40282e38
 f_double_15_1_u	99999999999999.9
 f_float_3_1_u	99.9
 set @value= "-1e+1111111111a";
@@ -204,8 +204,8 @@ Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	5
 original_value	-1e+1111111111a
-f_double	-1.79769313486232e+308
-f_float	-3.40282e+38
+f_double	-1.7976931348623157e308
+f_float	-3.40282e38
 f_double_7_2	-99999.99
 f_float_4_3	-9.999
 f_double_u	0
@@ -227,13 +227,13 @@ Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
 Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	6
-original_value	1e+111
-f_double	1e+111
-f_float	3.40282e+38
+original_value	1e111
+f_double	1e111
+f_float	3.40282e38
 f_double_7_2	99999.99
 f_float_4_3	9.999
-f_double_u	1e+111
-f_float_u	3.40282e+38
+f_double_u	1e111
+f_float_u	3.40282e38
 f_double_15_1_u	99999999999999.9
 f_float_3_1_u	99.9
 set @value= -1e+111;
@@ -248,9 +248,9 @@ Warning	1264	Out of range value for column 'f_double_15_1_u' at row 1
 Warning	1264	Out of range value for column 'f_float_3_1_u' at row 1
 select * from t1 where number =last_insert_id();
 number	7
-original_value	-1e+111
-f_double	-1e+111
-f_float	-3.40282e+38
+original_value	-1e111
+f_double	-1e111
+f_float	-3.40282e38
 f_double_7_2	-99999.99
 f_float_4_3	-9.999
 f_double_u	0
@@ -524,42 +524,36 @@ INSERT INTO t1(a,b) VALUES (1.25e-175, 1.25e-175);
 INSERT INTO t1(a,c) VALUES (1.225e+0, 1.225e+0);
 INSERT INTO t1(a,c) VALUES (1.37e+0, 1.37e+0);
 INSERT INTO t1(a,c) VALUES (-1.37e+0, -1.37e+0);
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
 INSERT INTO t1(a,c) VALUES (1.87e-3, 1.87e-3);
 Warnings:
 Warning	1265	Data truncated for column 'c' at row 1
 INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2);
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
 INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0);
 INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0);
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
 SELECT * FROM t1;
 a	b	c
 9.999999	10	10
-1.225e-05	1.2e-05	1e-0
-0.0001225	0.00012	NULL
+0.00001225	1.22e-5	1e-5
+0.0001225	1.22e-4	NULL
 0.1225	0.1225	NULL
 0.1225877	0.12259	NULL
 12.25	12.25	NULL
 12.25	12.25	12.2
 122500	122500	NULL
-12250000000	1.2e+10	NULL
-1.225e+15	1.2e+15	NULL
+12250000000	1.22e10	NULL
+1.225e15	1.22e15	NULL
 5000000	5000000	NULL
-1.25e+78	1.2e+78	NULL
+1.25e78	1.25e78	NULL
 1.25e-94	1.2e-94	NULL
-1.25e+203	1e+203	NULL
+1.25e203	1.2e203	NULL
 1.25e-175	1e-175	NULL
 1.225	NULL	1.23
 1.37	NULL	1.37
--1.37	NULL	-1.3
-0.00187	NULL	0.00
--0.0187	NULL	-0.0
+-1.37	NULL	-1.4
+0.00187	NULL	2e-3
+-0.0187	NULL	0
 5000	NULL	5000
--5000	NULL	-500
+-5000	NULL	-5e3
 DROP TABLE t1;
 CREATE TABLE t1 (
 a char(20) NOT NULL,
@@ -586,32 +580,30 @@ INSERT INTO t1(a,c) VALUES (1.37e+0, 1.37e+0);
 INSERT INTO t1(a,c) VALUES (-1.37e+0, -1.37e+0);
 INSERT INTO t1(a,c) VALUES (1.87e-3, 1.87e-3);
 INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2);
-Warnings:
-Warning	1265	Data truncated for column 'c' at row 1
 INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0);
 INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0);
 SELECT * FROM t1;
 a	b	c
 9.999999	10	9.999
-1.225e-05	1.2e-05	1e-05
-0.0001225	0.00012	NULL
+0.00001225	1.22e-5	1e-5
+0.0001225	1.22e-4	NULL
 0.1225	0.1225	NULL
 0.1225877	0.12259	NULL
 12.25	12.25	NULL
 12.25	12.25	12.25
 122500	122500	NULL
-12250000000	1.2e+10	NULL
-1.225e+15	1.2e+15	NULL
+12250000000	1.22e10	NULL
+1.225e15	1.22e15	NULL
 5000000	5000000	NULL
-1.25e+78	1.2e+78	NULL
+1.25e78	1.25e78	NULL
 1.25e-94	1.2e-94	NULL
-1.25e+203	1e+203	NULL
+1.25e203	1.2e203	NULL
 1.25e-175	1e-175	NULL
 1.225	NULL	1.225
 1.37	NULL	1.37
 -1.37	NULL	-1.37
 0.00187	NULL	0.002
--0.0187	NULL	-0.01
+-0.0187	NULL	-0.02
 5000	NULL	5000
 -5000	NULL	-5000
 DROP TABLE t1;
diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result
index 08d8059f61b..844109dba1f 100644
--- a/mysql-test/r/key_cache.result
+++ b/mysql-test/r/key_cache.result
@@ -274,8 +274,26 @@ Key_blocks_used	4
 show status like 'key_blocks_unused';
 Variable_name	Value
 Key_blocks_unused	KEY_BLOCKS_UNUSED
+create table t1 (a int primary key);
+cache index t1 in keycache2;
+Table	Op	Msg_type	Msg_text
+test.t1	assign_to_keycache	status	OK
+insert t1 values (1),(2),(3),(4),(5),(6),(7),(8);
 set global keycache2.key_buffer_size=0;
+select * from t1;
+a
+1
+2
+3
+4
+5
+6
+7
+8
+drop table t1;
 set global keycache3.key_buffer_size=100;
+Warnings:
+Warning	1292	Truncated incorrect key_buffer_size value: '100'
 set global keycache3.key_buffer_size=0;
 create table t1 (mytext text, FULLTEXT (mytext));
 insert t1 values ('aaabbb');
@@ -334,8 +352,7 @@ test.t1	check	status	OK
 DROP TABLE t1,t2;
 set global key_cache_block_size= @my_key_cache_block_size;
 set @@global.key_buffer_size=0;
-Warnings:
-Warning	1438	Cannot drop default keycache
+ERROR HY000: Cannot drop default keycache
 select @@global.key_buffer_size;
 @@global.key_buffer_size
 2097152
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index 1e488b320d7..5e25132880f 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -251,15 +251,15 @@ CREATE TABLE t1 (c1 INT, c2 TIMESTAMP, c3 REAL, c4 DOUBLE);
 INSERT INTO t1 (c1, c2, c3, c4) VALUES (10, '1970-02-01 01:02:03', 1.1E-100, 1.1E+100);
 SELECT * FROM t1;
 c1	c2	c3	c4
-10	1970-02-01 01:02:03	1.1e-100	1.1e+100
+10	1970-02-01 01:02:03	1.1e-100	1.1e100
 SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1' FIELDS ENCLOSED BY '-' FROM t1;
--10-	-1970\-02\-01 01:02:03-	-1.1e\-100-	-1.1e+100-
+-10-	-1970\-02\-01 01:02:03-	-1.1e\-100-	-1.1e100-
 EOF
 TRUNCATE t1;
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1' INTO TABLE t1 FIELDS ENCLOSED BY '-';
 SELECT * FROM t1;
 c1	c2	c3	c4
-10	1970-02-01 01:02:03	1.1e-100	1.1e+100
+10	1970-02-01 01:02:03	1.1e-100	1.1e100
 DROP TABLE t1;
 
 # --
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
index 80684e5f5d2..1666d5e0297 100644
--- a/mysql-test/r/log_tables.result
+++ b/mysql-test/r/log_tables.result
@@ -249,7 +249,7 @@ set @save_storage_engine= @@session.storage_engine;
 set storage_engine= MEMORY;
 alter table mysql.slow_log engine=NonExistentEngine;
 Warnings:
-Warning	1286	Unknown table engine 'NonExistentEngine'
+Warning	1286	Unknown storage engine 'NonExistentEngine'
 alter table mysql.slow_log engine=memory;
 ERROR HY000: This storage engine cannot be used for log tables"
 set storage_engine= @save_storage_engine;
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 366052af95e..b2d4531d0ad 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -397,9 +397,9 @@ WARNING: --server-arg option not supported in this configuration.
 +---+
 | 1 |
 +---+
-Warning (Code 1286): Unknown table engine 'nonexistent'
+Warning (Code 1286): Unknown storage engine 'nonexistent'
 Warning (Code 1266): Using storage engine MyISAM for table 't2'
-Warning (Code 1286): Unknown table engine 'nonexistent2'
+Warning (Code 1286): Unknown storage engine 'nonexistent2'
 Warning (Code 1266): Using storage engine MyISAM for table 't2'
 Error (Code 1050): Table 't2' already exists
 drop tables t1, t2;
diff --git a/mysql-test/r/mysqlbinlog_row_innodb.result b/mysql-test/r/mysqlbinlog_row_innodb.result
index cf59d23bcf1..3eb4774ae4e 100644
--- a/mysql-test/r/mysqlbinlog_row_innodb.result
+++ b/mysql-test/r/mysqlbinlog_row_innodb.result
@@ -495,10 +495,10 @@ c15	0000000000
 c16	-9223372036854775808
 c17	0
 c18	00000000000000000000
-c19	-3.40282e+38
+c19	-3.40282e38
 c20	1.17549e-38
 c21	000000000000
-c22	-1.7976931348623e+308
+c22	-1.7976931348623e308
 c23	2.2250738585072e-308
 c24	0000000000000000000000
 c25	-9999999999
@@ -574,12 +574,12 @@ c15	4294967295
 c16	9223372036854775807
 c17	18446744073709551615
 c18	18446744073709551615
-c19	3.40282e+38
-c20	3.40282e+38
-c21	03.40282e+38
-c22	1.7976931348623e+308
-c23	1.7976931348623e+308
-c24	001.7976931348623e+308
+c19	3.40282e38
+c20	3.40282e38
+c21	003.40282e38
+c22	1.7976931348623e308
+c23	1.7976931348623e308
+c24	0001.7976931348623e308
 c25	9999999999
 c26	9999999999
 c27	9999999999
@@ -1557,12 +1557,12 @@ c15	4294967295
 c16	9223372036854775807
 c17	18446744073709551615
 c18	18446744073709551615
-c19	3.40282e+38
-c20	3.40282e+38
-c21	03.40282e+38
-c22	1.7976931348623e+308
-c23	1.7976931348623e+308
-c24	001.7976931348623e+308
+c19	3.40282e38
+c20	3.40282e38
+c21	003.40282e38
+c22	1.7976931348623e308
+c23	1.7976931348623e308
+c24	0001.7976931348623e308
 c25	9999999999
 c26	9999999999
 c27	9999999999
@@ -1636,10 +1636,10 @@ c15	0000000000
 c16	-9223372036854775808
 c17	0
 c18	00000000000000000000
-c19	-3.40282e+38
+c19	-3.40282e38
 c20	1.17549e-38
 c21	000000000000
-c22	-1.7976931348623e+308
+c22	-1.7976931348623e308
 c23	2.2250738585072e-308
 c24	0000000000000000000000
 c25	-9999999999
diff --git a/mysql-test/r/mysqlbinlog_row_myisam.result b/mysql-test/r/mysqlbinlog_row_myisam.result
index 973786d698e..b673d36c452 100644
--- a/mysql-test/r/mysqlbinlog_row_myisam.result
+++ b/mysql-test/r/mysqlbinlog_row_myisam.result
@@ -495,10 +495,10 @@ c15	0000000000
 c16	-9223372036854775808
 c17	0
 c18	00000000000000000000
-c19	-3.40282e+38
+c19	-3.40282e38
 c20	1.17549e-38
 c21	000000000000
-c22	-1.7976931348623e+308
+c22	-1.7976931348623e308
 c23	2.2250738585072e-308
 c24	0000000000000000000000
 c25	-9999999999
@@ -574,12 +574,12 @@ c15	4294967295
 c16	9223372036854775807
 c17	18446744073709551615
 c18	18446744073709551615
-c19	3.40282e+38
-c20	3.40282e+38
-c21	03.40282e+38
-c22	1.7976931348623e+308
-c23	1.7976931348623e+308
-c24	001.7976931348623e+308
+c19	3.40282e38
+c20	3.40282e38
+c21	003.40282e38
+c22	1.7976931348623e308
+c23	1.7976931348623e308
+c24	0001.7976931348623e308
 c25	9999999999
 c26	9999999999
 c27	9999999999
@@ -1557,12 +1557,12 @@ c15	4294967295
 c16	9223372036854775807
 c17	18446744073709551615
 c18	18446744073709551615
-c19	3.40282e+38
-c20	3.40282e+38
-c21	03.40282e+38
-c22	1.7976931348623e+308
-c23	1.7976931348623e+308
-c24	001.7976931348623e+308
+c19	3.40282e38
+c20	3.40282e38
+c21	003.40282e38
+c22	1.7976931348623e308
+c23	1.7976931348623e308
+c24	0001.7976931348623e308
 c25	9999999999
 c26	9999999999
 c27	9999999999
@@ -1636,10 +1636,10 @@ c15	0000000000
 c16	-9223372036854775808
 c17	0
 c18	00000000000000000000
-c19	-3.40282e+38
+c19	-3.40282e38
 c20	1.17549e-38
 c21	000000000000
-c22	-1.7976931348623e+308
+c22	-1.7976931348623e308
 c23	2.2250738585072e-308
 c24	0000000000000000000000
 c25	-9999999999
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
new file mode 100644
index 00000000000..0ebd3e2cb42
--- /dev/null
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -0,0 +1,938 @@
+The following options may be given as the first argument:
+--print-defaults	Print the program argument list and exit
+--no-defaults		Don't read default options from any options file
+--defaults-file=#	Only read default options from the given file #
+--defaults-extra-file=# Read this file after the global files are read
+
+  --abort-slave-event-count=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --allow-suspicious-udfs 
+                      Allows use of UDFs consisting of only one symbol xxx()
+                      without corresponding xxx_init() or xxx_deinit(). That
+                      also means that one can load any function from any
+                      library, for example exit() from libc.so
+  -a, --ansi          Use ANSI SQL syntax instead of MySQL syntax. This mode
+                      will also set transaction isolation level 'serializable'.
+  --archive[=name]    Enable or disable ARCHIVE plugin. Possible values are ON,
+                      OFF, FORCE (don't start if the plugin fails to load).
+  --auto-increment-increment[=#] 
+                      Auto-increment columns are incremented by this
+  --auto-increment-offset[=#] 
+                      Offset added to Auto-increment columns. Used when
+                      auto-increment-increment != 1
+  --automatic-sp-privileges 
+                      Creating and dropping stored procedures alters ACLs
+                      (Defaults to on; use --skip-automatic-sp-privileges to disable.)
+  --back-log=#        The number of outstanding connection requests MySQL can
+                      have. This comes into play when the main MySQL thread
+                      gets very many connection requests in a very short time
+  -b, --basedir=name  Path to installation directory. All paths are usually
+                      resolved relative to this
+  --big-tables        Allow big result sets by saving all temporary sets on
+                      file (Solves most 'table full' errors)
+  --bind-address=name IP address to bind to.
+  --binlog-cache-size=# 
+                      The size of the cache to hold the SQL statements for the
+                      binary log during a transaction. If you often use big,
+                      multi-statement transactions you can increase this to get
+                      more performance
+  --binlog-do-db=name Tells the master it should log updates for the specified
+                      database, and exclude all others not explicitly
+                      mentioned.
+  --binlog-format=name 
+                      What form of binary logging the master will use: either
+                      ROW for row-based binary logging, STATEMENT for
+                      statement-based binary logging, or MIXED. MIXED is
+                      statement-based binary logging except for those
+                      statements where only row-based is correct: those which
+                      involve user-defined functions (i.e. UDFs) or the UUID()
+                      function; for those, row-based binary logging is
+                      automatically used. If NDBCLUSTER is enabled and
+                      binlog-format is MIXED, the format switches to row-based
+                      and back implicitly per each query accessing an
+                      NDBCLUSTER table
+  --binlog-ignore-db=name 
+                      Tells the master that updates to the given database
+                      should not be logged tothe binary log.
+  --binlog-row-event-max-size=# 
+                      The maximum size of a row-based binary log event in
+                      bytes. Rows will be grouped into events smaller than this
+                      size if possible. The value has to be a multiple of 256.
+  --blackhole[=name]  Enable or disable BLACKHOLE plugin. Possible values are
+                      ON, OFF, FORCE (don't start if the plugin fails to load).
+  --bootstrap         Used by mysql installation scripts.
+  --bulk-insert-buffer-size=# 
+                      Size of tree cache used in bulk insert optimisation. Note
+                      that this is a limit per thread!
+  --character-set-client-handshake 
+                      Don't ignore client side character set value sent during
+                      handshake.
+                      (Defaults to on; use --skip-character-set-client-handshake to disable.)
+  --character-set-filesystem=name 
+                      Set the filesystem character set.
+  -C, --character-set-server=name 
+                      Set the default character set.
+  --character-sets-dir=name 
+                      Directory where character sets are
+  -r, --chroot=name   Chroot mysqld daemon during startup.
+  --collation-server=name 
+                      Set the default collation.
+  --completion-type=name 
+                      The transaction completion type, one of NO_CHAIN, CHAIN,
+                      RELEASE
+  --concurrent-insert[=name] 
+                      Use concurrent insert with MyISAM. Possible values are
+                      NEVER, AUTO, ALWAYS
+  --connect-timeout=# The number of seconds the mysqld server is waiting for a
+                      connect packet before responding with 'Bad handshake'
+  --console           Write error output on screen; Don't remove the console
+                      window on windows.
+  --core-file         Write core on errors.
+  -h, --datadir=name  Path to the database root directory
+  --date-format=name  The DATE format (ignored)
+  --datetime-format=name 
+                      The DATETIME format (ignored)
+  -C, --default-character-set=name 
+                      Set the default character set (deprecated option, use
+                      --character-set-server instead).
+  --default-collation=name 
+                      Set the default collation (deprecated option, use
+                      --collation-server instead).
+  --default-storage-engine=name 
+                      The default storage engine for new tables
+  --default-time-zone=name 
+                      Set the default time zone.
+  --default-week-format=# 
+                      The default week format used by WEEK() functions
+  --delay-key-write[=name] 
+                      Type of DELAY_KEY_WRITE
+  --delay-key-write-for-all-tables 
+                      Don't flush key buffers between writes for any MyISAM
+                      table (Deprecated option, use --delay-key-write=all
+                      instead).
+  --delayed-insert-limit=# 
+                      After inserting delayed_insert_limit rows, the INSERT
+                      DELAYED handler will check if there are any SELECT
+                      statements pending. If so, it allows these to execute
+                      before continuing
+  --delayed-insert-timeout=# 
+                      How long a INSERT DELAYED thread should wait for INSERT
+                      statements before terminating
+  --delayed-queue-size=# 
+                      What size queue (in rows) should be allocated for
+                      handling INSERT DELAYED. If the queue becomes full, any
+                      client that does INSERT DELAYED will wait until there is
+                      room in the queue again
+  --disconnect-slave-event-count=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --div-precision-increment=# 
+                      Precision of the result of '/' operator will be increased
+                      on that value
+  --enable-locking    Deprecated option, use --external-locking instead.
+  --engine-condition-pushdown 
+                      Push supported query conditions to the storage engine
+                      (Defaults to on; use --skip-engine-condition-pushdown to disable.)
+  --event-scheduler[=name] 
+                      Enable the event scheduler. Possible values are ON, OFF,
+                      and DISABLED (keep the event scheduler completely
+                      deactivated, it cannot be activated run-time)
+  -T, --exit-info[=#] Used for debugging;  Use at your own risk!
+  --expire-logs-days=# 
+                      If non-zero, binary logs will be purged after
+                      expire_logs_days days; possible purges happen at startup
+                      and at binary log rotation
+  --external-locking  Use system (external) locking (disabled by default). 
+                      With this option enabled you can run myisamchk to test
+                      (not repair) tables while the MySQL server is running.
+                      Disable with --skip-external-locking.
+  --federated[=name]  Enable or disable FEDERATED plugin. Possible values are
+                      ON, OFF, FORCE (don't start if the plugin fails to load).
+  --flush             Flush MyISAM tables to disk between SQL commands
+  --flush-time=#      A dedicated thread is created to flush all tables at the
+                      given interval
+  --ft-boolean-syntax=name 
+                      List of operators for MATCH ... AGAINST ( ... IN BOOLEAN
+                      MODE)
+  --ft-max-word-len=# The maximum length of the word to be included in a
+                      FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+                      after changing this variable
+  --ft-min-word-len=# The minimum length of the word to be included in a
+                      FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+                      after changing this variable
+  --ft-query-expansion-limit=# 
+                      Number of best matches to use for query expansion
+  --ft-stopword-file=name 
+                      Use stopwords from this file instead of built-in list
+  --gdb               Set up signals usable for debugging
+  --general-log       Log connections and queries to a table or log file.
+                      Defaults logging to a file hostname.log or a table
+                      mysql.general_logif --log-output=TABLE is used
+  --general-log-file=name 
+                      Log connections and queries to given file
+  --group-concat-max-len=# 
+                      The maximum length of the result of function 
+                      GROUP_CONCAT()
+  -?, --help          Display this help and exit.
+  --ignore-builtin-innodb 
+                      Disable initialization of builtin InnoDB plugin
+  --init-connect=name Command(s) that are executed for each new connection
+  --init-file=name    Read SQL commands from this file at startup
+  --init-rpl-role=name 
+                      Set the replication role.
+  --init-slave=name   Command(s) that are executed by a slave server each time
+                      the SQL thread starts
+  --interactive-timeout=# 
+                      The number of seconds the server waits for activity on an
+                      interactive connection before closing it
+  --join-buffer-size=# 
+                      The size of the buffer that is used for full joins
+  --keep-files-on-create 
+                      Don't overwrite stale .MYD and .MYI even if no directory
+                      is specified
+  --key-buffer-size=# The size of the buffer used for index blocks for MyISAM
+                      tables. Increase this to get better index handling (for
+                      all reads and multiple writes) to as much as you can
+                      afford
+  --key-cache-age-threshold=# 
+                      This characterizes the number of hits a hot block has to
+                      be untouched until it is considered aged enough to be
+                      downgraded to a warm block. This specifies the percentage
+                      ratio of that number of hits to the total number of
+                      blocks in key cache
+  --key-cache-block-size=# 
+                      The default size of key cache blocks
+  --key-cache-division-limit=# 
+                      The minimum percentage of warm blocks in key cache
+  -L, --language=name Client error messages in given language. May be given as
+                      a full path. Deprecated. Use --lc-messages-dir instead.
+  --large-pages       Enable support for large pages
+  --lc-messages=name  Set the language used for the error messages.
+  -L, --lc-messages-dir=name 
+                      Directory where error messages are
+  --lc-time-names=name 
+                      Set the language used for the month names and the days of
+                      the week.
+  --local-infile      Enable LOAD DATA LOCAL INFILE
+                      (Defaults to on; use --skip-local-infile to disable.)
+  -l, --log[=name]    Log connections and queries to file (deprecated option,
+                      use --general-log/--general-log-file instead).
+  --log-bin[=name]    Log update queries in binary format. Optional (but
+                      strongly recommended to avoid replication problems if
+                      server's hostname changes) argument should be the chosen
+                      location for the binary log files.
+  --log-bin-index=name 
+                      File that holds the names for last binary log files.
+  --log-bin-trust-function-creators 
+                      If set to FALSE (the default), then when --log-bin is
+                      used, creation of a stored function (or trigger) is
+                      allowed only to users having the SUPER privilege and only
+                      if this stored function (trigger) may not break binary
+                      logging. Note that if ALL connections to this server
+                      ALWAYS use row-based binary logging, the security issues
+                      do not exist and the binary logging cannot break, so you
+                      can safely set this to TRUE
+  --log-error[=name]  Error log file
+  --log-isam[=name]   Log all MyISAM changes to file.
+  -0, --log-long-format 
+                      Log some extra information to update log. Please note
+                      that this option is deprecated; see --log-short-format
+                      option.
+  --log-output=name   Syntax: log-output=value[,value...], where "value" could
+                      be TABLE, FILE or NONE
+  --log-queries-not-using-indexes 
+                      Log queries that are executed without benefit of any
+                      index to the slow log if it is open
+  --log-short-format  Don't log extra information to update and slow-query
+                      logs.
+  --log-slave-updates Tells the slave to log the updates from the slave thread
+                      to the binary log. You will need to turn it on if you
+                      plan to daisy-chain the slaves
+  --log-slow-admin-statements 
+                      Log slow OPTIMIZE, ANALYZE, ALTER and other
+                      administrative statements to the slow log if it is open.
+  --log-slow-queries[=name] 
+                      Log slow queries to a table or log file. Defaults logging
+                      to table mysql.slow_log or hostname-slow.log if
+                      --log-output=file is used. Must be enabled to activate
+                      other slow log options. Deprecated option, use
+                      --slow-query-log/--slow-query-log-file instead.
+  --log-slow-slave-statements 
+                      Log slow statements executed by slave thread to the slow
+                      log if it is open.
+  --log-tc=name       Path to transaction coordinator log (used for
+                      transactions that affect more than one storage engine,
+                      when binary log is disabled)
+  --log-tc-size=#     Size of transaction coordinator log.
+  --log-update[=name] The update log is deprecated since version 5.0, is
+                      replaced by the binary log and this option justs turns on
+                      --log-bin instead.
+  -W, --log-warnings[=#] 
+                      Log some not critical warnings to the log file
+  --long-query-time=# Log all queries that have taken more than long_query_time
+                      seconds to execute to file. The argument will be treated
+                      as a decimal value with microsecond precision
+  --low-priority-updates 
+                      INSERT/DELETE/UPDATE has lower priority than selects
+  --lower-case-table-names[=#] 
+                      If set to 1 table names are stored in lowercase on disk
+                      and table names will be case-insensitive.  Should be set
+                      to 2 if you are using a case insensitive file system
+  --master-info-file=name 
+                      The location and name of the file that remembers the
+                      master and where the I/O replication thread is in the
+                      master's binlogs.
+  --master-retry-count=# 
+                      The number of tries the slave will make to connect to the
+                      master before giving up.
+  --max-allowed-packet=# 
+                      Max packet length to send to or receive from the server
+  --max-binlog-cache-size=# 
+                      Can be used to restrict the total size used to cache a
+                      multi-transaction query
+  --max-binlog-dump-events=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --max-binlog-size=# Binary log will be rotated automatically when the size
+                      exceeds this value. Will also apply to relay logs if
+                      max_relay_log_size is 0
+  --max-connect-errors=# 
+                      If there is more than this number of interrupted
+                      connections from a host this host will be blocked from
+                      further connections
+  --max-connections=# The number of simultaneous clients allowed
+  --max-delayed-threads=# 
+                      Don't start more than this number of threads to handle
+                      INSERT DELAYED statements. If set to zero INSERT DELAYED
+                      will be not used
+  --max-error-count=# Max number of errors/warnings to store for a statement
+  --max-heap-table-size=# 
+                      Don't allow creation of heap tables bigger than this
+  --max-join-size=#   Joins that are probably going to read more than
+                      max_join_size records return an error
+  --max-length-for-sort-data=# 
+                      Max number of bytes in sorted records
+  --max-prepared-stmt-count=# 
+                      Maximum number of prepared statements in the server
+  --max-relay-log-size=# 
+                      If non-zero: relay log will be rotated automatically when
+                      the size exceeds this value; if zero: when the size
+                      exceeds max_binlog_size
+  --max-seeks-for-key=# 
+                      Limit assumed max number of seeks when looking up rows
+                      based on a key
+  --max-sort-length=# The number of bytes to use when sorting BLOB or TEXT
+                      values (only the first max_sort_length bytes of each
+                      value are used; the rest are ignored)
+  --max-sp-recursion-depth[=#] 
+                      Maximum stored procedure recursion depth
+  --max-tmp-tables=#  Maximum number of temporary tables a client can keep open
+                      at a time
+  --max-user-connections=# 
+                      The maximum number of active connections for a single
+                      user (0 = no limit)
+  --max-write-lock-count=# 
+                      After this many write locks, allow some read locks to run
+                      in between
+  --memlock           Lock mysqld in memory.
+  --min-examined-row-limit=# 
+                      Don't write queries to slow log that examine fewer rows
+                      than that
+  --multi-range-count=# 
+                      Number of key ranges to request at once
+  --myisam-block-size=# 
+                      Block size to be used for MyISAM index pages
+  --myisam-data-pointer-size=# 
+                      Default pointer size to be used for MyISAM tables
+  --myisam-max-sort-file-size=# 
+                      Don't use the fast sort index method to created index if
+                      the temporary file would get bigger than this
+  --myisam-mmap-size=# 
+                      Restricts the total memory used for memory mapping of
+                      MySQL tables
+  --myisam-recover-options[=name] 
+                      Syntax: myisam-recover-options[=option[,option...]],
+                      where option can be DEFAULT, BACKUP, FORCE, QUICK, or OFF
+  --myisam-repair-threads=# 
+                      If larger than 1, when repairing a MyISAM table all
+                      indexes will be created in parallel, with one thread per
+                      index. The value of 1 disables parallel repair
+  --myisam-sort-buffer-size=# 
+                      The buffer that is allocated when sorting the index when
+                      doing a REPAIR or when creating indexes with CREATE INDEX
+                      or ALTER TABLE
+  --myisam-stats-method=name 
+                      Specifies how MyISAM index statistics collection code
+                      should treat NULLs. Possible values of name are
+                      NULLS_UNEQUAL (default behavior for 4.1 and later),
+                      NULLS_EQUAL (emulate 4.0 behavior), and NULLS_IGNORED
+  --myisam-use-mmap   Use memory mapping for reading and writing MyISAM tables
+  --net-buffer-length=# 
+                      Buffer length for TCP/IP and socket communication
+  --net-read-timeout=# 
+                      Number of seconds to wait for more data from a connection
+                      before aborting the read
+  --net-retry-count=# If a read on a communication port is interrupted, retry
+                      this many times before giving up
+  --net-write-timeout=# 
+                      Number of seconds to wait for a block to be written to a
+                      connection before aborting the write
+  -n, --new           Use very new possible "unsafe" functions
+  --old               Use compatible behavior
+  --old-alter-table   Use old, non-optimized alter table
+  --old-passwords     Use old password encryption method (needed for 4.0 and
+                      older clients)
+  --old-style-user-limits 
+                      Enable old-style user limits (before 5.0.3 user resources
+                      were counted per each user+host vs. per account)
+  --one-thread        (deprecated): Only use one thread (for debugging under
+                      Linux). Use thread-handling=no-threads instead
+  --open-files-limit=# 
+                      If this is not 0, then mysqld will use this value to
+                      reserve file descriptors to use with setrlimit(). If this
+                      value is 0 then mysqld will reserve max_connections*5 or
+                      max_connections + table_cache*2 (whichever is larger)
+                      number of file descriptors
+  --optimizer-prune-level=# 
+                      Controls the heuristic(s) applied during query
+                      optimization to prune less-promising partial plans from
+                      the optimizer search space. Meaning: 0 - do not apply any
+                      heuristic, thus perform exhaustive search; 1 - prune
+                      plans based on number of retrieved rows
+  --optimizer-search-depth=# 
+                      Maximum depth of search performed by the query optimizer.
+                      Values larger than the number of relations in a query
+                      result in better query plans, but take longer to compile
+                      a query. Values smaller than the number of tables in a
+                      relation result in faster optimization, but may produce
+                      very bad query plans. If set to 0, the system will
+                      automatically pick a reasonable value; if set to 63, the
+                      optimizer will switch to the original find_best
+                      search(used for testing/comparison)
+  --optimizer-switch=name 
+                      optimizer_switch=option=val[,option=val...], where option
+                      is one of {index_merge, index_merge_union,
+                      index_merge_sort_union, index_merge_intersection} and val
+                      is one of {on, off, default}
+  --partition[=name]  Enable or disable partition plugin. Possible values are
+                      ON, OFF, FORCE (don't start if the plugin fails to load).
+  --pid-file=name     Pid file used by safe_mysqld
+  --plugin-dir=name   Directory for plugins
+  --plugin-load=name  Optional semicolon-separated list of plugins to load,
+                      where each plugin is identified as name=library, where
+                      name is the plugin name and library is the plugin library
+                      in plugin_dir.
+  -P, --port=#        Port number to use for connection or 0 to default to,
+                      my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default
+                      (3306), whatever comes first
+  --port-open-timeout=# 
+                      Maximum time in seconds to wait for the port to become
+                      free. (Default: no wait)
+  --preload-buffer-size=# 
+                      The size of the buffer that is allocated when preloading
+                      indexes
+  --profiling-history-size=# 
+                      Limit of query profiling memory
+  --query-alloc-block-size=# 
+                      Allocation block size for query parsing and execution
+  --query-cache-limit=# 
+                      Don't cache results that are bigger than this
+  --query-cache-min-res-unit=# 
+                      The minimum size for blocks allocated by the query cache
+  --query-cache-size=# 
+                      The memory allocated to store results from old queries
+  --query-cache-type=name 
+                      OFF = Don't cache or retrieve results. ON = Cache all
+                      results except SELECT SQL_NO_CACHE ... queries. DEMAND =
+                      Cache only SELECT SQL_CACHE ... queries
+  --query-cache-wlock-invalidate 
+                      Invalidate queries in query cache on LOCK for write
+  --query-prealloc-size=# 
+                      Persistent buffer for query parsing and execution
+  --range-alloc-block-size=# 
+                      Allocation block size for storing ranges during
+                      optimization
+  --read-buffer-size=# 
+                      Each thread that does a sequential scan allocates a
+                      buffer of this size for each table it scans. If you do
+                      many sequential scans, you may want to increase this
+                      value
+  --read-only         Make all non-temporary tables read-only, with the
+                      exception for replication (slave) threads and users with
+                      the SUPER privilege
+  --read-rnd-buffer-size=# 
+                      When reading rows in sorted order after a sort, the rows
+                      are read through this buffer to avoid a disk seeks. If
+                      not set, then it's set to the value of record_buffer
+  --record-buffer=#   Deprecated; use --read-buffer-size instead.
+  --relay-log=name    The location and name to use for relay logs
+  --relay-log-index=name 
+                      The location and name to use for the file that keeps a
+                      list of the last relay logs
+  --relay-log-info-file=name 
+                      The location and name of the file that remembers where
+                      the SQL replication thread is in the relay logs
+  --relay-log-purge   if disabled - do not purge relay logs. if enabled - purge
+                      them as soon as they are no more needed
+                      (Defaults to on; use --skip-relay-log-purge to disable.)
+  --relay-log-recovery 
+                      Enables automatic relay log recovery right after the
+                      database startup, which means that the IO Thread starts
+                      re-fetching from the master right after the last
+                      transaction processed
+  --relay-log-space-limit=# 
+                      Maximum space to use for all relay logs
+  --replicate-do-db=name 
+                      Tells the slave thread to restrict replication to the
+                      specified database. To specify more than one database,
+                      use the directive multiple times, once for each database.
+                      Note that this will only work if you do not use
+                      cross-database queries such as UPDATE some_db.some_table
+                      SET foo='bar' while having selected a different or no
+                      database. If you need cross database updates to work,
+                      make sure you have 3.23.28 or later, and use
+                      replicate-wild-do-table=db_name.%.
+  --replicate-do-table=name 
+                      Tells the slave thread to restrict replication to the
+                      specified table. To specify more than one table, use the
+                      directive multiple times, once for each table. This will
+                      work for cross-database updates, in contrast to
+                      replicate-do-db.
+  --replicate-ignore-db=name 
+                      Tells the slave thread to not replicate to the specified
+                      database. To specify more than one database to ignore,
+                      use the directive multiple times, once for each database.
+                      This option will not work if you use cross database
+                      updates. If you need cross database updates to work, make
+                      sure you have 3.23.28 or later, and use
+                      replicate-wild-ignore-table=db_name.%. 
+  --replicate-ignore-table=name 
+                      Tells the slave thread to not replicate to the specified
+                      table. To specify more than one table to ignore, use the
+                      directive multiple times, once for each table. This will
+                      work for cross-datbase updates, in contrast to
+                      replicate-ignore-db.
+  --replicate-rewrite-db=name 
+                      Updates to a database with a different name than the
+                      original. Example:
+                      replicate-rewrite-db=master_db_name->slave_db_name.
+  --replicate-same-server-id 
+                      In replication, if set to 1, do not skip events having
+                      our server id. Default value is 0 (to break infinite
+                      loops in circular replication). Can't be set to 1 if
+                      --log-slave-updates is used.
+  --replicate-wild-do-table=name 
+                      Tells the slave thread to restrict replication to the
+                      tables that match the specified wildcard pattern. To
+                      specify more than one table, use the directive multiple
+                      times, once for each table. This will work for
+                      cross-database updates. Example:
+                      replicate-wild-do-table=foo%.bar% will replicate only
+                      updates to tables in all databases that start with foo
+                      and whose table names start with bar.
+  --replicate-wild-ignore-table=name 
+                      Tells the slave thread to not replicate to the tables
+                      that match the given wildcard pattern. To specify more
+                      than one table to ignore, use the directive multiple
+                      times, once for each table. This will work for
+                      cross-database updates. Example:
+                      replicate-wild-ignore-table=foo%.bar% will not do updates
+                      to tables in databases that start with foo and whose
+                      table names start with bar.
+  --report-host=name  Hostname or IP of the slave to be reported to the master
+                      during slave registration. Will appear in the output of
+                      SHOW SLAVE HOSTS. Leave unset if you do not want the
+                      slave to register itself with the master. Note that it is
+                      not sufficient for the master to simply read the IP of
+                      the slave off the socket once the slave connects. Due to
+                      NAT and other routing issues, that IP may not be valid
+                      for connecting to the slave from the master or other
+                      hosts
+  --report-password=name 
+                      The account password of the slave to be reported to the
+                      master during slave registration
+  --report-port=#     Port for connecting to slave reported to the master
+                      during slave registration. Set it only if the slave is
+                      listening on a non-default port or if you have a special
+                      tunnel from the master or other clients to the slave. If
+                      not sure, leave this option unset
+  --report-user=name  The account user name of the slave to be reported to the
+                      master during slave registration
+  --rpl-recovery-rank=# 
+                      Unused, will be removed
+  --safe-mode         Skip some optimize stages (for testing).
+  --safe-show-database 
+                      Deprecated option; use GRANT SHOW DATABASES instead...
+  --safe-user-create  Don't allow new user creation by the user who has no
+                      write privileges to the mysql.user table.
+  --secure-auth       Disallow authentication for accounts that have old
+                      (pre-4.1) passwords
+  --secure-file-priv=name 
+                      Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to
+                      files within specified directory
+  --server-id=#       Uniquely identifies the server instance in the community
+                      of replication partners
+  -O, --set-variable=name 
+                      Change the value of a variable. Please note that this
+                      option is deprecated;you can set variables directly with
+                      --variable-name=value.
+  --show-slave-auth-info 
+                      Show user and password in SHOW SLAVE HOSTS on this master
+  --skip-grant-tables Start without grant tables. This gives all users FULL
+                      ACCESS to all tables!
+  --skip-host-cache   Don't cache host names.
+  --skip-locking      Deprecated option, use --skip-external-locking instead.
+  --skip-name-resolve Don't resolve hostnames. All hostnames are IP's or
+                      'localhost'.
+  --skip-networking   Don't allow connection with TCP/IP
+  --skip-new          Don't use new, possible wrong routines.
+  --skip-show-database 
+                      Don't allow 'SHOW DATABASE' commands
+  --skip-slave-start  If set, slave is not autostarted.
+  --skip-stack-trace  Don't print a stack trace on failure.
+  --skip-symlink      Don't allow symlinking of tables. Deprecated option.  Use
+                      --skip-symbolic-links instead.
+  --skip-thread-priority 
+                      Don't give threads different priorities. This option is
+                      deprecated because it has no effect; the implied behavior
+                      is already the default.
+  --slave-compressed-protocol 
+                      Use compression on master/slave protocol
+  --slave-exec-mode=name 
+                      Modes for how replication events should be executed.
+                      Legal values are STRICT (default) and IDEMPOTENT. In
+                      IDEMPOTENT mode, replication will not stop for operations
+                      that are idempotent. In STRICT mode, replication will
+                      stop on any unexpected difference between the master and
+                      the slave
+  --slave-load-tmpdir=name 
+                      The location where the slave should put its temporary
+                      files when replicating a LOAD DATA INFILE command
+  --slave-net-timeout=# 
+                      Number of seconds to wait for more data from a
+                      master/slave connection before aborting the read
+  --slave-skip-errors=name 
+                      Tells the slave thread to continue replication when a
+                      query event returns an error from the provided list
+  --slave-transaction-retries=# 
+                      Number of times the slave SQL thread will retry a
+                      transaction in case it failed with a deadlock or elapsed
+                      lock wait timeout, before giving up and stopping
+  --slow-launch-time=# 
+                      If creating the thread takes longer than this value (in
+                      seconds), the Slow_launch_threads counter will be
+                      incremented
+  --slow-query-log    Log slow queries to a table or log file. Defaults logging
+                      to a file hostname-slow.log or a table mysql.slow_log if
+                      --log-output=TABLE is used. Must be enabled to activate
+                      other slow log options
+  --slow-query-log-file=name 
+                      Log slow queries to given log file. Defaults logging to
+                      hostname-slow.log. Must be enabled to activate other slow
+                      log options
+  --socket=name       Socket file to use for connection
+  --sort-buffer-size=# 
+                      Each thread that needs to do a sort allocates a buffer of
+                      this size
+  --sporadic-binlog-dump-fail 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --sql-bin-update-same 
+                      The update log is deprecated since version 5.0, is
+                      replaced by the binary log and this option does nothing
+                      anymore.
+  --sql-mode=name     Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
+                      for the complete list of valid sql modes
+  -s, --symbolic-links 
+                      Enable symbolic link support.
+  --sync-binlog=#     Synchronously flush binary log to disk after every #th
+                      event. Use 0 (default) to disable synchronous flushing
+  --sync-frm          Sync .frm files to disk on creation
+                      (Defaults to on; use --skip-sync-frm to disable.)
+  --sync-master-info=# 
+                      Synchronously flush master info to disk after every #th
+                      event. Use 0 (default) to disable synchronous flushing
+  --sync-relay-log=#  Synchronously flush relay log to disk after every #th
+                      event. Use 0 (default) to disable synchronous flushing
+  --sync-relay-log-info=# 
+                      Synchronously flush relay log info to disk after every
+                      #th transaction. Use 0 (default) to disable synchronous
+                      flushing
+  --sysdate-is-now    Non-default option to alias SYSDATE() to NOW() to make it
+                      safe-replicable. Since 5.0, SYSDATE() returns a `dynamic'
+                      value different for different invocations, even within
+                      the same statement.
+  --table-cache=#     Deprecated; use --table-open-cache instead.
+  --table-definition-cache=# 
+                      The number of cached table definitions
+  --table-lock-wait-timeout=# 
+                      Timeout in seconds to wait for a table level lock before
+                      returning an error. Used only if the connection has
+                      active cursors
+  --table-open-cache=# 
+                      The number of cached open tables
+  --tc-heuristic-recover=name 
+                      Decision to use in heuristic recover process. Possible
+                      values are COMMIT or ROLLBACK.
+  --thread-cache-size=# 
+                      How many threads we should keep in a cache for reuse
+  --thread-handling=name 
+                      Define threads usage for handling queries, one of
+                      one-thread-per-connection, no-threads
+  --thread-stack=#    The stack size for each thread
+  --time-format=name  The TIME format (ignored)
+  --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
+                      currently supported)
+  --tmp-table-size=#  If an internal in-memory temporary table exceeds this
+                      size, MySQL will automatically convert it to an on-disk
+                      MyISAM table
+  -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
+                      separated by a colon (:), in this case they are used in a
+                      round-robin fashion
+  --transaction-alloc-block-size=# 
+                      Allocation block size for transactions to be stored in
+                      binary log
+  --transaction-isolation=name 
+                      Default transaction isolation level.
+  --transaction-prealloc-size=# 
+                      Persistent buffer for transactions to be stored in binary
+                      log
+  --updatable-views-with-limit=name 
+                      YES = Don't issue an error message (warning only) if a
+                      VIEW without presence of a key of the underlying table is
+                      used in queries with a LIMIT clause for updating. NO =
+                      Prohibit update of a VIEW, which does not contain a key
+                      of the underlying table and the query uses a LIMIT clause
+                      (usually get from GUI tools)
+  -s, --use-symbolic-links 
+                      Enable symbolic link support. Deprecated option; use
+                      --symbolic-links instead.
+  -u, --user=name     Run mysqld daemon as user.
+  -v, --verbose       Used with --help option for detailed help
+  -V, --version       Output version information and exit.
+  --wait-timeout=#    The number of seconds the server waits for activity on a
+                      connection before closing it
+  -W, --warnings[=#]  Deprecated; use --log-warnings instead.
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE}    Value (after reading options)
+----------------------------------- --------------------------------------
+abort-slave-event-count             0
+allow-suspicious-udfs               FALSE
+archive                             ON
+auto-increment-increment            1
+auto-increment-offset               1
+automatic-sp-privileges             TRUE
+back-log                            50
+big-tables                          FALSE
+bind-address                        (No default value)
+binlog-cache-size                   32768
+binlog-format                       STATEMENT
+binlog-row-event-max-size           1024
+blackhole                           ON
+bulk-insert-buffer-size             8388608
+character-set-client-handshake      TRUE
+character-set-filesystem            binary
+character-set-server                latin1
+character-sets-dir                  MYSQL_CHARSETSDIR/
+chroot                              (No default value)
+collation-server                    latin1_swedish_ci
+completion-type                     NO_CHAIN
+concurrent-insert                   AUTO
+connect-timeout                     10
+console                             FALSE
+datadir                             MYSQLTEST_VARDIR/install.db/
+date-format                         %Y-%m-%d
+datetime-format                     %Y-%m-%d %H:%i:%s
+default-character-set               latin1
+default-collation                   latin1_swedish_ci
+default-storage-engine              MyISAM
+default-time-zone                   (No default value)
+default-week-format                 0
+delay-key-write                     ON
+delayed-insert-limit                100
+delayed-insert-timeout              300
+delayed-queue-size                  1000
+disconnect-slave-event-count        0
+div-precision-increment             4
+enable-locking                      FALSE
+engine-condition-pushdown           TRUE
+event-scheduler                     OFF
+expire-logs-days                    0
+external-locking                    FALSE
+federated                           ON
+flush                               FALSE
+flush-time                          0
+ft-boolean-syntax                   + -><()~*:""&|
+ft-max-word-len                     84
+ft-min-word-len                     4
+ft-query-expansion-limit            20
+ft-stopword-file                    (No default value)
+gdb                                 FALSE
+general-log                         FALSE
+group-concat-max-len                1024
+help                                TRUE
+ignore-builtin-innodb               FALSE
+init-connect                        
+init-file                           (No default value)
+init-rpl-role                       MASTER
+init-slave                          
+interactive-timeout                 28800
+join-buffer-size                    131072
+keep-files-on-create                FALSE
+key-buffer-size                     8388608
+key-cache-age-threshold             300
+key-cache-block-size                1024
+key-cache-division-limit            100
+language                            MYSQL_SHAREDIR/
+large-pages                         FALSE
+lc-messages                         en_US
+lc-messages-dir                     MYSQL_SHAREDIR/
+lc-time-names                       en_US
+local-infile                        TRUE
+log-bin                             (No default value)
+log-bin-index                       (No default value)
+log-bin-trust-function-creators     FALSE
+log-error                           
+log-isam                            myisam.log
+log-output                          FILE
+log-queries-not-using-indexes       FALSE
+log-short-format                    FALSE
+log-slave-updates                   FALSE
+log-slow-admin-statements           FALSE
+log-slow-slave-statements           FALSE
+log-tc                              tc.log
+log-tc-size                         24576
+log-update                          (No default value)
+log-warnings                        1
+long-query-time                     10
+low-priority-updates                FALSE
+lower-case-table-names              1
+master-info-file                    master.info
+master-retry-count                  86400
+max-allowed-packet                  1048576
+max-binlog-cache-size               18446744073709547520
+max-binlog-dump-events              0
+max-binlog-size                     1073741824
+max-connect-errors                  10
+max-connections                     151
+max-delayed-threads                 20
+max-error-count                     64
+max-heap-table-size                 16777216
+max-join-size                       18446744073709551615
+max-length-for-sort-data            1024
+max-prepared-stmt-count             16382
+max-relay-log-size                  0
+max-seeks-for-key                   18446744073709551615
+max-sort-length                     1024
+max-sp-recursion-depth              0
+max-tmp-tables                      32
+max-user-connections                0
+max-write-lock-count                18446744073709551615
+memlock                             FALSE
+min-examined-row-limit              0
+multi-range-count                   256
+myisam-block-size                   1024
+myisam-data-pointer-size            6
+myisam-max-sort-file-size           9223372036853727232
+myisam-mmap-size                    18446744073709551615
+myisam-recover-options              OFF
+myisam-repair-threads               1
+myisam-sort-buffer-size             8388608
+myisam-stats-method                 nulls_unequal
+myisam-use-mmap                     FALSE
+net-buffer-length                   16384
+net-read-timeout                    30
+net-retry-count                     10
+net-write-timeout                   60
+new                                 FALSE
+old                                 FALSE
+old-alter-table                     FALSE
+old-passwords                       FALSE
+old-style-user-limits               FALSE
+optimizer-prune-level               1
+optimizer-search-depth              62
+optimizer-switch                    index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on
+partition                           ON
+plugin-dir                          MYSQL_LIBDIR/mysql/plugin
+plugin-load                         (No default value)
+port                                3306
+port-open-timeout                   0
+preload-buffer-size                 32768
+profiling-history-size              15
+query-alloc-block-size              8192
+query-cache-limit                   1048576
+query-cache-min-res-unit            4096
+query-cache-size                    0
+query-cache-type                    ON
+query-cache-wlock-invalidate        FALSE
+query-prealloc-size                 8192
+range-alloc-block-size              4096
+read-buffer-size                    131072
+read-only                           FALSE
+read-rnd-buffer-size                262144
+record-buffer                       131072
+relay-log                           (No default value)
+relay-log-index                     (No default value)
+relay-log-info-file                 relay-log.info
+relay-log-purge                     TRUE
+relay-log-recovery                  FALSE
+relay-log-space-limit               0
+replicate-same-server-id            FALSE
+report-host                         (No default value)
+report-password                     (No default value)
+report-port                         3306
+report-user                         (No default value)
+rpl-recovery-rank                   0
+safe-user-create                    FALSE
+secure-auth                         FALSE
+secure-file-priv                    (No default value)
+server-id                           0
+show-slave-auth-info                FALSE
+skip-grant-tables                   TRUE
+skip-networking                     FALSE
+skip-show-database                  FALSE
+skip-slave-start                    FALSE
+slave-compressed-protocol           FALSE
+slave-exec-mode                     STRICT
+slave-load-tmpdir                   MYSQLTEST_VARDIR/tmp/
+slave-net-timeout                   3600
+slave-skip-errors                   (No default value)
+slave-transaction-retries           10
+slow-launch-time                    2
+slow-query-log                      FALSE
+socket                              /tmp/mysql.sock
+sort-buffer-size                    2097152
+sporadic-binlog-dump-fail           FALSE
+sql-mode                            
+symbolic-links                      FALSE
+sync-binlog                         0
+sync-frm                            TRUE
+sync-master-info                    0
+sync-relay-log                      0
+sync-relay-log-info                 0
+sysdate-is-now                      FALSE
+table-cache                         400
+table-definition-cache              400
+table-lock-wait-timeout             50
+table-open-cache                    400
+tc-heuristic-recover                COMMIT
+thread-cache-size                   0
+thread-handling                     one-thread-per-connection
+thread-stack                        262144
+time-format                         %H:%i:%s
+timed-mutexes                       FALSE
+tmp-table-size                      16777216
+tmpdir                              MYSQLTEST_VARDIR/tmp/
+transaction-alloc-block-size        8192
+transaction-isolation               REPEATABLE-READ
+transaction-prealloc-size           4096
+updatable-views-with-limit          YES
+use-symbolic-links                  FALSE
+verbose                             TRUE
+wait-timeout                        28800
+warnings                            1
+
+To see what values a running MySQL server is using, type
+'mysqladmin variables' instead of 'mysqld --verbose --help'.
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
new file mode 100644
index 00000000000..b42cb522c41
--- /dev/null
+++ b/mysql-test/r/mysqld--help-win.result
@@ -0,0 +1,944 @@
+The following options may be given as the first argument:
+--print-defaults	Print the program argument list and exit
+--no-defaults		Don't read default options from any options file
+--defaults-file=#	Only read default options from the given file #
+--defaults-extra-file=# Read this file after the global files are read
+
+  --abort-slave-event-count=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --allow-suspicious-udfs 
+                      Allows use of UDFs consisting of only one symbol xxx()
+                      without corresponding xxx_init() or xxx_deinit(). That
+                      also means that one can load any function from any
+                      library, for example exit() from libc.so
+  -a, --ansi          Use ANSI SQL syntax instead of MySQL syntax. This mode
+                      will also set transaction isolation level 'serializable'.
+  --archive[=name]    Enable or disable ARCHIVE plugin. Possible values are ON,
+                      OFF, FORCE (don't start if the plugin fails to load).
+  --auto-increment-increment[=#] 
+                      Auto-increment columns are incremented by this
+  --auto-increment-offset[=#] 
+                      Offset added to Auto-increment columns. Used when
+                      auto-increment-increment != 1
+  --automatic-sp-privileges 
+                      Creating and dropping stored procedures alters ACLs
+                      (Defaults to on; use --skip-automatic-sp-privileges to disable.)
+  --back-log=#        The number of outstanding connection requests MySQL can
+                      have. This comes into play when the main MySQL thread
+                      gets very many connection requests in a very short time
+  -b, --basedir=name  Path to installation directory. All paths are usually
+                      resolved relative to this
+  --big-tables        Allow big result sets by saving all temporary sets on
+                      file (Solves most 'table full' errors)
+  --bind-address=name IP address to bind to.
+  --binlog-cache-size=# 
+                      The size of the cache to hold the SQL statements for the
+                      binary log during a transaction. If you often use big,
+                      multi-statement transactions you can increase this to get
+                      more performance
+  --binlog-do-db=name Tells the master it should log updates for the specified
+                      database, and exclude all others not explicitly
+                      mentioned.
+  --binlog-format=name 
+                      What form of binary logging the master will use: either
+                      ROW for row-based binary logging, STATEMENT for
+                      statement-based binary logging, or MIXED. MIXED is
+                      statement-based binary logging except for those
+                      statements where only row-based is correct: those which
+                      involve user-defined functions (i.e. UDFs) or the UUID()
+                      function; for those, row-based binary logging is
+                      automatically used. If NDBCLUSTER is enabled and
+                      binlog-format is MIXED, the format switches to row-based
+                      and back implicitly per each query accessing an
+                      NDBCLUSTER table
+  --binlog-ignore-db=name 
+                      Tells the master that updates to the given database
+                      should not be logged tothe binary log.
+  --binlog-row-event-max-size=# 
+                      The maximum size of a row-based binary log event in
+                      bytes. Rows will be grouped into events smaller than this
+                      size if possible. The value has to be a multiple of 256.
+  --blackhole[=name]  Enable or disable BLACKHOLE plugin. Possible values are
+                      ON, OFF, FORCE (don't start if the plugin fails to load).
+  --bootstrap         Used by mysql installation scripts.
+  --bulk-insert-buffer-size=# 
+                      Size of tree cache used in bulk insert optimisation. Note
+                      that this is a limit per thread!
+  --character-set-client-handshake 
+                      Don't ignore client side character set value sent during
+                      handshake.
+                      (Defaults to on; use --skip-character-set-client-handshake to disable.)
+  --character-set-filesystem=name 
+                      Set the filesystem character set.
+  -C, --character-set-server=name 
+                      Set the default character set.
+  --character-sets-dir=name 
+                      Directory where character sets are
+  -r, --chroot=name   Chroot mysqld daemon during startup.
+  --collation-server=name 
+                      Set the default collation.
+  --completion-type=name 
+                      The transaction completion type, one of NO_CHAIN, CHAIN,
+                      RELEASE
+  --concurrent-insert[=name] 
+                      Use concurrent insert with MyISAM. Possible values are
+                      NEVER, AUTO, ALWAYS
+  --connect-timeout=# The number of seconds the mysqld server is waiting for a
+                      connect packet before responding with 'Bad handshake'
+  --console           Write error output on screen; Don't remove the console
+                      window on windows.
+  --core-file         Write core on errors.
+  -h, --datadir=name  Path to the database root directory
+  --date-format=name  The DATE format (ignored)
+  --datetime-format=name 
+                      The DATETIME format (ignored)
+  -C, --default-character-set=name 
+                      Set the default character set (deprecated option, use
+                      --character-set-server instead).
+  --default-collation=name 
+                      Set the default collation (deprecated option, use
+                      --collation-server instead).
+  --default-storage-engine=name 
+                      The default storage engine for new tables
+  --default-time-zone=name 
+                      Set the default time zone.
+  --default-week-format=# 
+                      The default week format used by WEEK() functions
+  --delay-key-write[=name] 
+                      Type of DELAY_KEY_WRITE
+  --delay-key-write-for-all-tables 
+                      Don't flush key buffers between writes for any MyISAM
+                      table (Deprecated option, use --delay-key-write=all
+                      instead).
+  --delayed-insert-limit=# 
+                      After inserting delayed_insert_limit rows, the INSERT
+                      DELAYED handler will check if there are any SELECT
+                      statements pending. If so, it allows these to execute
+                      before continuing
+  --delayed-insert-timeout=# 
+                      How long a INSERT DELAYED thread should wait for INSERT
+                      statements before terminating
+  --delayed-queue-size=# 
+                      What size queue (in rows) should be allocated for
+                      handling INSERT DELAYED. If the queue becomes full, any
+                      client that does INSERT DELAYED will wait until there is
+                      room in the queue again
+  --disconnect-slave-event-count=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --div-precision-increment=# 
+                      Precision of the result of '/' operator will be increased
+                      on that value
+  --enable-locking    Deprecated option, use --external-locking instead.
+  --engine-condition-pushdown 
+                      Push supported query conditions to the storage engine
+                      (Defaults to on; use --skip-engine-condition-pushdown to disable.)
+  --event-scheduler[=name] 
+                      Enable the event scheduler. Possible values are ON, OFF,
+                      and DISABLED (keep the event scheduler completely
+                      deactivated, it cannot be activated run-time)
+  -T, --exit-info[=#] Used for debugging;  Use at your own risk!
+  --expire-logs-days=# 
+                      If non-zero, binary logs will be purged after
+                      expire_logs_days days; possible purges happen at startup
+                      and at binary log rotation
+  --external-locking  Use system (external) locking (disabled by default). 
+                      With this option enabled you can run myisamchk to test
+                      (not repair) tables while the MySQL server is running.
+                      Disable with --skip-external-locking.
+  --federated[=name]  Enable or disable FEDERATED plugin. Possible values are
+                      ON, OFF, FORCE (don't start if the plugin fails to load).
+  --flush             Flush MyISAM tables to disk between SQL commands
+  --flush-time=#      A dedicated thread is created to flush all tables at the
+                      given interval
+  --ft-boolean-syntax=name 
+                      List of operators for MATCH ... AGAINST ( ... IN BOOLEAN
+                      MODE)
+  --ft-max-word-len=# The maximum length of the word to be included in a
+                      FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+                      after changing this variable
+  --ft-min-word-len=# The minimum length of the word to be included in a
+                      FULLTEXT index. Note: FULLTEXT indexes must be rebuilt
+                      after changing this variable
+  --ft-query-expansion-limit=# 
+                      Number of best matches to use for query expansion
+  --ft-stopword-file=name 
+                      Use stopwords from this file instead of built-in list
+  --gdb               Set up signals usable for debugging
+  --general-log       Log connections and queries to a table or log file.
+                      Defaults logging to a file hostname.log or a table
+                      mysql.general_logif --log-output=TABLE is used
+  --general-log-file=name 
+                      Log connections and queries to given file
+  --group-concat-max-len=# 
+                      The maximum length of the result of function 
+                      GROUP_CONCAT()
+  -?, --help          Display this help and exit.
+  --ignore-builtin-innodb 
+                      Disable initialization of builtin InnoDB plugin
+  --init-connect=name Command(s) that are executed for each new connection
+  --init-file=name    Read SQL commands from this file at startup
+  --init-rpl-role=name 
+                      Set the replication role.
+  --init-slave=name   Command(s) that are executed by a slave server each time
+                      the SQL thread starts
+  --interactive-timeout=# 
+                      The number of seconds the server waits for activity on an
+                      interactive connection before closing it
+  --join-buffer-size=# 
+                      The size of the buffer that is used for full joins
+  --keep-files-on-create 
+                      Don't overwrite stale .MYD and .MYI even if no directory
+                      is specified
+  --key-buffer-size=# The size of the buffer used for index blocks for MyISAM
+                      tables. Increase this to get better index handling (for
+                      all reads and multiple writes) to as much as you can
+                      afford
+  --key-cache-age-threshold=# 
+                      This characterizes the number of hits a hot block has to
+                      be untouched until it is considered aged enough to be
+                      downgraded to a warm block. This specifies the percentage
+                      ratio of that number of hits to the total number of
+                      blocks in key cache
+  --key-cache-block-size=# 
+                      The default size of key cache blocks
+  --key-cache-division-limit=# 
+                      The minimum percentage of warm blocks in key cache
+  -L, --language=name Client error messages in given language. May be given as
+                      a full path. Deprecated. Use --lc-messages-dir instead.
+  --lc-messages=name  Set the language used for the error messages.
+  -L, --lc-messages-dir=name 
+                      Directory where error messages are
+  --lc-time-names=name 
+                      Set the language used for the month names and the days of
+                      the week.
+  --local-infile      Enable LOAD DATA LOCAL INFILE
+                      (Defaults to on; use --skip-local-infile to disable.)
+  -l, --log[=name]    Log connections and queries to file (deprecated option,
+                      use --general-log/--general-log-file instead).
+  --log-bin[=name]    Log update queries in binary format. Optional (but
+                      strongly recommended to avoid replication problems if
+                      server's hostname changes) argument should be the chosen
+                      location for the binary log files.
+  --log-bin-index=name 
+                      File that holds the names for last binary log files.
+  --log-bin-trust-function-creators 
+                      If set to FALSE (the default), then when --log-bin is
+                      used, creation of a stored function (or trigger) is
+                      allowed only to users having the SUPER privilege and only
+                      if this stored function (trigger) may not break binary
+                      logging. Note that if ALL connections to this server
+                      ALWAYS use row-based binary logging, the security issues
+                      do not exist and the binary logging cannot break, so you
+                      can safely set this to TRUE
+  --log-error[=name]  Error log file
+  --log-isam[=name]   Log all MyISAM changes to file.
+  -0, --log-long-format 
+                      Log some extra information to update log. Please note
+                      that this option is deprecated; see --log-short-format
+                      option.
+  --log-output=name   Syntax: log-output=value[,value...], where "value" could
+                      be TABLE, FILE or NONE
+  --log-queries-not-using-indexes 
+                      Log queries that are executed without benefit of any
+                      index to the slow log if it is open
+  --log-short-format  Don't log extra information to update and slow-query
+                      logs.
+  --log-slave-updates Tells the slave to log the updates from the slave thread
+                      to the binary log. You will need to turn it on if you
+                      plan to daisy-chain the slaves
+  --log-slow-admin-statements 
+                      Log slow OPTIMIZE, ANALYZE, ALTER and other
+                      administrative statements to the slow log if it is open.
+  --log-slow-queries[=name] 
+                      Log slow queries to a table or log file. Defaults logging
+                      to table mysql.slow_log or hostname-slow.log if
+                      --log-output=file is used. Must be enabled to activate
+                      other slow log options. Deprecated option, use
+                      --slow-query-log/--slow-query-log-file instead.
+  --log-slow-slave-statements 
+                      Log slow statements executed by slave thread to the slow
+                      log if it is open.
+  --log-tc=name       Path to transaction coordinator log (used for
+                      transactions that affect more than one storage engine,
+                      when binary log is disabled)
+  --log-tc-size=#     Size of transaction coordinator log.
+  --log-update[=name] The update log is deprecated since version 5.0, is
+                      replaced by the binary log and this option justs turns on
+                      --log-bin instead.
+  -W, --log-warnings[=#] 
+                      Log some not critical warnings to the log file
+  --long-query-time=# Log all queries that have taken more than long_query_time
+                      seconds to execute to file. The argument will be treated
+                      as a decimal value with microsecond precision
+  --low-priority-updates 
+                      INSERT/DELETE/UPDATE has lower priority than selects
+  --lower-case-table-names[=#] 
+                      If set to 1 table names are stored in lowercase on disk
+                      and table names will be case-insensitive.  Should be set
+                      to 2 if you are using a case insensitive file system
+  --master-info-file=name 
+                      The location and name of the file that remembers the
+                      master and where the I/O replication thread is in the
+                      master's binlogs.
+  --master-retry-count=# 
+                      The number of tries the slave will make to connect to the
+                      master before giving up.
+  --max-allowed-packet=# 
+                      Max packet length to send to or receive from the server
+  --max-binlog-cache-size=# 
+                      Can be used to restrict the total size used to cache a
+                      multi-transaction query
+  --max-binlog-dump-events=# 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --max-binlog-size=# Binary log will be rotated automatically when the size
+                      exceeds this value. Will also apply to relay logs if
+                      max_relay_log_size is 0
+  --max-connect-errors=# 
+                      If there is more than this number of interrupted
+                      connections from a host this host will be blocked from
+                      further connections
+  --max-connections=# The number of simultaneous clients allowed
+  --max-delayed-threads=# 
+                      Don't start more than this number of threads to handle
+                      INSERT DELAYED statements. If set to zero INSERT DELAYED
+                      will be not used
+  --max-error-count=# Max number of errors/warnings to store for a statement
+  --max-heap-table-size=# 
+                      Don't allow creation of heap tables bigger than this
+  --max-join-size=#   Joins that are probably going to read more than
+                      max_join_size records return an error
+  --max-length-for-sort-data=# 
+                      Max number of bytes in sorted records
+  --max-prepared-stmt-count=# 
+                      Maximum number of prepared statements in the server
+  --max-relay-log-size=# 
+                      If non-zero: relay log will be rotated automatically when
+                      the size exceeds this value; if zero: when the size
+                      exceeds max_binlog_size
+  --max-seeks-for-key=# 
+                      Limit assumed max number of seeks when looking up rows
+                      based on a key
+  --max-sort-length=# The number of bytes to use when sorting BLOB or TEXT
+                      values (only the first max_sort_length bytes of each
+                      value are used; the rest are ignored)
+  --max-sp-recursion-depth[=#] 
+                      Maximum stored procedure recursion depth
+  --max-tmp-tables=#  Maximum number of temporary tables a client can keep open
+                      at a time
+  --max-user-connections=# 
+                      The maximum number of active connections for a single
+                      user (0 = no limit)
+  --max-write-lock-count=# 
+                      After this many write locks, allow some read locks to run
+                      in between
+  --memlock           Lock mysqld in memory.
+  --min-examined-row-limit=# 
+                      Don't write queries to slow log that examine fewer rows
+                      than that
+  --multi-range-count=# 
+                      Number of key ranges to request at once
+  --myisam-block-size=# 
+                      Block size to be used for MyISAM index pages
+  --myisam-data-pointer-size=# 
+                      Default pointer size to be used for MyISAM tables
+  --myisam-max-sort-file-size=# 
+                      Don't use the fast sort index method to created index if
+                      the temporary file would get bigger than this
+  --myisam-mmap-size=# 
+                      Restricts the total memory used for memory mapping of
+                      MySQL tables
+  --myisam-recover-options[=name] 
+                      Syntax: myisam-recover-options[=option[,option...]],
+                      where option can be DEFAULT, BACKUP, FORCE, QUICK, or OFF
+  --myisam-repair-threads=# 
+                      If larger than 1, when repairing a MyISAM table all
+                      indexes will be created in parallel, with one thread per
+                      index. The value of 1 disables parallel repair
+  --myisam-sort-buffer-size=# 
+                      The buffer that is allocated when sorting the index when
+                      doing a REPAIR or when creating indexes with CREATE INDEX
+                      or ALTER TABLE
+  --myisam-stats-method=name 
+                      Specifies how MyISAM index statistics collection code
+                      should treat NULLs. Possible values of name are
+                      NULLS_UNEQUAL (default behavior for 4.1 and later),
+                      NULLS_EQUAL (emulate 4.0 behavior), and NULLS_IGNORED
+  --myisam-use-mmap   Use memory mapping for reading and writing MyISAM tables
+  --named-pipe        Enable the named pipe (NT)
+  --net-buffer-length=# 
+                      Buffer length for TCP/IP and socket communication
+  --net-read-timeout=# 
+                      Number of seconds to wait for more data from a connection
+                      before aborting the read
+  --net-retry-count=# If a read on a communication port is interrupted, retry
+                      this many times before giving up
+  --net-write-timeout=# 
+                      Number of seconds to wait for a block to be written to a
+                      connection before aborting the write
+  -n, --new           Use very new possible "unsafe" functions
+  --old               Use compatible behavior
+  --old-alter-table   Use old, non-optimized alter table
+  --old-passwords     Use old password encryption method (needed for 4.0 and
+                      older clients)
+  --old-style-user-limits 
+                      Enable old-style user limits (before 5.0.3 user resources
+                      were counted per each user+host vs. per account)
+  --one-thread        (deprecated): Only use one thread (for debugging under
+                      Linux). Use thread-handling=no-threads instead
+  --open-files-limit=# 
+                      If this is not 0, then mysqld will use this value to
+                      reserve file descriptors to use with setrlimit(). If this
+                      value is 0 then mysqld will reserve max_connections*5 or
+                      max_connections + table_cache*2 (whichever is larger)
+                      number of file descriptors
+  --optimizer-prune-level=# 
+                      Controls the heuristic(s) applied during query
+                      optimization to prune less-promising partial plans from
+                      the optimizer search space. Meaning: 0 - do not apply any
+                      heuristic, thus perform exhaustive search; 1 - prune
+                      plans based on number of retrieved rows
+  --optimizer-search-depth=# 
+                      Maximum depth of search performed by the query optimizer.
+                      Values larger than the number of relations in a query
+                      result in better query plans, but take longer to compile
+                      a query. Values smaller than the number of tables in a
+                      relation result in faster optimization, but may produce
+                      very bad query plans. If set to 0, the system will
+                      automatically pick a reasonable value; if set to 63, the
+                      optimizer will switch to the original find_best
+                      search(used for testing/comparison)
+  --optimizer-switch=name 
+                      optimizer_switch=option=val[,option=val...], where option
+                      is one of {index_merge, index_merge_union,
+                      index_merge_sort_union, index_merge_intersection} and val
+                      is one of {on, off, default}
+  --partition[=name]  Enable or disable partition plugin. Possible values are
+                      ON, OFF, FORCE (don't start if the plugin fails to load).
+  --pid-file=name     Pid file used by safe_mysqld
+  --plugin-dir=name   Directory for plugins
+  --plugin-load=name  Optional semicolon-separated list of plugins to load,
+                      where each plugin is identified as name=library, where
+                      name is the plugin name and library is the plugin library
+                      in plugin_dir.
+  -P, --port=#        Port number to use for connection or 0 to default to,
+                      my.cnf, $MYSQL_TCP_PORT, /etc/services, built-in default
+                      (3306), whatever comes first
+  --port-open-timeout=# 
+                      Maximum time in seconds to wait for the port to become
+                      free. (Default: no wait)
+  --preload-buffer-size=# 
+                      The size of the buffer that is allocated when preloading
+                      indexes
+  --profiling-history-size=# 
+                      Limit of query profiling memory
+  --query-alloc-block-size=# 
+                      Allocation block size for query parsing and execution
+  --query-cache-limit=# 
+                      Don't cache results that are bigger than this
+  --query-cache-min-res-unit=# 
+                      The minimum size for blocks allocated by the query cache
+  --query-cache-size=# 
+                      The memory allocated to store results from old queries
+  --query-cache-type=name 
+                      OFF = Don't cache or retrieve results. ON = Cache all
+                      results except SELECT SQL_NO_CACHE ... queries. DEMAND =
+                      Cache only SELECT SQL_CACHE ... queries
+  --query-cache-wlock-invalidate 
+                      Invalidate queries in query cache on LOCK for write
+  --query-prealloc-size=# 
+                      Persistent buffer for query parsing and execution
+  --range-alloc-block-size=# 
+                      Allocation block size for storing ranges during
+                      optimization
+  --read-buffer-size=# 
+                      Each thread that does a sequential scan allocates a
+                      buffer of this size for each table it scans. If you do
+                      many sequential scans, you may want to increase this
+                      value
+  --read-only         Make all non-temporary tables read-only, with the
+                      exception for replication (slave) threads and users with
+                      the SUPER privilege
+  --read-rnd-buffer-size=# 
+                      When reading rows in sorted order after a sort, the rows
+                      are read through this buffer to avoid a disk seeks. If
+                      not set, then it's set to the value of record_buffer
+  --record-buffer=#   Deprecated; use --read-buffer-size instead.
+  --relay-log=name    The location and name to use for relay logs
+  --relay-log-index=name 
+                      The location and name to use for the file that keeps a
+                      list of the last relay logs
+  --relay-log-info-file=name 
+                      The location and name of the file that remembers where
+                      the SQL replication thread is in the relay logs
+  --relay-log-purge   if disabled - do not purge relay logs. if enabled - purge
+                      them as soon as they are no more needed
+                      (Defaults to on; use --skip-relay-log-purge to disable.)
+  --relay-log-recovery 
+                      Enables automatic relay log recovery right after the
+                      database startup, which means that the IO Thread starts
+                      re-fetching from the master right after the last
+                      transaction processed
+  --relay-log-space-limit=# 
+                      Maximum space to use for all relay logs
+  --replicate-do-db=name 
+                      Tells the slave thread to restrict replication to the
+                      specified database. To specify more than one database,
+                      use the directive multiple times, once for each database.
+                      Note that this will only work if you do not use
+                      cross-database queries such as UPDATE some_db.some_table
+                      SET foo='bar' while having selected a different or no
+                      database. If you need cross database updates to work,
+                      make sure you have 3.23.28 or later, and use
+                      replicate-wild-do-table=db_name.%.
+  --replicate-do-table=name 
+                      Tells the slave thread to restrict replication to the
+                      specified table. To specify more than one table, use the
+                      directive multiple times, once for each table. This will
+                      work for cross-database updates, in contrast to
+                      replicate-do-db.
+  --replicate-ignore-db=name 
+                      Tells the slave thread to not replicate to the specified
+                      database. To specify more than one database to ignore,
+                      use the directive multiple times, once for each database.
+                      This option will not work if you use cross database
+                      updates. If you need cross database updates to work, make
+                      sure you have 3.23.28 or later, and use
+                      replicate-wild-ignore-table=db_name.%. 
+  --replicate-ignore-table=name 
+                      Tells the slave thread to not replicate to the specified
+                      table. To specify more than one table to ignore, use the
+                      directive multiple times, once for each table. This will
+                      work for cross-datbase updates, in contrast to
+                      replicate-ignore-db.
+  --replicate-rewrite-db=name 
+                      Updates to a database with a different name than the
+                      original. Example:
+                      replicate-rewrite-db=master_db_name->slave_db_name.
+  --replicate-same-server-id 
+                      In replication, if set to 1, do not skip events having
+                      our server id. Default value is 0 (to break infinite
+                      loops in circular replication). Can't be set to 1 if
+                      --log-slave-updates is used.
+  --replicate-wild-do-table=name 
+                      Tells the slave thread to restrict replication to the
+                      tables that match the specified wildcard pattern. To
+                      specify more than one table, use the directive multiple
+                      times, once for each table. This will work for
+                      cross-database updates. Example:
+                      replicate-wild-do-table=foo%.bar% will replicate only
+                      updates to tables in all databases that start with foo
+                      and whose table names start with bar.
+  --replicate-wild-ignore-table=name 
+                      Tells the slave thread to not replicate to the tables
+                      that match the given wildcard pattern. To specify more
+                      than one table to ignore, use the directive multiple
+                      times, once for each table. This will work for
+                      cross-database updates. Example:
+                      replicate-wild-ignore-table=foo%.bar% will not do updates
+                      to tables in databases that start with foo and whose
+                      table names start with bar.
+  --report-host=name  Hostname or IP of the slave to be reported to the master
+                      during slave registration. Will appear in the output of
+                      SHOW SLAVE HOSTS. Leave unset if you do not want the
+                      slave to register itself with the master. Note that it is
+                      not sufficient for the master to simply read the IP of
+                      the slave off the socket once the slave connects. Due to
+                      NAT and other routing issues, that IP may not be valid
+                      for connecting to the slave from the master or other
+                      hosts
+  --report-password=name 
+                      The account password of the slave to be reported to the
+                      master during slave registration
+  --report-port=#     Port for connecting to slave reported to the master
+                      during slave registration. Set it only if the slave is
+                      listening on a non-default port or if you have a special
+                      tunnel from the master or other clients to the slave. If
+                      not sure, leave this option unset
+  --report-user=name  The account user name of the slave to be reported to the
+                      master during slave registration
+  --rpl-recovery-rank=# 
+                      Unused, will be removed
+  --safe-mode         Skip some optimize stages (for testing).
+  --safe-show-database 
+                      Deprecated option; use GRANT SHOW DATABASES instead...
+  --safe-user-create  Don't allow new user creation by the user who has no
+                      write privileges to the mysql.user table.
+  --secure-auth       Disallow authentication for accounts that have old
+                      (pre-4.1) passwords
+  --secure-file-priv=name 
+                      Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to
+                      files within specified directory
+  --server-id=#       Uniquely identifies the server instance in the community
+                      of replication partners
+  -O, --set-variable=name 
+                      Change the value of a variable. Please note that this
+                      option is deprecated;you can set variables directly with
+                      --variable-name=value.
+  --shared-memory     Enable the shared memory
+  --shared-memory-base-name=name 
+                      Base name of shared memory
+  --show-slave-auth-info 
+                      Show user and password in SHOW SLAVE HOSTS on this master
+  --skip-grant-tables Start without grant tables. This gives all users FULL
+                      ACCESS to all tables!
+  --skip-host-cache   Don't cache host names.
+  --skip-locking      Deprecated option, use --skip-external-locking instead.
+  --skip-name-resolve Don't resolve hostnames. All hostnames are IP's or
+                      'localhost'.
+  --skip-networking   Don't allow connection with TCP/IP
+  --skip-new          Don't use new, possible wrong routines.
+  --skip-show-database 
+                      Don't allow 'SHOW DATABASE' commands
+  --skip-slave-start  If set, slave is not autostarted.
+  --skip-stack-trace  Don't print a stack trace on failure.
+  --skip-symlink      Don't allow symlinking of tables. Deprecated option.  Use
+                      --skip-symbolic-links instead.
+  --skip-thread-priority 
+                      Don't give threads different priorities. This option is
+                      deprecated because it has no effect; the implied behavior
+                      is already the default.
+  --slave-compressed-protocol 
+                      Use compression on master/slave protocol
+  --slave-exec-mode=name 
+                      Modes for how replication events should be executed.
+                      Legal values are STRICT (default) and IDEMPOTENT. In
+                      IDEMPOTENT mode, replication will not stop for operations
+                      that are idempotent. In STRICT mode, replication will
+                      stop on any unexpected difference between the master and
+                      the slave
+  --slave-load-tmpdir=name 
+                      The location where the slave should put its temporary
+                      files when replicating a LOAD DATA INFILE command
+  --slave-net-timeout=# 
+                      Number of seconds to wait for more data from a
+                      master/slave connection before aborting the read
+  --slave-skip-errors=name 
+                      Tells the slave thread to continue replication when a
+                      query event returns an error from the provided list
+  --slave-transaction-retries=# 
+                      Number of times the slave SQL thread will retry a
+                      transaction in case it failed with a deadlock or elapsed
+                      lock wait timeout, before giving up and stopping
+  --slow-launch-time=# 
+                      If creating the thread takes longer than this value (in
+                      seconds), the Slow_launch_threads counter will be
+                      incremented
+  --slow-query-log    Log slow queries to a table or log file. Defaults logging
+                      to a file hostname-slow.log or a table mysql.slow_log if
+                      --log-output=TABLE is used. Must be enabled to activate
+                      other slow log options
+  --slow-query-log-file=name 
+                      Log slow queries to given log file. Defaults logging to
+                      hostname-slow.log. Must be enabled to activate other slow
+                      log options
+  --socket=name       Socket file to use for connection
+  --sort-buffer-size=# 
+                      Each thread that needs to do a sort allocates a buffer of
+                      this size
+  --sporadic-binlog-dump-fail 
+                      Option used by mysql-test for debugging and testing of
+                      replication.
+  --sql-bin-update-same 
+                      The update log is deprecated since version 5.0, is
+                      replaced by the binary log and this option does nothing
+                      anymore.
+  --sql-mode=name     Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
+                      for the complete list of valid sql modes
+  --standalone        Dummy option to start as a standalone program (NT).
+  -s, --symbolic-links 
+                      Enable symbolic link support.
+  --sync-binlog=#     Synchronously flush binary log to disk after every #th
+                      event. Use 0 (default) to disable synchronous flushing
+  --sync-frm          Sync .frm files to disk on creation
+                      (Defaults to on; use --skip-sync-frm to disable.)
+  --sync-master-info=# 
+                      Synchronously flush master info to disk after every #th
+                      event. Use 0 (default) to disable synchronous flushing
+  --sync-relay-log=#  Synchronously flush relay log to disk after every #th
+                      event. Use 0 (default) to disable synchronous flushing
+  --sync-relay-log-info=# 
+                      Synchronously flush relay log info to disk after every
+                      #th transaction. Use 0 (default) to disable synchronous
+                      flushing
+  --sysdate-is-now    Non-default option to alias SYSDATE() to NOW() to make it
+                      safe-replicable. Since 5.0, SYSDATE() returns a `dynamic'
+                      value different for different invocations, even within
+                      the same statement.
+  --table-cache=#     Deprecated; use --table-open-cache instead.
+  --table-definition-cache=# 
+                      The number of cached table definitions
+  --table-lock-wait-timeout=# 
+                      Timeout in seconds to wait for a table level lock before
+                      returning an error. Used only if the connection has
+                      active cursors
+  --table-open-cache=# 
+                      The number of cached open tables
+  --tc-heuristic-recover=name 
+                      Decision to use in heuristic recover process. Possible
+                      values are COMMIT or ROLLBACK.
+  --thread-cache-size=# 
+                      How many threads we should keep in a cache for reuse
+  --thread-handling=name 
+                      Define threads usage for handling queries, one of
+                      one-thread-per-connection, no-threads
+  --thread-stack=#    The stack size for each thread
+  --time-format=name  The TIME format (ignored)
+  --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
+                      currently supported)
+  --tmp-table-size=#  If an internal in-memory temporary table exceeds this
+                      size, MySQL will automatically convert it to an on-disk
+                      MyISAM table
+  -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
+                      separated by a semicolon (;), in this case they are used
+                      in a round-robin fashion
+  --transaction-alloc-block-size=# 
+                      Allocation block size for transactions to be stored in
+                      binary log
+  --transaction-isolation=name 
+                      Default transaction isolation level.
+  --transaction-prealloc-size=# 
+                      Persistent buffer for transactions to be stored in binary
+                      log
+  --updatable-views-with-limit=name 
+                      YES = Don't issue an error message (warning only) if a
+                      VIEW without presence of a key of the underlying table is
+                      used in queries with a LIMIT clause for updating. NO =
+                      Prohibit update of a VIEW, which does not contain a key
+                      of the underlying table and the query uses a LIMIT clause
+                      (usually get from GUI tools)
+  -s, --use-symbolic-links 
+                      Enable symbolic link support. Deprecated option; use
+                      --symbolic-links instead.
+  -u, --user=name     Run mysqld daemon as user.
+  -v, --verbose       Used with --help option for detailed help
+  -V, --version       Output version information and exit.
+  --wait-timeout=#    The number of seconds the server waits for activity on a
+                      connection before closing it
+  -W, --warnings[=#]  Deprecated; use --log-warnings instead.
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE}  Value (after reading options)
+--------------------------------- ----------------------------------------
+abort-slave-event-count           0
+allow-suspicious-udfs             FALSE
+archive                           ON
+auto-increment-increment          1
+auto-increment-offset             1
+automatic-sp-privileges           TRUE
+back-log                          50
+big-tables                        FALSE
+bind-address                      (No default value)
+binlog-cache-size                 32768
+binlog-format                     STATEMENT
+binlog-row-event-max-size         1024
+blackhole                         ON
+bulk-insert-buffer-size           8388608
+character-set-client-handshake    TRUE
+character-set-filesystem          binary
+character-set-server              latin1
+character-sets-dir                MYSQL_CHARSETSDIR/
+chroot                            (No default value)
+collation-server                  latin1_swedish_ci
+completion-type                   NO_CHAIN
+concurrent-insert                 AUTO
+connect-timeout                   10
+console                           FALSE
+datadir                           MYSQLTEST_VARDIR/install.db/
+date-format                       %Y-%m-%d
+datetime-format                   %Y-%m-%d %H:%i:%s
+default-character-set             latin1
+default-collation                 latin1_swedish_ci
+default-storage-engine            MyISAM
+default-time-zone                 (No default value)
+default-week-format               0
+delay-key-write                   ON
+delayed-insert-limit              100
+delayed-insert-timeout            300
+delayed-queue-size                1000
+disconnect-slave-event-count      0
+div-precision-increment           4
+enable-locking                    FALSE
+engine-condition-pushdown         TRUE
+event-scheduler                   OFF
+expire-logs-days                  0
+external-locking                  FALSE
+federated                         ON
+flush                             FALSE
+flush-time                        1800
+ft-boolean-syntax                 + -><()~*:""&|
+ft-max-word-len                   84
+ft-min-word-len                   4
+ft-query-expansion-limit          20
+ft-stopword-file                  (No default value)
+gdb                               FALSE
+general-log                       FALSE
+group-concat-max-len              1024
+help                              TRUE
+ignore-builtin-innodb             FALSE
+init-connect                      
+init-file                         (No default value)
+init-rpl-role                     MASTER
+init-slave                        
+interactive-timeout               28800
+join-buffer-size                  131072
+keep-files-on-create              FALSE
+key-buffer-size                   8388608
+key-cache-age-threshold           300
+key-cache-block-size              1024
+key-cache-division-limit          100
+language                          MYSQL_SHAREDIR/
+lc-messages                       en_US
+lc-messages-dir                   MYSQL_SHAREDIR/
+lc-time-names                     en_US
+local-infile                      TRUE
+log-bin                           (No default value)
+log-bin-index                     (No default value)
+log-bin-trust-function-creators   FALSE
+log-error                         
+log-isam                          myisam.log
+log-output                        FILE
+log-queries-not-using-indexes     FALSE
+log-short-format                  FALSE
+log-slave-updates                 FALSE
+log-slow-admin-statements         FALSE
+log-slow-slave-statements         FALSE
+log-tc                            tc.log
+log-tc-size                       24576
+log-update                        (No default value)
+log-warnings                      1
+long-query-time                   10
+low-priority-updates              FALSE
+lower-case-table-names            1
+master-info-file                  master.info
+master-retry-count                86400
+max-allowed-packet                1048576
+max-binlog-cache-size             18446744073709547520
+max-binlog-dump-events            0
+max-binlog-size                   1073741824
+max-connect-errors                10
+max-connections                   151
+max-delayed-threads               20
+max-error-count                   64
+max-heap-table-size               16777216
+max-join-size                     18446744073709551615
+max-length-for-sort-data          1024
+max-prepared-stmt-count           16382
+max-relay-log-size                0
+max-seeks-for-key                 18446744073709551615
+max-sort-length                   1024
+max-sp-recursion-depth            0
+max-tmp-tables                    32
+max-user-connections              0
+max-write-lock-count              18446744073709551615
+memlock                           FALSE
+min-examined-row-limit            0
+multi-range-count                 256
+myisam-block-size                 1024
+myisam-data-pointer-size          6
+myisam-max-sort-file-size         9223372036853727232
+myisam-mmap-size                  18446744073709551615
+myisam-recover-options            OFF
+myisam-repair-threads             1
+myisam-sort-buffer-size           8388608
+myisam-stats-method               nulls_unequal
+myisam-use-mmap                   FALSE
+named-pipe                        FALSE
+net-buffer-length                 16384
+net-read-timeout                  30
+net-retry-count                   10
+net-write-timeout                 60
+new                               FALSE
+old                               FALSE
+old-alter-table                   FALSE
+old-passwords                     FALSE
+old-style-user-limits             FALSE
+optimizer-prune-level             1
+optimizer-search-depth            62
+optimizer-switch                  index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on
+partition                         ON
+plugin-dir                        MYSQL_LIBDIR/plugin
+plugin-load                       (No default value)
+port                              3306
+port-open-timeout                 0
+preload-buffer-size               32768
+profiling-history-size            15
+query-alloc-block-size            8192
+query-cache-limit                 1048576
+query-cache-min-res-unit          4096
+query-cache-size                  0
+query-cache-type                  ON
+query-cache-wlock-invalidate      FALSE
+query-prealloc-size               8192
+range-alloc-block-size            4096
+read-buffer-size                  131072
+read-only                         FALSE
+read-rnd-buffer-size              262144
+record-buffer                     131072
+relay-log                         (No default value)
+relay-log-index                   (No default value)
+relay-log-info-file               relay-log.info
+relay-log-purge                   TRUE
+relay-log-recovery                FALSE
+relay-log-space-limit             0
+replicate-same-server-id          FALSE
+report-host                       (No default value)
+report-password                   (No default value)
+report-port                       3306
+report-user                       (No default value)
+rpl-recovery-rank                 0
+safe-user-create                  FALSE
+secure-auth                       FALSE
+secure-file-priv                  (No default value)
+server-id                         0
+shared-memory                     FALSE
+shared-memory-base-name           MYSQL
+show-slave-auth-info              FALSE
+skip-grant-tables                 TRUE
+skip-networking                   FALSE
+skip-show-database                FALSE
+skip-slave-start                  FALSE
+slave-compressed-protocol         FALSE
+slave-exec-mode                   STRICT
+slave-load-tmpdir                 MYSQLTEST_VARDIR/tmp/
+slave-net-timeout                 3600
+slave-skip-errors                 (No default value)
+slave-transaction-retries         10
+slow-launch-time                  2
+slow-query-log                    FALSE
+socket                            MySQL
+sort-buffer-size                  2097152
+sporadic-binlog-dump-fail         FALSE
+sql-mode                          
+symbolic-links                    FALSE
+sync-binlog                       0
+sync-frm                          TRUE
+sync-master-info                  0
+sync-relay-log                    0
+sync-relay-log-info               0
+sysdate-is-now                    FALSE
+table-cache                       400
+table-definition-cache            400
+table-lock-wait-timeout           50
+table-open-cache                  400
+tc-heuristic-recover              COMMIT
+thread-cache-size                 0
+thread-handling                   one-thread-per-connection
+thread-stack                      262144
+time-format                       %H:%i:%s
+timed-mutexes                     FALSE
+tmp-table-size                    16777216
+tmpdir                            MYSQLTEST_VARDIR/tmp/
+transaction-alloc-block-size      8192
+transaction-isolation             REPEATABLE-READ
+transaction-prealloc-size         4096
+updatable-views-with-limit        YES
+use-symbolic-links                FALSE
+verbose                           TRUE
+wait-timeout                      28800
+warnings                          1
+
+To see what values a running MySQL server is using, type
+'mysqladmin variables' instead of 'mysqld --verbose --help'.
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 13d36fab2f1..4724a111837 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -55,7 +55,7 @@ CREATE TABLE `t1` (
   `a` double DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO `t1` VALUES (RES);
+INSERT INTO `t1` VALUES (-1.7976931348623157e308);
 DROP TABLE t1;
 #
 # Bug#3361 mysqldump quotes DECIMAL values inconsistently
diff --git a/mysql-test/r/not_partition.result b/mysql-test/r/not_partition.result
index 4ec37ab9fc7..fc3e0d64b5e 100644
--- a/mysql-test/r/not_partition.result
+++ b/mysql-test/r/not_partition.result
@@ -1,47 +1,47 @@
 DROP TABLE IF EXISTS t1;
 FLUSH TABLES;
 SELECT * FROM t1;
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
 TRUNCATE TABLE t1;
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
 ANALYZE TABLE t1;
 Table	Op	Msg_type	Msg_text
-test.t1	analyze	Error	Unknown table engine 'partition'
+test.t1	analyze	Error	Unknown storage engine 'partition'
 test.t1	analyze	error	Corrupt
 CHECK TABLE t1;
 Table	Op	Msg_type	Msg_text
-test.t1	check	Error	Unknown table engine 'partition'
+test.t1	check	Error	Unknown storage engine 'partition'
 test.t1	check	error	Corrupt
 OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	Error	Unknown table engine 'partition'
+test.t1	optimize	Error	Unknown storage engine 'partition'
 test.t1	optimize	error	Corrupt
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
-test.t1	repair	Error	Unknown table engine 'partition'
+test.t1	repair	Error	Unknown storage engine 'partition'
 test.t1	repair	error	Corrupt
 ALTER TABLE t1 REPAIR PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	repair	Error	Unknown table engine 'partition'
+test.t1	repair	Error	Unknown storage engine 'partition'
 test.t1	repair	error	Corrupt
 ALTER TABLE t1 CHECK PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	check	Error	Unknown table engine 'partition'
+test.t1	check	Error	Unknown storage engine 'partition'
 test.t1	check	error	Corrupt
 ALTER TABLE t1 OPTIMIZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	optimize	Error	Unknown table engine 'partition'
+test.t1	optimize	Error	Unknown storage engine 'partition'
 test.t1	optimize	error	Corrupt
 ALTER TABLE t1 ANALYZE PARTITION ALL;
 Table	Op	Msg_type	Msg_text
-test.t1	analyze	Error	Unknown table engine 'partition'
+test.t1	analyze	Error	Unknown storage engine 'partition'
 test.t1	analyze	error	Corrupt
 ALTER TABLE t1 REBUILD PARTITION ALL;
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
 ALTER TABLE t1 ENGINE Memory;
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
 ALTER TABLE t1 ADD (new INT);
-ERROR 42000: Unknown table engine 'partition'
+ERROR 42000: Unknown storage engine 'partition'
 DROP TABLE t1;
 CREATE TABLE t1 (
 firstname VARCHAR(25) NOT NULL,
@@ -52,9 +52,9 @@ joined DATE NOT NULL
 )
 PARTITION BY KEY(joined)
 PARTITIONS 6;
-Got one of the listed errors
+ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-plugin-partition' to have it working
 ALTER TABLE t1 PARTITION BY KEY(joined) PARTITIONS 2;
-Got one of the listed errors
+ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-plugin-partition' to have it working
 drop table t1;
 ERROR 42S02: Unknown table 't1'
 CREATE TABLE t1 (
@@ -71,7 +71,7 @@ PARTITION p2 VALUES LESS THAN (1980),
 PARTITION p3 VALUES LESS THAN (1990),
 PARTITION p4 VALUES LESS THAN MAXVALUE
 );
-Got one of the listed errors
+ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-plugin-partition' to have it working
 drop table t1;
 ERROR 42S02: Unknown table 't1'
 CREATE TABLE t1 (id INT, purchased DATE)
@@ -82,7 +82,7 @@ PARTITION p0 VALUES LESS THAN (1990),
 PARTITION p1 VALUES LESS THAN (2000),
 PARTITION p2 VALUES LESS THAN MAXVALUE
 );
-Got one of the listed errors
+ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-plugin-partition' to have it working
 drop table t1;
 ERROR 42S02: Unknown table 't1'
 create table t1 (a varchar(10) charset latin1 collate latin1_bin);
diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result
index 7e703de0876..467bb7c5cb8 100644
--- a/mysql-test/r/parser.result
+++ b/mysql-test/r/parser.result
@@ -522,7 +522,7 @@ select conv(255 AS p1, 10 AS p2, 16 AS p3);
 ERROR 42000: Incorrect parameters in the call to native function 'conv'
 select atan(10);
 atan(10)
-1.47112767430373
+1.4711276743037347
 select atan(10 AS p1);
 ERROR 42000: Incorrect parameters in the call to native function 'atan'
 select atan(10 p1);
@@ -533,7 +533,7 @@ select atan(10 "p1");
 ERROR 42000: Incorrect parameters in the call to native function 'atan'
 select atan(10, 20);
 atan(10, 20)
-0.463647609000806
+0.4636476090008061
 select atan(10 AS p1, 20);
 ERROR 42000: Incorrect parameters in the call to native function 'atan'
 select atan(10 p1, 20);
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 0435db628f4..b72cc607fe2 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -97,30 +97,30 @@ DROP TABLE t1;
 CREATE TABLE t1 (a INT)
 ENGINE=NonExistentEngine;
 Warnings:
-Warning	1286	Unknown table engine 'NonExistentEngine'
+Warning	1286	Unknown storage engine 'NonExistentEngine'
 Warning	1266	Using storage engine MyISAM for table 't1'
 DROP TABLE t1;
 CREATE TABLE t1 (a INT)
 ENGINE=NonExistentEngine
 PARTITION BY HASH (a);
 Warnings:
-Warning	1286	Unknown table engine 'NonExistentEngine'
+Warning	1286	Unknown storage engine 'NonExistentEngine'
 Warning	1266	Using storage engine MyISAM for table 't1'
 DROP TABLE t1;
 CREATE TABLE t1 (a INT)
 ENGINE=Memory;
 ALTER TABLE t1 ENGINE=NonExistentEngine;
 Warnings:
-Warning	1286	Unknown table engine 'NonExistentEngine'
+Warning	1286	Unknown storage engine 'NonExistentEngine'
 ALTER TABLE t1
 PARTITION BY HASH (a)
 (PARTITION p0 ENGINE=Memory,
 PARTITION p1 ENGINE=NonExistentEngine);
 Warnings:
-Warning	1286	Unknown table engine 'NonExistentEngine'
+Warning	1286	Unknown storage engine 'NonExistentEngine'
 ALTER TABLE t1 ENGINE=NonExistentEngine;
 Warnings:
-Warning	1286	Unknown table engine 'NonExistentEngine'
+Warning	1286	Unknown storage engine 'NonExistentEngine'
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/r/partition_innodb.result b/mysql-test/r/partition_innodb.result
index 702a1bf8797..d7145fcc604 100644
--- a/mysql-test/r/partition_innodb.result
+++ b/mysql-test/r/partition_innodb.result
@@ -196,7 +196,7 @@ create table t1 (a int)
 engine = x
 partition by key (a);
 Warnings:
-Warning	1286	Unknown table engine 'x'
+Warning	1286	Unknown storage engine 'x'
 Warning	1266	Using storage engine MyISAM for table 't1'
 show create table t1;
 Table	Create Table
@@ -211,7 +211,7 @@ partition by list (a)
 (partition p0 values in (0));
 alter table t1 engine = x;
 Warnings:
-Warning	1286	Unknown table engine 'x'
+Warning	1286	Unknown storage engine 'x'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
diff --git a/mysql-test/r/partition_key_cache.result b/mysql-test/r/partition_key_cache.result
index 7fbab34fa41..c5241c6ea90 100644
--- a/mysql-test/r/partition_key_cache.result
+++ b/mysql-test/r/partition_key_cache.result
@@ -5,9 +5,7 @@ SELECT @org_key_cache_buffer_size:= @@global.default.key_buffer_size;
 @org_key_cache_buffer_size:= @@global.default.key_buffer_size
 1048576
 # Minimize default key cache (almost disabled).
-SET @@global.default.key_buffer_size = 1;
-Warnings:
-Warning	1292	Truncated incorrect key_buffer_size value: '1'
+SET @@global.default.key_buffer_size = 4096;
 CREATE TABLE t1 (
 a INT,
 b INT,
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result
index 85fbd1353cc..0d5bc29fc8c 100644
--- a/mysql-test/r/plugin.result
+++ b/mysql-test/r/plugin.result
@@ -1,6 +1,6 @@
 CREATE TABLE t1(a int) ENGINE=EXAMPLE;
 Warnings:
-Warning	1286	Unknown table engine 'EXAMPLE'
+Warning	1286	Unknown storage engine 'EXAMPLE'
 Warning	1266	Using storage engine MyISAM for table 't1'
 DROP TABLE t1;
 INSTALL PLUGIN example SONAME 'ha_example.so';
@@ -34,7 +34,7 @@ INSTALL PLUGIN example SONAME 'ha_example.so';
 SET GLOBAL example_enum_var= e1;
 SET GLOBAL example_enum_var= e2;
 SET GLOBAL example_enum_var= impossible;
-ERROR 42000: Variable 'enum_var' can't be set to the value of 'impossible'
+ERROR 42000: Variable 'example_enum_var' can't be set to the value of 'impossible'
 UNINSTALL PLUGIN example;
 INSTALL PLUGIN example SONAME 'ha_example.so';
 select @@session.sql_mode into @old_sql_mode;
@@ -45,7 +45,7 @@ select @@global.example_ulong_var;
 500
 set global example_ulong_var=1111;
 Warnings:
-Warning	1292	Truncated incorrect ulong_var value: '1111'
+Warning	1292	Truncated incorrect example_ulong_var value: '1111'
 select @@global.example_ulong_var;
 @@global.example_ulong_var
 1000
@@ -55,7 +55,7 @@ select @@global.example_ulong_var;
 @@global.example_ulong_var
 500
 set global example_ulong_var=1111;
-ERROR 42000: Variable 'ulong_var' can't be set to the value of '1111'
+ERROR 42000: Variable 'example_ulong_var' can't be set to the value of '1111'
 select @@global.example_ulong_var;
 @@global.example_ulong_var
 500
diff --git a/mysql-test/r/profiling.result b/mysql-test/r/profiling.result
index f20c459d7dc..6292cd085e4 100644
--- a/mysql-test/r/profiling.result
+++ b/mysql-test/r/profiling.result
@@ -9,8 +9,6 @@ profiling_history_size	15
 select @@profiling;
 @@profiling
 0
-set global profiling = ON;
-ERROR HY000: Variable 'profiling' is a SESSION variable and can't be used with SET GLOBAL
 set @start_value= @@global.profiling_history_size;
 set global profiling_history_size=100;
 show global variables like 'profil%';
diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result
index c51863b73f7..4f9444c1542 100644
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/r/ps_2myisam.result
@@ -2585,10 +2585,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= '9223372036854775807' ;
@@ -2608,10 +2608,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= -9223372036854775808 ;
@@ -2631,10 +2631,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-9223372036854775808' ;
@@ -2654,10 +2654,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= 1.11111111111111111111e+50 ;
@@ -2679,10 +2679,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= '1.11111111111111111111e+50' ;
@@ -2704,10 +2704,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= -1.11111111111111111111e+50 ;
@@ -2729,10 +2729,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-1.11111111111111111111e+50' ;
@@ -2754,10 +2754,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 test_sequence
@@ -2822,10 +2822,10 @@ c1	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30
 51	5	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0
 52	5	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0
 53	5	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0
-54	5	54	54	54.00	54.00	54.00	54.00	54.00	54.00	54.00	54.00
-55	5	55	55	55	55	55	55	55	55	55	55
-56	6	56	56	56.00	56.00	56.00	56.00	56.00	56.00	56.00	56.00
-57	6	57	57	57.00	57.00	57.00	57.00	57.00	57.00	57.00	57.00
+54	5	54	54	54	54	54	54	54	54	54	54
+55	6	55	55	55	55	55	55	55	55	55	55
+56	6	56	56	56	56	56	56	56	56	56	56
+57	6	57	57	57	57	57	57	57	57	57	57
 60	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 61	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 62	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
@@ -3039,7 +3039,7 @@ c1	c13	c14	c15	c16	c17
 42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+51	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index 2670451f24e..772a7462342 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -2568,10 +2568,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= '9223372036854775807' ;
@@ -2591,10 +2591,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= -9223372036854775808 ;
@@ -2614,10 +2614,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-9223372036854775808' ;
@@ -2637,10 +2637,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= 1.11111111111111111111e+50 ;
@@ -2662,10 +2662,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= '1.11111111111111111111e+50' ;
@@ -2687,10 +2687,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= -1.11111111111111111111e+50 ;
@@ -2712,10 +2712,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-1.11111111111111111111e+50' ;
@@ -2737,10 +2737,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 test_sequence
@@ -2805,10 +2805,10 @@ c1	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30
 51	5	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0
 52	5	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0
 53	5	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0
-54	5	54	54	54.00	54.00	54.00	54.00	54.00	54.00	54.00	54.00
-55	5	55	55	55	55	55	55	55	55	55	55
-56	6	56	56	56.00	56.00	56.00	56.00	56.00	56.00	56.00	56.00
-57	6	57	57	57.00	57.00	57.00	57.00	57.00	57.00	57.00	57.00
+54	5	54	54	54	54	54	54	54	54	54	54
+55	6	55	55	55	55	55	55	55	55	55	55
+56	6	56	56	56	56	56	56	56	56	56	56
+57	6	57	57	57	57	57	57	57	57	57	57
 60	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 61	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 62	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
@@ -3022,7 +3022,7 @@ c1	c13	c14	c15	c16	c17
 42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+51	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index 4372c470b2d..84bf7a6fa00 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -2569,10 +2569,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= '9223372036854775807' ;
@@ -2592,10 +2592,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= -9223372036854775808 ;
@@ -2615,10 +2615,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-9223372036854775808' ;
@@ -2638,10 +2638,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= 1.11111111111111111111e+50 ;
@@ -2663,10 +2663,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= '1.11111111111111111111e+50' ;
@@ -2688,10 +2688,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= -1.11111111111111111111e+50 ;
@@ -2713,10 +2713,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-1.11111111111111111111e+50' ;
@@ -2738,10 +2738,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 test_sequence
@@ -2807,7 +2807,7 @@ c1	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30
 52	5	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0
 53	5	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0
 54	5	54	54	54	54	54	54	54	54	54	54
-55	5	55	55	55	55	55	55	55	55	55	55
+55	6	55	55	55	55	55	55	55	55	55	55
 56	6	56	56	56	56	56	56	56	56	56	56
 57	6	57	57	57	57	57	57	57	57	57	57
 60	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
@@ -3023,7 +3023,7 @@ c1	c13	c14	c15	c16	c17
 42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+51	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result
index 35a43f7c032..61d2822fd5b 100644
--- a/mysql-test/r/ps_5merge.result
+++ b/mysql-test/r/ps_5merge.result
@@ -2505,10 +2505,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= '9223372036854775807' ;
@@ -2528,10 +2528,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= -9223372036854775808 ;
@@ -2551,10 +2551,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-9223372036854775808' ;
@@ -2574,10 +2574,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= 1.11111111111111111111e+50 ;
@@ -2599,10 +2599,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= '1.11111111111111111111e+50' ;
@@ -2624,10 +2624,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= -1.11111111111111111111e+50 ;
@@ -2649,10 +2649,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-1.11111111111111111111e+50' ;
@@ -2674,10 +2674,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 test_sequence
@@ -2742,10 +2742,10 @@ c1	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30
 51	5	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0
 52	5	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0
 53	5	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0
-54	5	54	54	54.00	54.00	54.00	54.00	54.00	54.00	54.00	54.00
-55	5	55	55	55	55	55	55	55	55	55	55
-56	6	56	56	56.00	56.00	56.00	56.00	56.00	56.00	56.00	56.00
-57	6	57	57	57.00	57.00	57.00	57.00	57.00	57.00	57.00	57.00
+54	5	54	54	54	54	54	54	54	54	54	54
+55	6	55	55	55	55	55	55	55	55	55	55
+56	6	56	56	56	56	56	56	56	56	56	56
+57	6	57	57	57	57	57	57	57	57	57	57
 60	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 61	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 62	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
@@ -2959,7 +2959,7 @@ c1	c13	c14	c15	c16	c17
 42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+51	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
@@ -5527,10 +5527,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= '9223372036854775807' ;
@@ -5550,10 +5550,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	9.22337e+18
-c8	9.22337203685478e+18
-c9	9.22337203685478e+18
-c10	9.22337203685478e+18
+c7	9.22337e18
+c8	9.223372036854776e18
+c9	9.223372036854776e18
+c10	9.223372036854776e18
 c12	9999.9999
 execute my_delete ;
 set @arg00= -9223372036854775808 ;
@@ -5573,10 +5573,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-9223372036854775808' ;
@@ -5596,10 +5596,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-9.22337e+18
-c8	-9.22337203685478e+18
-c9	-9.22337203685478e+18
-c10	-9.22337203685478e+18
+c7	-9.22337e18
+c8	-9.223372036854776e18
+c9	-9.223372036854776e18
+c10	-9.223372036854776e18
 c12	-9999.9999
 execute my_delete ;
 set @arg00= 1.11111111111111111111e+50 ;
@@ -5621,10 +5621,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= '1.11111111111111111111e+50' ;
@@ -5646,10 +5646,10 @@ c3	8388607
 c4	2147483647
 c5	2147483647
 c6	9223372036854775807
-c7	3.40282e+38
-c8	1.11111111111111e+50
-c9	1.11111111111111e+50
-c10	1.11111111111111e+50
+c7	3.40282e38
+c8	1.111111111111111e50
+c9	1.111111111111111e50
+c10	1.111111111111111e50
 c12	9999.9999
 execute my_delete ;
 set @arg00= -1.11111111111111111111e+50 ;
@@ -5671,10 +5671,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 set @arg00= '-1.11111111111111111111e+50' ;
@@ -5696,10 +5696,10 @@ c3	-8388608
 c4	-2147483648
 c5	-2147483648
 c6	-9223372036854775808
-c7	-3.40282e+38
-c8	-1.11111111111111e+50
-c9	-1.11111111111111e+50
-c10	-1.11111111111111e+50
+c7	-3.40282e38
+c8	-1.111111111111111e50
+c9	-1.111111111111111e50
+c10	-1.111111111111111e50
 c12	-9999.9999
 execute my_delete ;
 test_sequence
@@ -5764,10 +5764,10 @@ c1	c20	c21	c22	c23	c24	c25	c26	c27	c28	c29	c30
 51	5	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0	51.0
 52	5	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0	52.0
 53	5	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0	53.0
-54	5	54	54	54.00	54.00	54.00	54.00	54.00	54.00	54.00	54.00
-55	5	55	55	55	55	55	55	55	55	55	55
-56	6	56	56	56.00	56.00	56.00	56.00	56.00	56.00	56.00	56.00
-57	6	57	57	57.00	57.00	57.00	57.00	57.00	57.00	57.00	57.00
+54	5	54	54	54	54	54	54	54	54	54	54
+55	6	55	55	55	55	55	55	55	55	55	55
+56	6	56	56	56	56	56	56	56	56	56	56
+57	6	57	57	57	57	57	57	57	57	57	57
 60	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 61	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 62	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
@@ -5981,7 +5981,7 @@ c1	c13	c14	c15	c16	c17
 42	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 43	0000-00-00	0000-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 50	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
-51	2010-00-00	2010-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
+51	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 52	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 53	2001-00-00	2001-00-00 00:00:00	0000-00-00 00:00:00	838:59:59	0000
 60	NULL	NULL	1991-01-01 01:01:01	NULL	NULL
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index 9cde630e4ed..eab0c51f974 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -508,6 +508,8 @@ AAA
 drop table t1;
 create table t1 (a int);
 set GLOBAL query_cache_size=1000;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '1000'
 show global variables like "query_cache_size";
 Variable_name	Value
 query_cache_size	0
@@ -1342,9 +1344,9 @@ set global query_cache_size=0;
 create table t1 (a int);
 insert into t1 values (1),(2),(3);
 set GLOBAL query_cache_type=1;
-set GLOBAL query_cache_limit=10000;
+set GLOBAL query_cache_limit=10240;
 set GLOBAL query_cache_min_res_unit=0;
-set GLOBAL query_cache_size= 100000;
+set GLOBAL query_cache_size= 102400;
 reset query cache;
 set LOCAL default_week_format = 0;
 select week('2007-01-04');
@@ -1434,7 +1436,7 @@ set GLOBAL query_cache_type=default;
 set GLOBAL query_cache_limit=default;
 set GLOBAL query_cache_min_res_unit=default;
 set GLOBAL query_cache_size= default;
-set GLOBAL query_cache_size=1000000;
+set GLOBAL query_cache_size=1024000;
 create table t1 (a char);
 insert into t1 values ('c');
 a
@@ -1562,7 +1564,7 @@ SET GLOBAL query_cache_size= default;
 #
 # Bug#25132 disabled query cache: Qcache_free_blocks = 1
 #
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 set global query_cache_size=0;
 set global query_cache_type=0;
 show status like 'Qcache_free_blocks';
@@ -1581,7 +1583,7 @@ CREATE TABLE t1 (c1 INT NOT NULL) ENGINE=MyISAM;
 INSERT INTO t1 (c1) VALUES (1), (2);
 SHOW GLOBAL VARIABLES LIKE 'concurrent_insert';
 Variable_name	Value
-concurrent_insert	0
+concurrent_insert	NEVER
 SHOW STATUS LIKE 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	0
diff --git a/mysql-test/r/query_cache_ps_no_prot.result b/mysql-test/r/query_cache_ps_no_prot.result
index f686e876a60..02e660450d1 100644
--- a/mysql-test/r/query_cache_ps_no_prot.result
+++ b/mysql-test/r/query_cache_ps_no_prot.result
@@ -1,7 +1,7 @@
 ---- establish connection con1 (root) ----
 ---- switch to connection default ----
 set @initial_query_cache_size = @@global.query_cache_size;
-set @@global.query_cache_size=100000;
+set @@global.query_cache_size=102400;
 flush status;
 drop table if exists t1;
 create table t1(c1 int);
@@ -211,7 +211,7 @@ show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	16
 ---- switch to connection default ----
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 execute stmt1;
 c1
 10
@@ -297,7 +297,7 @@ prepare stmt1 from "select * from t1 where c1=10";
 ---- switch to connection con1 ----
 prepare stmt3 from "select * from t1 where c1=10";
 ---- switch to connection default ----
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	21
@@ -344,7 +344,7 @@ Qcache_hits	21
 ---- switch to connection default ----
 set global query_cache_size=0;
 prepare stmt1 from "select * from t1 where c1=?";
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	21
@@ -548,7 +548,7 @@ alter table t1 add column b int;
 execute stmt;
 a
 Pack my box with five dozen liquor jugs.
-set @@global.query_cache_size=100000;
+set @@global.query_cache_size=102400;
 execute stmt;
 a
 Pack my box with five dozen liquor jugs.
diff --git a/mysql-test/r/query_cache_ps_ps_prot.result b/mysql-test/r/query_cache_ps_ps_prot.result
index e594161f2e9..2115ecc62ff 100644
--- a/mysql-test/r/query_cache_ps_ps_prot.result
+++ b/mysql-test/r/query_cache_ps_ps_prot.result
@@ -1,7 +1,7 @@
 ---- establish connection con1 (root) ----
 ---- switch to connection default ----
 set @initial_query_cache_size = @@global.query_cache_size;
-set @@global.query_cache_size=100000;
+set @@global.query_cache_size=102400;
 flush status;
 drop table if exists t1;
 create table t1(c1 int);
@@ -211,7 +211,7 @@ show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	14
 ---- switch to connection default ----
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 execute stmt1;
 c1
 10
@@ -297,7 +297,7 @@ prepare stmt1 from "select * from t1 where c1=10";
 ---- switch to connection con1 ----
 prepare stmt3 from "select * from t1 where c1=10";
 ---- switch to connection default ----
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	19
@@ -344,7 +344,7 @@ Qcache_hits	19
 ---- switch to connection default ----
 set global query_cache_size=0;
 prepare stmt1 from "select * from t1 where c1=?";
-set global query_cache_size=100000;
+set global query_cache_size=102400;
 show status like 'Qcache_hits';
 Variable_name	Value
 Qcache_hits	19
@@ -548,7 +548,7 @@ alter table t1 add column b int;
 execute stmt;
 a
 Pack my box with five dozen liquor jugs.
-set @@global.query_cache_size=100000;
+set @@global.query_cache_size=102400;
 execute stmt;
 a
 Pack my box with five dozen liquor jugs.
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index ff2dd49e725..41dd44fc4d0 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2784,26 +2784,26 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
 select max(key1) from t1 where key1 <= 0.6158;
 max(key1)
-0.615800023078918
+0.6158000230789185
 select max(key2) from t2 where key2 <= 1.6158;
 max(key2)
-1.61580002307892
+1.6158000230789185
 select min(key1) from t1 where key1 >= 0.3762;
 min(key1)
-0.376199990510941
+0.37619999051094055
 select min(key2) from t2 where key2 >= 1.3762;
 min(key2)
-1.37619996070862
+1.3761999607086182
 select max(key1), min(key2) from t1, t2
 where key1 <= 0.6158 and key2 >= 1.3762;
 max(key1)	min(key2)
-0.615800023078918	1.37619996070862
+0.6158000230789185	1.3761999607086182
 select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5;
 max(key1)
-0.615800023078918
+0.6158000230789185
 select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;
 min(key1)
-0.376199990510941
+0.37619999051094055
 DROP TABLE t1,t2;
 CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL);
 INSERT INTO t1 VALUES (10);
diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result
index feac9efcb13..5e5ef55477c 100644
--- a/mysql-test/r/select_safe.result
+++ b/mysql-test/r/select_safe.result
@@ -1,5 +1,5 @@
 drop table if exists t1;
-SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=4, SQL_MAX_JOIN_SIZE=9;
+SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=4, MAX_JOIN_SIZE=9;
 create table t1 (a int auto_increment primary key, b char(20));
 insert into t1 values(1,"test");
 SELECT SQL_BUFFER_RESULT * from t1;
@@ -90,4 +90,4 @@ set local  max_join_size=1;
 select * from (select 1 union select 2 union select 3) x;
 ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay
 drop table t1;
-SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, SQL_MAX_JOIN_SIZE=DEFAULT;
+SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, MAX_JOIN_SIZE=DEFAULT;
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index c6276f319a1..fc995d42fae 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -1298,13 +1298,13 @@ Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_par
 drop table `mysqlttest\1`.`a\b`;
 drop database `mysqlttest\1`;
 show engine foobar status;
-ERROR 42000: Unknown table engine 'foobar'
+ERROR 42000: Unknown storage engine 'foobar'
 show engine foobar logs;
-ERROR 42000: Unknown table engine 'foobar'
+ERROR 42000: Unknown storage engine 'foobar'
 show engine foobar mutex;
-ERROR 42000: Unknown table engine 'foobar'
+ERROR 42000: Unknown storage engine 'foobar'
 show engine mutex status;
-ERROR 42000: Unknown table engine 'mutex'
+ERROR 42000: Unknown storage engine 'mutex'
 show engine csv status;
 Type	Name	Status
 show engine csv logs;
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index ac118d0bab2..8f756a4c303 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -579,7 +579,7 @@ return 2.7182818284590452354|
 set @e = e()|
 select e(), @e|
 e()	@e
-2.71828182845905	2.71828182845905
+2.718281828459045	2.718281828459045
 drop function if exists inc|
 create function inc(i int) returns int
 return i+1|
@@ -616,23 +616,23 @@ create function fun(d double, i int, u int unsigned) returns double
 return mul(inc(i), fac(u)) / e()|
 select fun(2.3, 3, 5)|
 fun(2.3, 3, 5)
-176.582131762292
+176.58213176229233
 insert into t2 values (append("xxx", "yyy"), mul(4,3), e())|
 insert into t2 values (append("a", "b"), mul(2,mul(3,4)), fun(1.7, 4, 6))|
 select * from t2 where s = append("a", "b")|
 s	i	d
-ab	24	1324.36598821719
+ab	24	1324.3659882171924
 select * from t2 where i = mul(4,3) or i = mul(mul(3,4),2) order by i|
 s	i	d
-xxxyyy	12	2.71828182845905
-ab	24	1324.36598821719
+xxxyyy	12	2.718281828459045
+ab	24	1324.3659882171924
 select * from t2 where d = e()|
 s	i	d
-xxxyyy	12	2.71828182845905
+xxxyyy	12	2.718281828459045
 select * from t2 order by i|
 s	i	d
-xxxyyy	12	2.71828182845905
-ab	24	1324.36598821719
+xxxyyy	12	2.718281828459045
+ab	24	1324.3659882171924
 delete from t2|
 drop function e|
 drop function inc|
@@ -3030,7 +3030,7 @@ set @x = @x + 1;
 return @x;
 end|
 set @qcs1 = @@query_cache_size|
-set global query_cache_size = 100000|
+set global query_cache_size = 102400|
 set @x = 1|
 insert into t1 values ("qc", 42)|
 select bug9902() from t1|
@@ -5972,9 +5972,9 @@ CREATE TABLE t3 (f1 INT, f2 FLOAT)|
 INSERT INTO t3 VALUES (1, 3.4), (1, 2), (1, 0.9), (2, 8), (2, 7)|
 SELECT SUM(f2), bug25373(f1) FROM t3 GROUP BY bug25373(f1) WITH ROLLUP|
 SUM(f2)	bug25373(f1)
-6.30000007152557	1
+6.300000071525574	1
 15	2
-21.3000000715256	NULL
+21.300000071525574	NULL
 DROP FUNCTION bug25373|
 DROP TABLE t3|
 DROP DATABASE IF EXISTS mysqltest1|
@@ -6903,15 +6903,12 @@ DROP FUNCTION f1;
 
 drop procedure if exists p;
 set @old_mode= @@sql_mode;
-set @@sql_mode= pow(2,32)-1;
+set @@sql_mode= cast(pow(2,32)-1 as unsigned integer);
 select @@sql_mode into @full_mode;
 create procedure p() begin end;
 call p();
-select @@sql_mode;
-@@sql_mode
-REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,?,ONLY_FULL_GROUP_BY,NO_UNSIGNED_SUBTRACTION,NO_DIR_IN_CREATE,POSTGRESQL,ORACLE,MSSQL,DB2,MAXDB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS,MYSQL323,MYSQL40,ANSI,NO_AUTO_VALUE_ON_ZERO,NO_BACKSLASH_ESCAPES,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ALLOW_INVALID_DATES,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER,HIGH_NOT_PRECEDENCE,NO_ENGINE_SUBSTITUTION,PAD_CHAR_TO_FULL_LENGTH
 set @@sql_mode= @old_mode;
-select replace(@full_mode, '?', 'NOT_USED') into @full_mode;
+select replace(@full_mode, ',,,', ',NOT_USED,') into @full_mode;
 select replace(@full_mode, 'ALLOW_INVALID_DATES', 'INVALID_DATES') into @full_mode;
 select name from mysql.proc where name = 'p' and sql_mode = @full_mode;
 name
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result
index 897c9072203..bdb7576f95e 100644
--- a/mysql-test/r/strict.result
+++ b/mysql-test/r/strict.result
@@ -873,14 +873,14 @@ Warning	1264	Out of range value for column 'col2' at row 1
 SELECT * FROM t1;
 col1	col2
 -1.1e-37	0
-3.4e+38	3.4e+38
+3.4e38	3.4e38
 -1.1e-37	0
-3.4e+38	3.4e+38
+3.4e38	3.4e38
 0	NULL
 2	NULL
 NULL	NULL
-3.40282e+38	0
-3.40282e+38	0
+3.40282e38	0
+3.40282e38	0
 DROP TABLE t1;
 CREATE TABLE t1 (col1 DOUBLE PRECISION, col2 DOUBLE PRECISION UNSIGNED);
 INSERT INTO t1 VALUES (-2.2E-307,0),(2E-307,0),(+1.7E+308,+1.7E+308);
@@ -922,14 +922,14 @@ SELECT * FROM t1;
 col1	col2
 -2.2e-307	0
 1e-303	0
-NULL	1.7e+308
+NULL	1.7e308
 -2.2e-307	0
 -2e-307	0
-NULL	1.7e+308
+NULL	1.7e308
 0	NULL
 2	NULL
 NULL	NULL
-1.79769313486232e+308	0
+1.7976931348623157e308	0
 DROP TABLE t1;
 CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6));
 INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello   ', 'hello ');
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index ccea954c214..615ba21c811 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -3669,8 +3669,6 @@ CREATE TABLE t1 (a int, b int auto_increment, PRIMARY KEY (b));
 CREATE TABLE t2 (x int auto_increment, y int, z int,
 PRIMARY KEY (x), FOREIGN KEY (y) REFERENCES t1 (b));
 SET SESSION sort_buffer_size = 32 * 1024;
-Warnings:
-Warning	1292	Truncated incorrect sort_buffer_size value: '32768'
 SELECT SQL_NO_CACHE COUNT(*)
 FROM (SELECT  a, b, (SELECT x FROM t2 WHERE y=b ORDER BY z DESC LIMIT 1) c
 FROM t1) t;
diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result
index 67898b7f335..d131fa2b4d5 100644
--- a/mysql-test/r/type_decimal.result
+++ b/mysql-test/r/type_decimal.result
@@ -796,6 +796,18 @@ SELECT ROUND(qty,3), dps, ROUND(qty,dps) FROM t1;
 ROUND(qty,3)	dps	ROUND(qty,dps)
 1.133	3	1.133000
 DROP TABLE t1;
+create table t1 (c1 decimal(10,6));
+insert into t1 (c1) values (9.99e-4);
+insert into t1 (c1) values (9.98e-4);
+insert into t1 (c1) values (0.000999);
+insert into t1 (c1) values (cast(9.99e-4 as decimal(10,6)));
+select * from t1;
+c1
+0.000999
+0.000998
+0.000999
+0.000999
+drop table t1;
 SELECT 1 % .123456789123456789123456789123456789123456789123456789123456789123456789123456789 AS '%';
 %
 0.012345687012345687012345687012345687012345687012345687012345687012345687000000000
diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index a3a13bb0435..546e281ee67 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/r/type_float.result
@@ -2,9 +2,9 @@ drop table if exists t1,t2;
 SELECT 10,10.0,10.,.1e+2,100.0e-1;
 10	10.0	10.	.1e+2	100.0e-1
 10	10.0	10	10	10
-SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000;
-6e-05	-6e-05	--6e-05	-6e-05+1.000000
-6e-05	-6e-05	6e-05	0.99994
+SELECT 6e-16, -6e-16, --6e-16, -6e-16+1.000000;
+6e-16	-6e-16	--6e-16	-6e-16+1.000000
+6e-16	-6e-16	6e-16	0.9999999999999994
 SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1;
 1e1	1.e1	1.0e1	1e+1	1.e+1	1.0e+1	1e-1	1.e-1	1.0e-1
 10	10	10	10	10	10	0.1	0.1	0.1
@@ -31,16 +31,16 @@ select * from t1;
 f1	f2
 10	10
 100000	100000
-1.23457e+09	1234567890
-1e+10	10000000000
-1e+15	1e+15
-1e+20	1e+20
-3.40282e+38	1e+50
-3.40282e+38	1e+150
+1234570000	1234567890
+10000000000	10000000000
+1e15	1e15
+1e20	1e20
+3.40282e38	1e50
+3.40282e38	1e150
 -10	-10
-1e-05	1e-05
-1e-10	1e-10
-1e-15	1e-15
+0.00001	0.00001
+0.0000000001	0.0000000001
+0.000000000000001	0.000000000000001
 1e-20	1e-20
 0	1e-50
 0	1e-150
@@ -87,7 +87,7 @@ col
 create table t2 select c1 + c1 * (c2 / 100) as col1, round(c1, 5) as col2, round(c1, 35) as col3, sqrt(c1*1e-15) col4 from t1;
 select * from t2;
 col1	col2	col3	col4
-140.36	121.00000	121	3.47850542618522e-07
+140.36	121.00000	121	0.00000034785054261852176
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -201,9 +201,9 @@ insert into t1 values (2e5),(2e6),(2e-4),(2e-5);
 select * from t1;
 c
 200000
-2e+06
+2e6
 0.0002
-2e-05
+2e-5
 drop table t1;
 CREATE TABLE t1 (
 reckey int unsigned NOT NULL,
@@ -267,7 +267,7 @@ select 1e-308, 1.00000001e-300, 100000000e-300;
 1e-308	1.00000001e-300	1e-292
 select 10e307;
 10e307
-1e+308
+1e308
 create table t1(a int, b double(8, 2));
 insert into t1 values
 (1, 28.50), (1, 121.85), (1, 157.23), (1, 1351.00), (1, -1965.35), (1, 81.75), 
@@ -369,12 +369,12 @@ Warning	1264	Out of range value for column 'f1' at row 1
 Warning	1264	Out of range value for column 'f1' at row 2
 select f1 + 0e0 from t1;
 f1 + 0e0
-1e+199
--1e+199
-1e+200
--1e+200
-1e+200
--1e+200
+1e199
+-1e199
+1e200
+-1e200
+1e200
+-1e200
 drop table t1;
 create table t1 (f1 float(30, 0));
 insert into t1 values (1e29), (-1e29);
@@ -385,12 +385,36 @@ Warning	1264	Out of range value for column 'f1' at row 1
 Warning	1264	Out of range value for column 'f1' at row 2
 select f1 + 0e0 from t1;
 f1 + 0e0
-1.00000001504747e+29
--1.00000001504747e+29
-1.00000001504747e+30
--1.00000001504747e+30
-1.00000001504747e+30
--1.00000001504747e+30
+1.0000000150474662e29
+-1.0000000150474662e29
+1.0000000150474662e30
+-1.0000000150474662e30
+1.0000000150474662e30
+-1.0000000150474662e30
+drop table t1;
+create table t1 (c char(6));
+insert into t1 values (2e6),(2e-5);
+select * from t1;
+c
+2e6
+2e-5
+drop table t1;
+CREATE TABLE d1 (d DOUBLE);
+INSERT INTO d1 VALUES (1.7976931348623157E+308);
+SELECT * FROM d1;
+d
+1.7976931348623157e308
+INSERT INTO d1 VALUES (1.79769313486232e+308);
+ERROR 22007: Illegal double '1.79769313486232e+308' value found during parsing
+SELECT * FROM d1;
+d
+1.7976931348623157e308
+DROP TABLE d1;
+create table t1 (a char(20));
+insert into t1 values (1.225e-05);
+select a+0 from t1;
+a+0
+0.00001225
 drop table t1;
 create table t1(d double, u bigint unsigned);
 insert into t1(d) values (9.22337203685479e18),
@@ -405,6 +429,6 @@ CREATE TABLE t1 (f1 DOUBLE);
 INSERT INTO t1 VALUES(-1.79769313486231e+308);
 SELECT f1 FROM t1;
 f1
--1.79769313486231e+308
+-1.79769313486231e308
 DROP TABLE t1;
 End of 5.0 tests
diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result
index 172b343e003..00526597a32 100644
--- a/mysql-test/r/type_newdecimal.result
+++ b/mysql-test/r/type_newdecimal.result
@@ -917,7 +917,7 @@ cast('1.00000001335143196001808973960578441619873046875E-10' as decimal(30,15))
 0.000000000100000
 select ln(14000) c1, convert(ln(14000),decimal(5,3)) c2, cast(ln(14000) as decimal(5,3)) c3;
 c1	c2	c3
-9.5468126085974	9.547	9.547
+9.546812608597396	9.547	9.547
 select convert(ln(14000),decimal(2,3)) c1;
 ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '').
 select cast(ln(14000) as decimal(2,3)) c1;
@@ -1141,17 +1141,17 @@ my_float	my_double	my_varchar
 1.17549e-18	1.175494345e-18	1.175494345e-18
 1.17549e-17	1.175494345e-17	1.175494345e-17
 1.17549e-16	1.175494345e-16	1.175494345e-16
-1.17549e-15	1.175494345e-15	1.175494345e-15
-1.17549e-14	1.175494345e-14	1.175494345e-14
-1.17549e-13	1.175494345e-13	1.175494345e-13
-1.17549e-12	1.175494345e-12	1.175494345e-12
-1.17549e-11	1.175494345e-11	1.175494345e-11
-1.17549e-10	1.175494345e-10	1.175494345e-10
-1.17549e-09	1.175494345e-09	1.175494345e-9
-1.17549e-08	1.175494345e-08	1.175494345e-8
-1.17549e-07	1.175494345e-07	1.175494345e-7
-1.17549e-06	1.175494345e-06	1.175494345e-6
-1.17549e-05	1.175494345e-05	1.175494345e-5
+0.00000000000000117549	0.000000000000001175494345	1.175494345e-15
+0.0000000000000117549	0.00000000000001175494345	1.175494345e-14
+0.000000000000117549	0.0000000000001175494345	1.175494345e-13
+0.00000000000117549	0.000000000001175494345	1.175494345e-12
+0.0000000000117549	0.00000000001175494345	1.175494345e-11
+0.000000000117549	0.0000000001175494345	1.175494345e-10
+0.00000000117549	0.000000001175494345	1.175494345e-9
+0.0000000117549	0.00000001175494345	1.175494345e-8
+0.000000117549	0.0000001175494345	1.175494345e-7
+0.00000117549	0.000001175494345	1.175494345e-6
+0.0000117549	0.00001175494345	1.175494345e-5
 0.000117549	0.0001175494345	1.175494345e-4
 0.00117549	0.001175494345	1.175494345e-3
 0.0117549	0.01175494345	1.175494345e-2
@@ -1175,21 +1175,21 @@ CAST(my_float   AS DECIMAL(65,30))	my_float
 0.000000000000000001175494374380	1.17549e-18
 0.000000000000000011754943743802	1.17549e-17
 0.000000000000000117549432474939	1.17549e-16
-0.000000000000001175494324749389	1.17549e-15
-0.000000000000011754943671010360	1.17549e-14
-0.000000000000117549429933840000	1.17549e-13
-0.000000000001175494380653563000	1.17549e-12
-0.000000000011754943372854760000	1.17549e-11
-0.000000000117549428524377200000	1.17549e-10
-0.000000001175494368510499000000	1.17549e-09
-0.000000011754943685104990000000	1.17549e-08
-0.000000117549433298336200000000	1.17549e-07
-0.000001175494389826781000000000	1.17549e-06
-0.000011754943443520460000000000	1.17549e-05
+0.000000000000001175494324749389	0.00000000000000117549
+0.000000000000011754943671010362	0.0000000000000117549
+0.000000000000117549429933840040	0.000000000000117549
+0.000000000001175494380653563400	0.00000000000117549
+0.000000000011754943372854765000	0.0000000000117549
+0.000000000117549428524377220000	0.000000000117549
+0.000000001175494368510499000000	0.00000000117549
+0.000000011754943685104990000000	0.0000000117549
+0.000000117549433298336230000000	0.000000117549
+0.000001175494389826781100000000	0.00000117549
+0.000011754943443520460000000000	0.0000117549
 0.000117549432616215200000000000	0.000117549
-0.001175494398921728000000000000	0.00117549
-0.011754943057894710000000000000	0.0117549
-0.117549434304237400000000000000	0.117549
+0.001175494398921728100000000000	0.00117549
+0.011754943057894707000000000000	0.0117549
+0.117549434304237370000000000000	0.117549
 SELECT CAST(my_double  AS DECIMAL(65,30)), my_double FROM t1;
 CAST(my_double  AS DECIMAL(65,30))	my_double
 0.000000000000000000000000000000	1.175494345e-32
@@ -1209,17 +1209,17 @@ CAST(my_double  AS DECIMAL(65,30))	my_double
 0.000000000000000001175494345000	1.175494345e-18
 0.000000000000000011754943450000	1.175494345e-17
 0.000000000000000117549434500000	1.175494345e-16
-0.000000000000001175494345000000	1.175494345e-15
-0.000000000000011754943450000000	1.175494345e-14
-0.000000000000117549434500000000	1.175494345e-13
-0.000000000001175494345000000000	1.175494345e-12
-0.000000000011754943450000000000	1.175494345e-11
-0.000000000117549434500000000000	1.175494345e-10
-0.000000001175494345000000000000	1.175494345e-09
-0.000000011754943450000000000000	1.175494345e-08
-0.000000117549434500000000000000	1.175494345e-07
-0.000001175494345000000000000000	1.175494345e-06
-0.000011754943450000000000000000	1.175494345e-05
+0.000000000000001175494345000000	0.000000000000001175494345
+0.000000000000011754943450000000	0.00000000000001175494345
+0.000000000000117549434500000000	0.0000000000001175494345
+0.000000000001175494345000000000	0.000000000001175494345
+0.000000000011754943450000000000	0.00000000001175494345
+0.000000000117549434500000000000	0.0000000001175494345
+0.000000001175494345000000000000	0.000000001175494345
+0.000000011754943450000000000000	0.00000001175494345
+0.000000117549434500000000000000	0.0000001175494345
+0.000001175494345000000000000000	0.000001175494345
+0.000011754943450000000000000000	0.00001175494345
 0.000117549434500000000000000000	0.0001175494345
 0.001175494345000000000000000000	0.001175494345
 0.011754943450000000000000000000	0.01175494345
@@ -1278,21 +1278,21 @@ my_decimal	my_float
 0.000000000000000001175494374380	1.17549e-18
 0.000000000000000011754943743802	1.17549e-17
 0.000000000000000117549432474939	1.17549e-16
-0.000000000000001175494324749389	1.17549e-15
-0.000000000000011754943671010360	1.17549e-14
-0.000000000000117549429933840000	1.17549e-13
-0.000000000001175494380653563000	1.17549e-12
-0.000000000011754943372854760000	1.17549e-11
-0.000000000117549428524377200000	1.17549e-10
-0.000000001175494368510499000000	1.17549e-09
-0.000000011754943685104990000000	1.17549e-08
-0.000000117549433298336200000000	1.17549e-07
-0.000001175494389826781000000000	1.17549e-06
-0.000011754943443520460000000000	1.17549e-05
+0.000000000000001175494324749389	0.00000000000000117549
+0.000000000000011754943671010362	0.0000000000000117549
+0.000000000000117549429933840040	0.000000000000117549
+0.000000000001175494380653563400	0.00000000000117549
+0.000000000011754943372854765000	0.0000000000117549
+0.000000000117549428524377220000	0.000000000117549
+0.000000001175494368510499000000	0.00000000117549
+0.000000011754943685104990000000	0.0000000117549
+0.000000117549433298336230000000	0.000000117549
+0.000001175494389826781100000000	0.00000117549
+0.000011754943443520460000000000	0.0000117549
 0.000117549432616215200000000000	0.000117549
-0.001175494398921728000000000000	0.00117549
-0.011754943057894710000000000000	0.0117549
-0.117549434304237400000000000000	0.117549
+0.001175494398921728100000000000	0.00117549
+0.011754943057894707000000000000	0.0117549
+0.117549434304237370000000000000	0.117549
 UPDATE t1 SET my_decimal = my_double;
 SELECT my_decimal, my_double  FROM t1;
 my_decimal	my_double
@@ -1313,17 +1313,17 @@ my_decimal	my_double
 0.000000000000000001175494345000	1.175494345e-18
 0.000000000000000011754943450000	1.175494345e-17
 0.000000000000000117549434500000	1.175494345e-16
-0.000000000000001175494345000000	1.175494345e-15
-0.000000000000011754943450000000	1.175494345e-14
-0.000000000000117549434500000000	1.175494345e-13
-0.000000000001175494345000000000	1.175494345e-12
-0.000000000011754943450000000000	1.175494345e-11
-0.000000000117549434500000000000	1.175494345e-10
-0.000000001175494345000000000000	1.175494345e-09
-0.000000011754943450000000000000	1.175494345e-08
-0.000000117549434500000000000000	1.175494345e-07
-0.000001175494345000000000000000	1.175494345e-06
-0.000011754943450000000000000000	1.175494345e-05
+0.000000000000001175494345000000	0.000000000000001175494345
+0.000000000000011754943450000000	0.00000000000001175494345
+0.000000000000117549434500000000	0.0000000000001175494345
+0.000000000001175494345000000000	0.000000000001175494345
+0.000000000011754943450000000000	0.00000000001175494345
+0.000000000117549434500000000000	0.0000000001175494345
+0.000000001175494345000000000000	0.000000001175494345
+0.000000011754943450000000000000	0.00000001175494345
+0.000000117549434500000000000000	0.0000001175494345
+0.000001175494345000000000000000	0.000001175494345
+0.000011754943450000000000000000	0.00001175494345
 0.000117549434500000000000000000	0.0001175494345
 0.001175494345000000000000000000	0.001175494345
 0.011754943450000000000000000000	0.01175494345
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 3b6541ce56a..4f492d05558 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -1305,6 +1305,8 @@ SELECT @tmp_max:= @@global.max_allowed_packet;
 @tmp_max:= @@global.max_allowed_packet
 1048576
 SET @@global.max_allowed_packet=25000000;
+Warnings:
+Warning	1292	Truncated incorrect max_allowed_packet value: '25000000'
 CREATE TABLE t1 (a mediumtext);
 CREATE TABLE t2 (b varchar(20));
 INSERT INTO t1 VALUES ('a');
diff --git a/mysql-test/r/user_limits.result b/mysql-test/r/user_limits.result
index a94eb4616d1..80ec5517b16 100644
--- a/mysql-test/r/user_limits.result
+++ b/mysql-test/r/user_limits.result
@@ -70,7 +70,7 @@ select @@session.max_user_connections, @@global.max_user_connections;
 @@session.max_user_connections	@@global.max_user_connections
 0	0
 set session max_user_connections= 2;
-ERROR HY000: Variable 'max_user_connections' is a GLOBAL variable and should be set with SET GLOBAL
+ERROR HY000: SESSION variable 'max_user_connections' is read-only. Use SET GLOBAL to assign the value
 set global max_user_connections= 2;
 select @@session.max_user_connections, @@global.max_user_connections;
 @@session.max_user_connections	@@global.max_user_connections
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
index 28da1dae931..fe3dd4171ce 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/r/user_var.result
@@ -192,8 +192,6 @@ coercibility(@v1)	coercibility(@v2)	coercibility(@v3)	coercibility(@v4)
 2	2	2	2
 set session @honk=99;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '@honk=99' at line 1
-set one_shot @honk=99;
-ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server
 select @@local.max_allowed_packet;
 @@local.max_allowed_packet
 #
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index f98872d93b3..a8737419aa1 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -24,7 +24,7 @@ set @my_query_cache_type          =@@global.query_cache_type;
 set @my_rpl_recovery_rank         =@@global.rpl_recovery_rank;
 set @my_server_id                 =@@global.server_id;
 set @my_slow_launch_time          =@@global.slow_launch_time;
-set @my_storage_engine            =@@global.storage_engine;
+set @my_storage_engine            =@@global.default_storage_engine;
 set @my_thread_cache_size         =@@global.thread_cache_size;
 set @my_max_allowed_packet        =@@global.max_allowed_packet;
 set @my_join_buffer_size          =@@global.join_buffer_size;
@@ -57,7 +57,7 @@ select @`select`,@not_used;
 set @test_int=10,@test_double=1e-10,@test_string="abcdeghi",@test_string2="abcdefghij",@select=NULL;
 select @test_int,@test_double,@test_string,@test_string2,@select;
 @test_int	@test_double	@test_string	@test_string2	@select
-10	1e-10	abcdeghi	abcdefghij	NULL
+10	0.0000000001	abcdeghi	abcdefghij	NULL
 set @test_int="hello",@test_double="hello",@test_string="hello",@test_string2="hello";
 select @test_int,@test_double,@test_string,@test_string2;
 @test_int	@test_double	@test_string	@test_string2
@@ -165,28 +165,28 @@ set big_tables=OFF, big_tables=ON, big_tables=0, big_tables=1, big_tables="OFF",
 set global concurrent_insert=2;
 show variables like 'concurrent_insert';
 Variable_name	Value
-concurrent_insert	2
+concurrent_insert	ALWAYS
 select * from information_schema.session_variables where variable_name like 'concurrent_insert';
 VARIABLE_NAME	VARIABLE_VALUE
-CONCURRENT_INSERT	2
+CONCURRENT_INSERT	ALWAYS
 set global concurrent_insert=1;
 show variables like 'concurrent_insert';
 Variable_name	Value
-concurrent_insert	1
+concurrent_insert	AUTO
 select * from information_schema.session_variables where variable_name like 'concurrent_insert';
 VARIABLE_NAME	VARIABLE_VALUE
-CONCURRENT_INSERT	1
+CONCURRENT_INSERT	AUTO
 set global concurrent_insert=0;
 show variables like 'concurrent_insert';
 Variable_name	Value
-concurrent_insert	0
+concurrent_insert	NEVER
 select * from information_schema.session_variables where variable_name like 'concurrent_insert';
 VARIABLE_NAME	VARIABLE_VALUE
-CONCURRENT_INSERT	0
+CONCURRENT_INSERT	NEVER
 set global concurrent_insert=DEFAULT;
 select @@concurrent_insert;
 @@concurrent_insert
-1
+AUTO
 set global timed_mutexes=ON;
 show variables like 'timed_mutexes';
 Variable_name	Value
@@ -201,21 +201,23 @@ timed_mutexes	OFF
 select * from information_schema.session_variables where variable_name like 'timed_mutexes';
 VARIABLE_NAME	VARIABLE_VALUE
 TIMED_MUTEXES	OFF
-set storage_engine=MYISAM, storage_engine="HEAP", global storage_engine="MERGE";
-show local variables like 'storage_engine';
+set default_storage_engine=MYISAM, default_storage_engine="HEAP", global default_storage_engine="MERGE";
+show local variables like 'default_storage_engine';
 Variable_name	Value
-storage_engine	MEMORY
-select * from information_schema.session_variables where variable_name like 'storage_engine';
+default_storage_engine	MEMORY
+select * from information_schema.session_variables where variable_name like 'default_storage_engine';
 VARIABLE_NAME	VARIABLE_VALUE
-STORAGE_ENGINE	MEMORY
-show global variables like 'storage_engine';
+DEFAULT_STORAGE_ENGINE	MEMORY
+show global variables like 'default_storage_engine';
 Variable_name	Value
-storage_engine	MRG_MYISAM
-select * from information_schema.global_variables where variable_name like 'storage_engine';
+default_storage_engine	MRG_MYISAM
+select * from information_schema.global_variables where variable_name like 'default_storage_engine';
 VARIABLE_NAME	VARIABLE_VALUE
-STORAGE_ENGINE	MRG_MYISAM
-set GLOBAL query_cache_size=100000;
+DEFAULT_STORAGE_ENGINE	MRG_MYISAM
+set GLOBAL query_cache_size=102400;
 set GLOBAL myisam_max_sort_file_size=2000000;
+Warnings:
+Warning	1292	Truncated incorrect myisam_max_sort_file_size value: '2000000'
 show global variables like 'myisam_max_sort_file_size';
 Variable_name	Value
 myisam_max_sort_file_size	1048576
@@ -256,6 +258,8 @@ NET_READ_TIMEOUT	30
 NET_RETRY_COUNT	10
 NET_WRITE_TIMEOUT	60
 set global net_buffer_length=8000, global net_read_timeout=900, net_write_timeout=1000;
+Warnings:
+Warning	1292	Truncated incorrect net_buffer_length value: '8000'
 show global variables like 'net_%';
 Variable_name	Value
 net_buffer_length	7168
@@ -359,13 +363,20 @@ TRANSACTION_PREALLOC_SIZE	19456
 ==+ Manipulate variable values +==
 Testing values that are not 1024 multiples
 set @@range_alloc_block_size=1024*16+1023;
+Warnings:
+Warning	1292	Truncated incorrect range_alloc_block_size value: '17407'
 set @@query_alloc_block_size=1024*17+2;
+Warnings:
+Warning	1292	Truncated incorrect query_alloc_block_size value: '17410'
 set @@query_prealloc_size=1024*18-1023;
+Warnings:
+Warning	1292	Truncated incorrect query_prealloc_size value: '17409'
 set @@transaction_alloc_block_size=1024*20-1;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '20479'
 set @@transaction_prealloc_size=1024*21-1;
-select @@query_alloc_block_size;
-@@query_alloc_block_size
-17408
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '21503'
 ==+ Check manipulated values ==+
 SHOW VARIABLES WHERE variable_name IN ('range_alloc_block_size',
 'query_alloc_block_size', 'query_prealloc_size',
@@ -415,17 +426,15 @@ set unknown_variable=1;
 ERROR HY000: Unknown system variable 'unknown_variable'
 set max_join_size="hello";
 ERROR 42000: Incorrect argument type to variable 'max_join_size'
-set storage_engine=UNKNOWN_TABLE_TYPE;
-ERROR 42000: Unknown table engine 'UNKNOWN_TABLE_TYPE'
-set storage_engine=MERGE, big_tables=2;
+set default_storage_engine=UNKNOWN_TABLE_TYPE;
+ERROR 42000: Unknown storage engine 'UNKNOWN_TABLE_TYPE'
+set default_storage_engine=MERGE, big_tables=2;
 ERROR 42000: Variable 'big_tables' can't be set to the value of '2'
-show local variables like 'storage_engine';
+show local variables like 'default_storage_engine';
 Variable_name	Value
-storage_engine	MEMORY
+default_storage_engine	MEMORY
 set SESSION query_cache_size=10000;
 ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL
-set GLOBAL storage_engine=DEFAULT;
-ERROR 42000: Variable 'storage_engine' doesn't have a default value
 set character_set_client=UNKNOWN_CHARACTER_SET;
 ERROR 42000: Unknown character set: 'UNKNOWN_CHARACTER_SET'
 set collation_connection=UNKNOWN_COLLATION;
@@ -434,18 +443,12 @@ set character_set_client=NULL;
 ERROR 42000: Variable 'character_set_client' can't be set to the value of 'NULL'
 set collation_connection=NULL;
 ERROR 42000: Variable 'collation_connection' can't be set to the value of 'NULL'
-set global autocommit=1;
-ERROR HY000: Variable 'autocommit' is a SESSION variable and can't be used with SET GLOBAL
 select @@global.timestamp;
 ERROR HY000: Variable 'timestamp' is a SESSION variable
 set @@version='';
 ERROR HY000: Variable 'version' is a read only variable
 set @@concurrent_insert=1;
 ERROR HY000: Variable 'concurrent_insert' is a GLOBAL variable and should be set with SET GLOBAL
-set @@global.sql_auto_is_null=1;
-ERROR HY000: Variable 'sql_auto_is_null' is a SESSION variable and can't be used with SET GLOBAL
-select @@global.sql_auto_is_null;
-ERROR HY000: Variable 'sql_auto_is_null' is a SESSION variable
 set myisam_max_sort_file_size=100;
 ERROR HY000: Variable 'myisam_max_sort_file_size' is a GLOBAL variable and should be set with SET GLOBAL
 set @@SQL_WARNINGS=NULL;
@@ -530,14 +533,16 @@ set net_read_timeout=100;
 set net_write_timeout=100;
 set global query_cache_limit=100;
 set global query_cache_size=100;
+Warnings:
+Warning	1292	Truncated incorrect query_cache_size value: '100'
 set global query_cache_type=demand;
 set read_buffer_size=100;
 Warnings:
 Warning	1292	Truncated incorrect read_buffer_size value: '100'
 set read_rnd_buffer_size=100;
-Warnings:
-Warning	1292	Truncated incorrect read_rnd_buffer_size value: '100'
 set global rpl_recovery_rank=100;
+Warnings:
+Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
 set global server_id=100;
 set global slow_launch_time=100;
 set sort_buffer_size=100;
@@ -568,17 +573,13 @@ set sql_log_update=1;
 Warnings:
 Note	1315	The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored
 set sql_low_priority_updates=1;
-set sql_max_join_size=200;
-select @@sql_max_join_size,@@max_join_size;
-@@sql_max_join_size	@@max_join_size
-200	200
 set sql_quote_show_create=1;
 set sql_safe_updates=1;
 set sql_select_limit=1;
 set sql_select_limit=default;
 set sql_warnings=1;
 set global table_open_cache=100;
-set storage_engine=myisam;
+set default_storage_engine=myisam;
 set global thread_cache_size=100;
 set timestamp=1, timestamp=default;
 set tmp_table_size=100;
@@ -615,6 +616,8 @@ create table t2 (a int not null auto_increment, primary key(a));
 insert into t1 values(null),(null),(null);
 insert into t2 values(null),(null),(null);
 set global key_buffer_size=100000;
+Warnings:
+Warning	1292	Truncated incorrect key_buffer_size value: '100000'
 select @@key_buffer_size;
 @@key_buffer_size
 98304
@@ -658,11 +661,11 @@ MYISAM_MAX_SORT_FILE_SIZE	MAX_FILE_SIZE
 set global myisam_max_sort_file_size=default;
 select @@global.max_user_connections,@@local.max_join_size;
 @@global.max_user_connections	@@local.max_join_size
-100	200
+100	100
 set @svc=@@global.max_user_connections, @svj=@@local.max_join_size;
 select @@global.max_user_connections,@@local.max_join_size;
 @@global.max_user_connections	@@local.max_join_size
-100	200
+100	100
 set @@global.max_user_connections=111,@@local.max_join_size=222;
 select @@global.max_user_connections,@@local.max_join_size;
 @@global.max_user_connections	@@local.max_join_size
@@ -674,7 +677,7 @@ select @@global.max_user_connections,@@local.max_join_size;
 set @@global.max_user_connections=@svc, @@local.max_join_size=@svj;
 select @@global.max_user_connections,@@local.max_join_size;
 @@global.max_user_connections	@@local.max_join_size
-100	200
+100	100
 set @a=1, @b=2;
 set @a=@b, @b=@a;
 select @a, @b;
@@ -1055,9 +1058,11 @@ set global net_read_timeout          =@my_net_read_timeout;
 set global query_cache_limit         =@my_query_cache_limit;
 set global query_cache_type          =@my_query_cache_type;
 set global rpl_recovery_rank         =@my_rpl_recovery_rank;
+Warnings:
+Warning	1287	The syntax '@@rpl_recovery_rank' is deprecated and will be removed in MySQL 7.0.
 set global server_id                 =@my_server_id;
 set global slow_launch_time          =@my_slow_launch_time;
-set global storage_engine            =@my_storage_engine;
+set global default_storage_engine            =@my_storage_engine;
 set global thread_cache_size         =@my_thread_cache_size;
 set global max_allowed_packet        =@my_max_allowed_packet;
 set global join_buffer_size          =@my_join_buffer_size;
@@ -1440,10 +1445,10 @@ Warning	1292	Truncated incorrect auto_increment_offset value: '-1'
 SET GLOBAL auto_increment_offset=0;
 Warnings:
 Warning	1292	Truncated incorrect auto_increment_offset value: '0'
-select @@storage_engine;
+select @@default_storage_engine;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					@@storage_engine	253	6	6	Y	0	31	8
-@@storage_engine
+def					@@default_storage_engine	253	6	6	Y	0	31	8
+@@default_storage_engine
 MyISAM
 SET @old_server_id = @@GLOBAL.server_id;
 SET GLOBAL server_id = (1 << 32) - 1;
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index b10c542f644..a54db7240a4 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -2590,7 +2590,7 @@ CREATE VIEW v1 AS SELECT SQRT(a) my_sqrt FROM t1;
 SELECT my_sqrt FROM v1 ORDER BY my_sqrt;
 my_sqrt
 1
-1.4142135623731
+1.4142135623730951
 DROP VIEW v1;
 DROP TABLE t1;
 CREATE TABLE t1 (id int PRIMARY KEY);
diff --git a/mysql-test/r/warnings_engine_disabled.result b/mysql-test/r/warnings_engine_disabled.result
index e5d35fdaa5f..3b9d92d87f7 100644
--- a/mysql-test/r/warnings_engine_disabled.result
+++ b/mysql-test/r/warnings_engine_disabled.result
@@ -1,10 +1,10 @@
 create table t1 (id int) engine=NDB;
 Warnings:
-Warning	1286	Unknown table engine 'NDB'
+Warning	1286	Unknown storage engine 'NDB'
 Warning	1266	Using storage engine MyISAM for table 't1'
 alter table t1 engine=NDB;
 Warnings:
-Warning	1286	Unknown table engine 'NDB'
+Warning	1286	Unknown storage engine 'NDB'
 drop table t1;
 SELECT ENGINE, SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='ndbcluster';
 ENGINE	SUPPORT