Commit d454da56 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/field.cc:
  Auto merged
parents 47db6e13 f87f0450

include/my_sys.h

+3 −3
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ extern void get_defaults_files(int argc, char **argv, 
                               char **defaults, char **extra_defaults);

extern int load_defaults(const char *conf_file, const char **groups,

			 int *argc, char ***argv);

extern uint modify_defaults_file(const char *file_location, const char *option,

extern int modify_defaults_file(const char *file_location, const char *option,

                                const char *option_value,

                                const char *section_name, int remove_option);

extern int my_search_option_files(const char *conf_file, int *argc,

include/mysql_com.h

+3 −3
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ const char *mysql_errno_to_sqlstate(unsigned int mysql_errno); 
/* Some other useful functions */



my_bool my_init(void);

extern uint modify_defaults_file(const char *file_location, const char *option,

extern int modify_defaults_file(const char *file_location, const char *option,

                                const char *option_value,

                                const char *section_name, int remove_option);

int load_defaults(const char *conf_file, const char **groups,

mysql-test/r/strict.result

+2 −4
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ ERROR 22003: Out of range value adjusted for column 'col1' at row 1 
INSERT INTO t1 VALUES ('-100E+1');

ERROR 22003: Out of range value adjusted for column 'col1' at row 1

INSERT INTO t1 VALUES ('-100E');

ERROR 22003: Out of range value adjusted for column 'col1' at row 1

ERROR HY000: Incorrect decimal value: '-100E' for column 'col1' at row 1

UPDATE t1 SET col1 =col1 * 50000 WHERE col1 =11;

ERROR 22003: Out of range value adjusted for column 'col1' at row 6

UPDATE t1 SET col1 =col1 / 0 WHERE col1 > 0;
@@ -782,8 +782,7 @@ ERROR HY000: Incorrect decimal value: '' for column 'col1' at row 1 
INSERT INTO t1 (col1) VALUES ('a59b');

ERROR HY000: Incorrect decimal value: 'a59b' for column 'col1' at row 1

INSERT INTO t1 (col1) VALUES ('1a');

Warnings:

Note	1265	Data truncated for column 'col1' at row 1

ERROR HY000: Incorrect decimal value: '1a' for column 'col1' at row 1

INSERT IGNORE INTO t1 (col1) VALUES ('2a');

Warnings:

Note	1265	Data truncated for column 'col1' at row 1
@@ -818,7 +817,6 @@ NULL 
-10.56

11.00

10.00

1.00

2.00

NULL

99.99

mysql-test/r/type_newdecimal.result

+6 −0
Original line number Diff line number Diff line
@@ -885,3 +885,9 @@ SELECT GRADE FROM t1 WHERE GRADE= 151; 
GRADE

151

DROP TABLE t1;

select abs(10/0);

abs(10/0)

NULL

select abs(NULL);

abs(NULL)

NULL

mysql-test/t/strict.test

+2 −2
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ INSERT INTO t1 VALUES ('-101.55'); 
INSERT INTO t1 VALUES ('-1010.55');

--error 1264

INSERT INTO t1 VALUES ('-100E+1');

--error 1264

--error 1366

INSERT INTO t1 VALUES ('-100E');

--error 1264

UPDATE t1 SET col1 =col1 * 50000 WHERE col1 =11;
@@ -754,7 +754,7 @@ INSERT INTO t1 (col1) VALUES (''); 
#--error 1265

--error 1366

INSERT INTO t1 (col1) VALUES ('a59b');

#--error 1265

--error 1366

INSERT INTO t1 (col1) VALUES ('1a');

INSERT IGNORE INTO t1 (col1) VALUES ('2a');

INSERT IGNORE INTO t1 values (1/0);