Merge 4.1 -> 5.0.

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_change_master.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/r/rpl_flush_log_loop.result:
  Auto merged
mysql-test/r/rpl_flush_tables.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_rule_m.result:
  Auto merged
mysql-test/r/rpl_loaddata_rule_s.result:
  Auto merged
mysql-test/r/rpl_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_reset_slave.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/rpl_until.result:
  Auto merged
mysql-test/r/rpl_user_variables.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/BUILD/compile-netware-all:
  Auto merged
netware/BUILD/compile-netware-standard:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_relayrotate-slave.opt:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql-common/client.c:
  Auto merged
tests/client_test.c:
  Auto merged

1 files changed, 238 insertions, 1 deletions

diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result
index d9e57b48d39..44950d0927c 100644
--- a/mysql-test/r/insert.result
+++ b/mysql-test/r/insert.result
@@ -63,7 +63,7 @@ insert into t1 values(NULL);
 ERROR 23000: Column 'id' cannot be null
 insert into t1 values (1), (NULL), (2);
 Warnings:
-Warning	1262	Data truncated, NULL supplied to NOT NULL column 'id' at row 2
+Warning	1263	Data truncated, NULL supplied to NOT NULL column 'id' at row 2
 select * from t1;
 id
 1
@@ -87,6 +87,243 @@ create table t1 (c int);
 insert into mysqltest.t1 set mysqltest.t1.c = '1';
 drop database mysqltest;
 use test;
+create table t1(number int auto_increment primary key, original_value varchar(50), f_double double, f_float float, f_double_7_2 double(7,2), f_float_4_3 float (4,3), f_double_u double unsigned, f_float_u float unsigned, f_double_15_1_u double(15,1) unsigned, f_float_3_1_u float (3,1) unsigned);
+set @value= "aa";
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1265	Data truncated for column 'f_double' at row 1
+Warning	1265	Data truncated for column 'f_float' at row 1
+Warning	1265	Data truncated for column 'f_double_7_2' at row 1
+Warning	1265	Data truncated for column 'f_float_4_3' at row 1
+Warning	1265	Data truncated for column 'f_double_u' at row 1
+Warning	1265	Data truncated for column 'f_float_u' at row 1
+Warning	1265	Data truncated for column 'f_double_15_1_u' at row 1
+Warning	1265	Data truncated for column 'f_float_3_1_u' at row 1
+select * from t1 where number =last_insert_id();
+number	1
+original_value	aa
+f_double	0
+f_float	0
+f_double_7_2	0.00
+f_float_4_3	0.000
+f_double_u	0
+f_float_u	0
+f_double_15_1_u	0.0
+f_float_3_1_u	0.0
+set @value= "1aa";
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1265	Data truncated for column 'f_double' at row 1
+Warning	1265	Data truncated for column 'f_float' at row 1
+Warning	1265	Data truncated for column 'f_double_7_2' at row 1
+Warning	1265	Data truncated for column 'f_float_4_3' at row 1
+Warning	1265	Data truncated for column 'f_double_u' at row 1
+Warning	1265	Data truncated for column 'f_float_u' at row 1
+Warning	1265	Data truncated for column 'f_double_15_1_u' at row 1
+Warning	1265	Data truncated for column 'f_float_3_1_u' at row 1
+select * from t1 where number =last_insert_id();
+number	2
+original_value	1aa
+f_double	1
+f_float	1
+f_double_7_2	1.00
+f_float_4_3	1.000
+f_double_u	1
+f_float_u	1
+f_double_15_1_u	1.0
+f_float_3_1_u	1.0
+set @value= "aa1";
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1265	Data truncated for column 'f_double' at row 1
+Warning	1265	Data truncated for column 'f_float' at row 1
+Warning	1265	Data truncated for column 'f_double_7_2' at row 1
+Warning	1265	Data truncated for column 'f_float_4_3' at row 1
+Warning	1265	Data truncated for column 'f_double_u' at row 1
+Warning	1265	Data truncated for column 'f_float_u' at row 1
+Warning	1265	Data truncated for column 'f_double_15_1_u' at row 1
+Warning	1265	Data truncated for column 'f_float_3_1_u' at row 1
+select * from t1 where number =last_insert_id();
+number	3
+original_value	aa1
+f_double	0
+f_float	0
+f_double_7_2	0.00
+f_float_4_3	0.000
+f_double_u	0
+f_float_u	0
+f_double_15_1_u	0.0
+f_float_3_1_u	0.0
+set @value= "1e+1111111111a";
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1265	Data truncated for column 'f_double' at row 1
+Warning	1265	Data truncated for column 'f_float' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1265	Data truncated for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1265	Data truncated for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1265	Data truncated for column 'f_double_u' at row 1
+Warning	1265	Data truncated for column 'f_float_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1265	Data truncated for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1265	Data truncated for column 'f_float_3_1_u' at row 1
+Warning	1264	Data truncated, out of range 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_7_2	99999.99
+f_float_4_3	9.999
+f_double_u	1.79769313486232e+308
+f_float_u	3.40282e+38
+f_double_15_1_u	99999999999999.9
+f_float_3_1_u	99.9
+set @value= "-1e+1111111111a";
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1265	Data truncated for column 'f_double' at row 1
+Warning	1265	Data truncated for column 'f_float' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1265	Data truncated for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1265	Data truncated for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1265	Data truncated for column 'f_double_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_u' at row 1
+Warning	1265	Data truncated for column 'f_float_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1265	Data truncated for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1265	Data truncated for column 'f_float_3_1_u' at row 1
+Warning	1264	Data truncated, out of range 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_7_2	-99999.99
+f_float_4_3	-9.999
+f_double_u	0
+f_float_u	0
+f_double_15_1_u	0.0
+f_float_3_1_u	0.0
+set @value= 1e+1111111111;
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+select * from t1 where number =last_insert_id();
+number	6
+original_value	1.7976931348623e+308
+f_double	1.79769313486232e+308
+f_float	3.40282e+38
+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_15_1_u	99999999999999.9
+f_float_3_1_u	99.9
+set @value= -1e+1111111111;
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+select * from t1 where number =last_insert_id();
+number	7
+original_value	-1.7976931348623e+308
+f_double	-1.79769313486232e+308
+f_float	-3.40282e+38
+f_double_7_2	-99999.99
+f_float_4_3	-9.999
+f_double_u	0
+f_float_u	0
+f_double_15_1_u	0.0
+f_float_3_1_u	0.0
+set @value= 1e+111;
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+select * from t1 where number =last_insert_id();
+number	8
+original_value	1e+111
+f_double	1e+111
+f_float	3.40282e+38
+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_15_1_u	99999999999999.9
+f_float_3_1_u	99.9
+set @value= -1e+111;
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1264	Data truncated, out of range for column 'f_float' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_7_2' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_4_3' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+select * from t1 where number =last_insert_id();
+number	9
+original_value	-1e+111
+f_double	-1e+111
+f_float	-3.40282e+38
+f_double_7_2	-99999.99
+f_float_4_3	-9.999
+f_double_u	0
+f_float_u	0
+f_double_15_1_u	0.0
+f_float_3_1_u	0.0
+set @value= 1;
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+select * from t1 where number =last_insert_id();
+number	10
+original_value	1
+f_double	1
+f_float	1
+f_double_7_2	1.00
+f_float_4_3	1.000
+f_double_u	1
+f_float_u	1
+f_double_15_1_u	1.0
+f_float_3_1_u	1.0
+set @value= -1;
+insert into t1 values(null,@value,@value,@value,@value,@value,@value,@value,@value,@value);
+Warnings:
+Warning	1264	Data truncated, out of range for column 'f_double_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_double_15_1_u' at row 1
+Warning	1264	Data truncated, out of range for column 'f_float_3_1_u' at row 1
+select * from t1 where number =last_insert_id();
+number	11
+original_value	-1
+f_double	-1
+f_float	-1
+f_double_7_2	-1.00
+f_float_4_3	-1.000
+f_double_u	0
+f_float_u	0
+f_double_15_1_u	0.0
+f_float_3_1_u	0.0
 drop table if exists t1,t2,t3;
 create table t1(id1 int not null auto_increment primary key, t char(12));
 create table t2(id2 int not null, t char(12));