1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into deer.(none):/home/hf/work/mysql-4.1.2way
This commit is contained in:
hf@deer.(none) 2003-07-22 12:23:38 +05:00
commit 2e35e6f866
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL-WIN-SOURCE
View File

@ -92,7 +92,7 @@ To build the latest Windows source package from the current
BitKeeper source tree, use the following instructions. Please BitKeeper source tree, use the following instructions. Please
note that this procedure must be performed on a system note that this procedure must be performed on a system
running a Unix or Unix-like operating system. (The procedure running a Unix or Unix-like operating system. (The procedure
is know to work well on Linux), for example. is known to work well on Linux, for example.)
- Clone the BitKeeper source tree for MySQL (version 4.1 - Clone the BitKeeper source tree for MySQL (version 4.1
or above, as desired). For more information how to clone or above, as desired). For more information how to clone

3
mysql-test/r/warnings.result
View File

@ -91,8 +91,11 @@ Warning 1263 Data truncated for column 'b' at row 3
Warning 1261 Data truncated, NULL supplied to NOT NULL column 'a' at row 4 Warning 1261 Data truncated, NULL supplied to NOT NULL column 'a' at row 4
Warning 1263 Data truncated for column 'b' at row 4 Warning 1263 Data truncated for column 'b' at row 4
insert into t2(b) values('mysqlab'); insert into t2(b) values('mysqlab');
set sql_warnings=1;
insert into t2(b) values('mysqlab');
Warnings: Warnings:
Warning 1263 Data truncated for column 'b' at row 1 Warning 1263 Data truncated for column 'b' at row 1
set sql_warnings=0;
drop table t1, t2; drop table t1, t2;
create table t1(a char(10)); create table t1(a char(10));
alter table t1 add b char; alter table t1 add b char;

3
mysql-test/t/warnings.test
View File

@ -52,6 +52,9 @@ update t1 set d=c;
create table t2(a tinyint NOT NULL, b char(3)); create table t2(a tinyint NOT NULL, b char(3));
insert into t2 select b,c from t1; insert into t2 select b,c from t1;
insert into t2(b) values('mysqlab'); insert into t2(b) values('mysqlab');
set sql_warnings=1;
insert into t2(b) values('mysqlab');
set sql_warnings=0;
drop table t1, t2; drop table t1, t2;
# #

5
sql/gen_lex_hash.cc
View File

@ -89,6 +89,7 @@ static struct my_option my_long_options[] =
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"version", 'V', "Output version information and exit", {"version", 'V', "Output version information and exit",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
}; };
struct hash_lex_struct struct hash_lex_struct
@ -101,8 +102,8 @@ struct hash_lex_struct
}; };
int ithis; int ithis;
}; };
hash_lex_struct *get_hash_struct_by_len(hash_lex_struct **root_by_len, hash_lex_struct *get_hash_struct_by_len(hash_lex_struct **root_by_len,
int len, int *max_len) int len, int *max_len)
{ {
if (*max_len<len){ if (*max_len<len){

4
sql/sql_insert.cc
View File

@ -231,9 +231,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
info.update_fields=&update_fields; info.update_fields=&update_fields;
info.update_values=&update_values; info.update_values=&update_values;
// Don't count warnings for simple inserts // Don't count warnings for simple inserts
if ((thd->client_capabilities & CLIENT_PROTOCOL_41) || if (values_list.elements > 1 || (thd->options & OPTION_WARNINGS))
values_list.elements > 1 ||
(thd->options & OPTION_WARNINGS))
thd->count_cuted_fields = 1; thd->count_cuted_fields = 1;
thd->cuted_fields = 0L; thd->cuted_fields = 0L;
table->next_number_field=table->found_next_number_field; table->next_number_field=table->found_next_number_field;