Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
bc7cf303
Commit
bc7cf303
authored
Jul 21, 2003
by
venu@myvenu.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable warnings by default for single value list inserts also when the client protocol is >= 4.1
parent
dc5c0784
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
95 additions
and
6 deletions
+95
-6
INSTALL-WIN-SOURCE
INSTALL-WIN-SOURCE
+1
-1
mysql-test/r/warnings.result
mysql-test/r/warnings.result
+3
-0
mysql-test/t/warnings.test
mysql-test/t/warnings.test
+1
-0
sql/sql_insert.cc
sql/sql_insert.cc
+3
-1
tests/client_test.c
tests/client_test.c
+87
-4
No files found.
INSTALL-WIN-SOURCE
View file @
bc7cf303
...
...
@@ -92,7 +92,7 @@ To build the latest Windows source package from the current
BitKeeper source tree, use the following instructions. Please
note that this procedure must be performed on a system
running a Unix or Unix-like operating system. (The procedure
is know to work well on Linux, for example.
is know to work well on Linux
)
, for example.
- Clone the BitKeeper source tree for MySQL (version 4.1
or above, as desired). For more information how to clone
...
...
mysql-test/r/warnings.result
View file @
bc7cf303
...
...
@@ -90,6 +90,9 @@ Warning 1263 Data truncated for column 'b' at row 2
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 1263 Data truncated for column 'b' at row 4
insert into t2(b) values('mysqlab');
Warnings:
Warning 1263 Data truncated for column 'b' at row 1
drop table t1, t2;
create table t1(a char(10));
alter table t1 add b char;
...
...
mysql-test/t/warnings.test
View file @
bc7cf303
...
...
@@ -51,6 +51,7 @@ update t1 set c='mysql ab' where c='test';
update
t1
set
d
=
c
;
create
table
t2
(
a
tinyint
NOT
NULL
,
b
char
(
3
));
insert
into
t2
select
b
,
c
from
t1
;
insert
into
t2
(
b
)
values
(
'mysqlab'
);
drop
table
t1
,
t2
;
#
...
...
sql/sql_insert.cc
View file @
bc7cf303
...
...
@@ -231,7 +231,9 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
info
.
update_fields
=&
update_fields
;
info
.
update_values
=&
update_values
;
// Don't count warnings for simple inserts
if
(
values_list
.
elements
>
1
||
(
thd
->
options
&
OPTION_WARNINGS
))
if
((
thd
->
client_capabilities
&
CLIENT_PROTOCOL_41
)
||
values_list
.
elements
>
1
||
(
thd
->
options
&
OPTION_WARNINGS
))
thd
->
count_cuted_fields
=
1
;
thd
->
cuted_fields
=
0L
;
table
->
next_number_field
=
table
->
found_next_number_field
;
...
...
tests/client_test.c
View file @
bc7cf303
...
...
@@ -176,7 +176,7 @@ static void client_connect()
int
rc
;
myheader_r
(
"client_connect"
);
fprintf
(
stdout
,
"
\n
Establishing a connection
..."
);
fprintf
(
stdout
,
"
\n
Establishing a connection
to '%s' ..."
,
opt_host
);
if
(
!
(
mysql
=
mysql_init
(
NULL
)))
{
...
...
@@ -7161,6 +7161,11 @@ static void test_mem_overun()
rc
=
mysql_real_query
(
mysql
,
buffer
,
length
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"select * from t_mem_overun"
);
myquery
(
rc
);
myassert
(
1
==
my_process_result
(
mysql
));
stmt
=
mysql_prepare
(
mysql
,
"select * from t_mem_overun"
,
30
);
mystmt_init
(
stmt
);
...
...
@@ -7456,6 +7461,83 @@ static void test_sqlmode()
mysql_stmt_close
(
stmt
);
}
/*
test for timestamp handling
*/
static
void
test_ts
()
{
MYSQL_STMT
*
stmt
;
MYSQL_BIND
bind
[
2
];
MYSQL_TIME
ts
;
char
strts
[
30
];
long
length
;
int
rc
;
myheader
(
"test_ts"
);
rc
=
mysql_query
(
mysql
,
"DROP TABLE IF EXISTS test_ts"
);
myquery
(
rc
);
rc
=
mysql_query
(
mysql
,
"CREATE TABLE test_ts(a TIMESTAMP)"
);
myquery
(
rc
);
rc
=
mysql_commit
(
mysql
);
myquery
(
rc
);
stmt
=
mysql_prepare
(
mysql
,
"INSERT INTO test_ts VALUES(?),(?)"
,
40
);
mystmt_init
(
stmt
);
ts
.
year
=
2003
;
ts
.
month
=
07
;
ts
.
day
=
12
;
ts
.
hour
=
21
;
ts
.
minute
=
07
;
ts
.
second
=
46
;
length
=
(
long
)(
strmov
(
strts
,
"2003-07-12 21:07:46"
)
-
strts
);
bind
[
0
].
buffer_type
=
MYSQL_TYPE_STRING
;
bind
[
0
].
buffer
=
(
char
*
)
strts
;
bind
[
0
].
buffer_length
=
sizeof
(
strts
);
bind
[
0
].
is_null
=
0
;
bind
[
0
].
length
=
&
length
;
bind
[
1
].
buffer_type
=
MYSQL_TYPE_TIMESTAMP
;
bind
[
1
].
buffer
=
(
char
*
)
&
ts
;
bind
[
1
].
buffer_length
=
sizeof
(
ts
);
bind
[
1
].
is_null
=
0
;
bind
[
1
].
length
=
0
;
rc
=
mysql_bind_param
(
stmt
,
bind
);
mystmt
(
stmt
,
rc
);
rc
=
mysql_execute
(
stmt
);
mystmt
(
stmt
,
rc
);
mysql_stmt_close
(
stmt
);
verify_col_data
(
"test_ts"
,
"a"
,
"2003-07-12 21:07:46"
);
stmt
=
mysql_prepare
(
mysql
,
"SELECT a FROM test_ts WHERE a >= ?"
,
50
);
mystmt_init
(
stmt
);
rc
=
mysql_bind_param
(
stmt
,
bind
);
mystmt
(
stmt
,
rc
);
rc
=
mysql_execute
(
stmt
);
mystmt
(
stmt
,
rc
);
rc
=
mysql_fetch
(
stmt
);
mystmt
(
stmt
,
rc
);
rc
=
mysql_fetch
(
stmt
);
mystmt
(
stmt
,
rc
);
rc
=
mysql_fetch
(
stmt
);
myassert
(
rc
==
MYSQL_NO_DATA
);
mysql_stmt_close
(
stmt
);
}
/*
Read and parse arguments and MySQL options from my.cnf
...
...
@@ -7703,6 +7785,7 @@ int main(int argc, char **argv)
test_fetch_offset
();
/* to test mysql_fetch_column with offset */
test_fetch_column
();
/* to test mysql_fetch_column */
test_sqlmode
();
/* test for SQL_MODE */
test_ts
();
/* test for timestamp BR#819 */
end_time
=
time
((
time_t
*
)
0
);
total_time
+=
difftime
(
end_time
,
start_time
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment