mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
3138ee3be1
A fix and a test case for Bug#34898 "mysql_info() reports 0 warnings while mysql_warning_count() reports 1" Review the patch by Chad Miller, implement review comments (since Chad left) and push the patch. This bug is actually not a bug. At least according to Monty. See Bug#841 "wrong number of warnings" reported back in July 2003 and closed as "not a bug". mysql_info() was printing the number of truncated columns, not the number of warnings. But since the message of mysql_info() was "Warnings: <number of truncated columns>", people would expect to get the number of warnings in it, not the number of truncated columns. So a possible fix would be to change the message of mysql_info() to say Rows changed: <n>, truncated: <m>. Instead, put the number of warnings there. That is, remove the feature that thd->cuted_fields (the number of truncated fields) is exposed to the client. The number of truncated columns can be calculated on the client, by analyzing SHOW WARNINGS output, and in future we may remove thd->cuted_fields altogether. So let's have one less thing to worry about. client/mysqltest.cc: Fix a bug in mysqltest program which used to return a wrong number of affected rows in ps-protocol, and a wrong mysql_info() information in both protocols in presence of warnings. mysql-test/r/insert.result: Update results (Bug#34898) mysql-test/suite/rpl/r/rpl_udf.result: Update to the changed output of mysqltest: mysql_info() is now printed before warnings. mysql-test/t/insert.test: Add a test case for Bug#34898. sql/sql_table.cc: A fix for Bug#34898 - report statement warn count, not the number of truncated values in mysql_info(). sql/sql_update.cc: A fix for Bug#34898 - report statement warn count, not the number of truncated values in mysql_info().
318 lines
9.9 KiB
Text
318 lines
9.9 KiB
Text
stop slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
reset master;
|
|
reset slave;
|
|
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
start slave;
|
|
set binlog_format=row;
|
|
drop table if exists t1;
|
|
"*** Test 1) Test UDFs via loadable libraries ***
|
|
"Running on the master"
|
|
CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB";
|
|
affected rows: 0
|
|
CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
|
|
affected rows: 0
|
|
CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
|
|
ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
|
|
SELECT * FROM mysql.func ORDER BY name;
|
|
name ret dl type
|
|
myfunc_double 1 UDF_LIB function
|
|
myfunc_int 2 UDF_LIB function
|
|
affected rows: 2
|
|
"Running on the slave"
|
|
SELECT * FROM mysql.func ORDER BY name;
|
|
name ret dl type
|
|
myfunc_double 1 UDF_LIB function
|
|
myfunc_int 2 UDF_LIB function
|
|
affected rows: 2
|
|
"Running on the master"
|
|
CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
|
|
affected rows: 0
|
|
INSERT INTO t1 VALUES(myfunc_int(100), myfunc_double(50.00));
|
|
affected rows: 1
|
|
INSERT INTO t1 VALUES(myfunc_int(10), myfunc_double(5.00));
|
|
affected rows: 1
|
|
INSERT INTO t1 VALUES(myfunc_int(200), myfunc_double(25.00));
|
|
affected rows: 1
|
|
INSERT INTO t1 VALUES(myfunc_int(1), myfunc_double(500.00));
|
|
affected rows: 1
|
|
SELECT * FROM t1 ORDER BY sum;
|
|
sum price
|
|
1 48.5
|
|
10 48.75
|
|
100 48.6
|
|
200 49
|
|
affected rows: 4
|
|
"Running on the slave"
|
|
SELECT * FROM t1 ORDER BY sum;
|
|
sum price
|
|
1 48.5
|
|
10 48.75
|
|
100 48.6
|
|
200 49
|
|
affected rows: 4
|
|
SELECT myfunc_int(25);
|
|
myfunc_int(25)
|
|
25
|
|
affected rows: 1
|
|
SELECT myfunc_double(75.00);
|
|
myfunc_double(75.00)
|
|
50.00
|
|
affected rows: 1
|
|
"Running on the master"
|
|
DROP FUNCTION myfunc_double;
|
|
affected rows: 0
|
|
DROP FUNCTION myfunc_int;
|
|
affected rows: 0
|
|
SELECT * FROM mysql.func ORDER BY name;
|
|
name ret dl type
|
|
affected rows: 0
|
|
"Running on the slave"
|
|
SELECT * FROM mysql.func ORDER BY name;
|
|
name ret dl type
|
|
affected rows: 0
|
|
"Running on the master"
|
|
DROP TABLE t1;
|
|
affected rows: 0
|
|
"*** Test 2) Test UDFs with SQL body ***
|
|
"Running on the master"
|
|
CREATE FUNCTION myfuncsql_int(i INT) RETURNS INTEGER DETERMINISTIC RETURN i;
|
|
affected rows: 0
|
|
CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 2.00;
|
|
affected rows: 0
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
test myfuncsql_double FUNCTION d DOUBLE RETURN d * 2.00
|
|
test myfuncsql_int FUNCTION i INT RETURN i
|
|
affected rows: 2
|
|
"Running on the slave"
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
test myfuncsql_double FUNCTION d DOUBLE RETURN d * 2.00
|
|
test myfuncsql_int FUNCTION i INT RETURN i
|
|
affected rows: 2
|
|
"Running on the master"
|
|
CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
|
|
affected rows: 0
|
|
INSERT INTO t1 VALUES(myfuncsql_int(100), myfuncsql_double(50.00));
|
|
affected rows: 1
|
|
INSERT INTO t1 VALUES(myfuncsql_int(10), myfuncsql_double(5.00));
|
|
affected rows: 1
|
|
INSERT INTO t1 VALUES(myfuncsql_int(200), myfuncsql_double(25.00));
|
|
affected rows: 1
|
|
INSERT INTO t1 VALUES(myfuncsql_int(1), myfuncsql_double(500.00));
|
|
affected rows: 1
|
|
SELECT * FROM t1 ORDER BY sum;
|
|
sum price
|
|
1 1000
|
|
10 10
|
|
100 100
|
|
200 50
|
|
affected rows: 4
|
|
"Running on the slave"
|
|
SELECT * FROM t1 ORDER BY sum;
|
|
sum price
|
|
1 1000
|
|
10 10
|
|
100 100
|
|
200 50
|
|
affected rows: 4
|
|
"Running on the master"
|
|
ALTER FUNCTION myfuncsql_int COMMENT "This was altered.";
|
|
affected rows: 0
|
|
ALTER FUNCTION myfuncsql_double COMMENT "This was altered.";
|
|
affected rows: 0
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
test myfuncsql_double FUNCTION d DOUBLE RETURN d * 2.00 This was altered.
|
|
test myfuncsql_int FUNCTION i INT RETURN i This was altered.
|
|
affected rows: 2
|
|
"Running on the slave"
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
test myfuncsql_double FUNCTION d DOUBLE RETURN d * 2.00 This was altered.
|
|
test myfuncsql_int FUNCTION i INT RETURN i This was altered.
|
|
affected rows: 2
|
|
SELECT myfuncsql_int(25);
|
|
myfuncsql_int(25)
|
|
25
|
|
affected rows: 1
|
|
SELECT myfuncsql_double(75.00);
|
|
myfuncsql_double(75.00)
|
|
150
|
|
affected rows: 1
|
|
"Running on the master"
|
|
DROP FUNCTION myfuncsql_double;
|
|
affected rows: 0
|
|
DROP FUNCTION myfuncsql_int;
|
|
affected rows: 0
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
affected rows: 0
|
|
"Running on the slave"
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
affected rows: 0
|
|
"Running on the master"
|
|
DROP TABLE t1;
|
|
affected rows: 0
|
|
set binlog_format=statement;
|
|
drop table if exists t1;
|
|
"*** Test 1) Test UDFs via loadable libraries ***
|
|
"Running on the master"
|
|
CREATE FUNCTION myfunc_double RETURNS REAL SONAME "UDF_EXAMPLE_LIB";
|
|
affected rows: 0
|
|
CREATE FUNCTION myfunc_int RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
|
|
affected rows: 0
|
|
CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "UDF_EXAMPLE_LIB";
|
|
ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
|
|
SELECT * FROM mysql.func ORDER BY name;
|
|
name ret dl type
|
|
myfunc_double 1 UDF_LIB function
|
|
myfunc_int 2 UDF_LIB function
|
|
affected rows: 2
|
|
"Running on the slave"
|
|
SELECT * FROM mysql.func ORDER BY name;
|
|
name ret dl type
|
|
myfunc_double 1 UDF_LIB function
|
|
myfunc_int 2 UDF_LIB function
|
|
affected rows: 2
|
|
"Running on the master"
|
|
CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
|
|
affected rows: 0
|
|
INSERT INTO t1 VALUES(myfunc_int(100), myfunc_double(50.00));
|
|
affected rows: 1
|
|
Warnings:
|
|
Note 1592 Statement may not be safe to log in statement format.
|
|
INSERT INTO t1 VALUES(myfunc_int(10), myfunc_double(5.00));
|
|
affected rows: 1
|
|
Warnings:
|
|
Note 1592 Statement may not be safe to log in statement format.
|
|
INSERT INTO t1 VALUES(myfunc_int(200), myfunc_double(25.00));
|
|
affected rows: 1
|
|
Warnings:
|
|
Note 1592 Statement may not be safe to log in statement format.
|
|
INSERT INTO t1 VALUES(myfunc_int(1), myfunc_double(500.00));
|
|
affected rows: 1
|
|
Warnings:
|
|
Note 1592 Statement may not be safe to log in statement format.
|
|
SELECT * FROM t1 ORDER BY sum;
|
|
sum price
|
|
1 48.5
|
|
10 48.75
|
|
100 48.6
|
|
200 49
|
|
affected rows: 4
|
|
"Running on the slave"
|
|
SELECT * FROM t1 ORDER BY sum;
|
|
sum price
|
|
1 48.5
|
|
10 48.75
|
|
100 48.6
|
|
200 49
|
|
affected rows: 4
|
|
SELECT myfunc_int(25);
|
|
myfunc_int(25)
|
|
25
|
|
affected rows: 1
|
|
SELECT myfunc_double(75.00);
|
|
myfunc_double(75.00)
|
|
50.00
|
|
affected rows: 1
|
|
"Running on the master"
|
|
DROP FUNCTION myfunc_double;
|
|
affected rows: 0
|
|
DROP FUNCTION myfunc_int;
|
|
affected rows: 0
|
|
SELECT * FROM mysql.func ORDER BY name;
|
|
name ret dl type
|
|
affected rows: 0
|
|
"Running on the slave"
|
|
SELECT * FROM mysql.func ORDER BY name;
|
|
name ret dl type
|
|
affected rows: 0
|
|
"Running on the master"
|
|
DROP TABLE t1;
|
|
affected rows: 0
|
|
"*** Test 2) Test UDFs with SQL body ***
|
|
"Running on the master"
|
|
CREATE FUNCTION myfuncsql_int(i INT) RETURNS INTEGER DETERMINISTIC RETURN i;
|
|
affected rows: 0
|
|
CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 2.00;
|
|
affected rows: 0
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
test myfuncsql_double FUNCTION d DOUBLE RETURN d * 2.00
|
|
test myfuncsql_int FUNCTION i INT RETURN i
|
|
affected rows: 2
|
|
"Running on the slave"
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
test myfuncsql_double FUNCTION d DOUBLE RETURN d * 2.00
|
|
test myfuncsql_int FUNCTION i INT RETURN i
|
|
affected rows: 2
|
|
"Running on the master"
|
|
CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
|
|
affected rows: 0
|
|
INSERT INTO t1 VALUES(myfuncsql_int(100), myfuncsql_double(50.00));
|
|
affected rows: 1
|
|
INSERT INTO t1 VALUES(myfuncsql_int(10), myfuncsql_double(5.00));
|
|
affected rows: 1
|
|
INSERT INTO t1 VALUES(myfuncsql_int(200), myfuncsql_double(25.00));
|
|
affected rows: 1
|
|
INSERT INTO t1 VALUES(myfuncsql_int(1), myfuncsql_double(500.00));
|
|
affected rows: 1
|
|
SELECT * FROM t1 ORDER BY sum;
|
|
sum price
|
|
1 1000
|
|
10 10
|
|
100 100
|
|
200 50
|
|
affected rows: 4
|
|
"Running on the slave"
|
|
SELECT * FROM t1 ORDER BY sum;
|
|
sum price
|
|
1 1000
|
|
10 10
|
|
100 100
|
|
200 50
|
|
affected rows: 4
|
|
"Running on the master"
|
|
ALTER FUNCTION myfuncsql_int COMMENT "This was altered.";
|
|
affected rows: 0
|
|
ALTER FUNCTION myfuncsql_double COMMENT "This was altered.";
|
|
affected rows: 0
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
test myfuncsql_double FUNCTION d DOUBLE RETURN d * 2.00 This was altered.
|
|
test myfuncsql_int FUNCTION i INT RETURN i This was altered.
|
|
affected rows: 2
|
|
"Running on the slave"
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
test myfuncsql_double FUNCTION d DOUBLE RETURN d * 2.00 This was altered.
|
|
test myfuncsql_int FUNCTION i INT RETURN i This was altered.
|
|
affected rows: 2
|
|
SELECT myfuncsql_int(25);
|
|
myfuncsql_int(25)
|
|
25
|
|
affected rows: 1
|
|
SELECT myfuncsql_double(75.00);
|
|
myfuncsql_double(75.00)
|
|
150
|
|
affected rows: 1
|
|
"Running on the master"
|
|
DROP FUNCTION myfuncsql_double;
|
|
affected rows: 0
|
|
DROP FUNCTION myfuncsql_int;
|
|
affected rows: 0
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
affected rows: 0
|
|
"Running on the slave"
|
|
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%' ORDER BY name;
|
|
db name type param_list body comment
|
|
affected rows: 0
|
|
"Running on the master"
|
|
DROP TABLE t1;
|
|
affected rows: 0
|