Commit 4357e220 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2 

into  mysql.com:/usr/home/bar/mysql-5.0.b6147rpl


mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field.cc:
  Auto merged
parents 1b4d6a05 03d411b1

include/m_ctype.h

+10 −0
Original line number Diff line number Diff line
@@ -205,6 +205,9 @@ typedef struct my_charset_handler_st 
			 int *err);

  longlong    (*strtoll10)(struct charset_info_st *cs,

                           const char *nptr, char **endptr, int *error);

  ulonglong   (*strntoull10rnd)(struct charset_info_st *cs,

                                const char *str, uint length, int unsigned_fl,

                                char **endptr, int *error);

  ulong        (*scan)(struct charset_info_st *, const char *b, const char *e,

		       int sq);

} MY_CHARSET_HANDLER;
@@ -341,6 +344,13 @@ longlong my_strtoll10_8bit(CHARSET_INFO *cs, 
longlong my_strtoll10_ucs2(CHARSET_INFO *cs, 

                           const char *nptr, char **endptr, int *error);



ulonglong my_strntoull10rnd_8bit(CHARSET_INFO *cs,

                                 const char *str, uint length, int unsigned_fl,

                                 char **endptr, int *error);

ulonglong my_strntoull10rnd_ucs2(CHARSET_INFO *cs, 

                                 const char *str, uint length, int unsigned_fl,

                                 char **endptr, int *error);



void my_fill_8bit(CHARSET_INFO *cs, char* to, uint l, int fill);



my_bool  my_like_range_simple(CHARSET_INFO *cs,

mysql-test/r/loaddata.result

+4 −3
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ drop table t1; 
create table t1 (a int, b char(10));

load data infile '../std_data_ln/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;

Warnings:

Warning	1264	Out of range value adjusted for column 'a' at row 3

Warning	1366	Incorrect integer value: 'error      ' for column 'a' at row 3

Warning	1262	Row 3 was truncated; it contained more data than there were input columns

Warning	1264	Out of range value adjusted for column 'a' at row 5

Warning	1366	Incorrect integer value: 'wrong end  ' for column 'a' at row 5

Warning	1262	Row 5 was truncated; it contained more data than there were input columns

select * from t1;

a	b
@@ -57,7 +57,8 @@ a b 
truncate table t1;

load data infile '../std_data_ln/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;

Warnings:

Warning	1264	Out of range value adjusted for column 'a' at row 4

Warning	1366	Incorrect integer value: '

' for column 'a' at row 4

Warning	1261	Row 4 doesn't contain data for all columns

select * from t1;

a	b

mysql-test/r/ps_2myisam.result

+24 −24
Original line number Diff line number Diff line
@@ -2689,21 +2689,21 @@ set @arg00= '1.11111111111111111111e+50' ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

@arg00, @arg00, @arg00, @arg00, @arg00 ;

Warnings:

Warning	1265	Data truncated for column 'c1' at row 1

Warning	1265	Data truncated for column 'c2' at row 1

Warning	1265	Data truncated for column 'c3' at row 1

Warning	1265	Data truncated for column 'c4' at row 1

Warning	1265	Data truncated for column 'c5' at row 1

Warning	1265	Data truncated for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c1' at row 1

Warning	1264	Out of range value adjusted for column 'c2' at row 1

Warning	1264	Out of range value adjusted for column 'c3' at row 1

Warning	1264	Out of range value adjusted for column 'c4' at row 1

Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	1

c2	1

c3	1

c4	1

c5	1

c6	1

c1	127

c2	32767

c3	8388607

c4	2147483647

c5	2147483647

c6	9223372036854775807

c7	3.40282e+38

c8	1.11111111111111e+50

c9	1.11111111111111e+50
@@ -2739,21 +2739,21 @@ set @arg00= '-1.11111111111111111111e+50' ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

@arg00, @arg00, @arg00, @arg00, @arg00 ;

Warnings:

Warning	1265	Data truncated for column 'c1' at row 1

Warning	1265	Data truncated for column 'c2' at row 1

Warning	1265	Data truncated for column 'c3' at row 1

Warning	1265	Data truncated for column 'c4' at row 1

Warning	1265	Data truncated for column 'c5' at row 1

Warning	1265	Data truncated for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c1' at row 1

Warning	1264	Out of range value adjusted for column 'c2' at row 1

Warning	1264	Out of range value adjusted for column 'c3' at row 1

Warning	1264	Out of range value adjusted for column 'c4' at row 1

Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	-1

c2	-1

c3	-1

c4	-1

c5	-1

c6	-1

c1	-128

c2	-32768

c3	-8388608

c4	-2147483648

c5	-2147483648

c6	-9223372036854775808

c7	-3.40282e+38

c8	-1.11111111111111e+50

c9	-1.11111111111111e+50

mysql-test/r/ps_3innodb.result

+24 −24
Original line number Diff line number Diff line
@@ -2672,21 +2672,21 @@ set @arg00= '1.11111111111111111111e+50' ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

@arg00, @arg00, @arg00, @arg00, @arg00 ;

Warnings:

Warning	1265	Data truncated for column 'c1' at row 1

Warning	1265	Data truncated for column 'c2' at row 1

Warning	1265	Data truncated for column 'c3' at row 1

Warning	1265	Data truncated for column 'c4' at row 1

Warning	1265	Data truncated for column 'c5' at row 1

Warning	1265	Data truncated for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c1' at row 1

Warning	1264	Out of range value adjusted for column 'c2' at row 1

Warning	1264	Out of range value adjusted for column 'c3' at row 1

Warning	1264	Out of range value adjusted for column 'c4' at row 1

Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	1

c2	1

c3	1

c4	1

c5	1

c6	1

c1	127

c2	32767

c3	8388607

c4	2147483647

c5	2147483647

c6	9223372036854775807

c7	3.40282e+38

c8	1.11111111111111e+50

c9	1.11111111111111e+50
@@ -2722,21 +2722,21 @@ set @arg00= '-1.11111111111111111111e+50' ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

@arg00, @arg00, @arg00, @arg00, @arg00 ;

Warnings:

Warning	1265	Data truncated for column 'c1' at row 1

Warning	1265	Data truncated for column 'c2' at row 1

Warning	1265	Data truncated for column 'c3' at row 1

Warning	1265	Data truncated for column 'c4' at row 1

Warning	1265	Data truncated for column 'c5' at row 1

Warning	1265	Data truncated for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c1' at row 1

Warning	1264	Out of range value adjusted for column 'c2' at row 1

Warning	1264	Out of range value adjusted for column 'c3' at row 1

Warning	1264	Out of range value adjusted for column 'c4' at row 1

Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	-1

c2	-1

c3	-1

c4	-1

c5	-1

c6	-1

c1	-128

c2	-32768

c3	-8388608

c4	-2147483648

c5	-2147483648

c6	-9223372036854775808

c7	-3.40282e+38

c8	-1.11111111111111e+50

c9	-1.11111111111111e+50

mysql-test/r/ps_4heap.result

+24 −24
Original line number Diff line number Diff line
@@ -2673,21 +2673,21 @@ set @arg00= '1.11111111111111111111e+50' ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

@arg00, @arg00, @arg00, @arg00, @arg00 ;

Warnings:

Warning	1265	Data truncated for column 'c1' at row 1

Warning	1265	Data truncated for column 'c2' at row 1

Warning	1265	Data truncated for column 'c3' at row 1

Warning	1265	Data truncated for column 'c4' at row 1

Warning	1265	Data truncated for column 'c5' at row 1

Warning	1265	Data truncated for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c1' at row 1

Warning	1264	Out of range value adjusted for column 'c2' at row 1

Warning	1264	Out of range value adjusted for column 'c3' at row 1

Warning	1264	Out of range value adjusted for column 'c4' at row 1

Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	1

c2	1

c3	1

c4	1

c5	1

c6	1

c1	127

c2	32767

c3	8388607

c4	2147483647

c5	2147483647

c6	9223372036854775807

c7	3.40282e+38

c8	1.11111111111111e+50

c9	1.11111111111111e+50
@@ -2723,21 +2723,21 @@ set @arg00= '-1.11111111111111111111e+50' ; 
execute my_insert using @arg00, @arg00, @arg00, @arg00, @arg00, @arg00,

@arg00, @arg00, @arg00, @arg00, @arg00 ;

Warnings:

Warning	1265	Data truncated for column 'c1' at row 1

Warning	1265	Data truncated for column 'c2' at row 1

Warning	1265	Data truncated for column 'c3' at row 1

Warning	1265	Data truncated for column 'c4' at row 1

Warning	1265	Data truncated for column 'c5' at row 1

Warning	1265	Data truncated for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c1' at row 1

Warning	1264	Out of range value adjusted for column 'c2' at row 1

Warning	1264	Out of range value adjusted for column 'c3' at row 1

Warning	1264	Out of range value adjusted for column 'c4' at row 1

Warning	1264	Out of range value adjusted for column 'c5' at row 1

Warning	1264	Out of range value adjusted for column 'c6' at row 1

Warning	1264	Out of range value adjusted for column 'c7' at row 1

Warning	1264	Out of range value adjusted for column 'c12' at row 1

execute my_select ;

c1	-1

c2	-1

c3	-1

c4	-1

c5	-1

c6	-1

c1	-128

c2	-32768

c3	-8388608

c4	-2147483648

c5	-2147483648

c6	-9223372036854775808

c7	-3.40282e+38

c8	-1.11111111111111e+50

c9	-1.11111111111111e+50