Below is the list of changes that have just been committed into a local
5.1 repository of cbell. When cbell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-03-29 16:43:00-04:00, cbell@mysql_cab_desk. +3 -0
WL#3629 - Replication of Invocation and Invoked Features
This patch changes test to remove Windows-specific limitations and potential
rounding errors in the calculation of a UDF.
Also corrects a minor merge conflict.
mysql-test/include/rpl_udf.inc@stripped, 2007-03-29 16:42:56-04:00, cbell@mysql_cab_desk. +2 -1
WL#3629 - Replication of Invocation and Invoked Features
This patch changes test to remove Windows-specific results by replacing the
library name in the SELECT from mysql.func to "UDF_LIB" to allow for the
differences in platform (.so vs .dll).
The patch also changes the function body of myfuncsql_double to a calculation
that does not result in potential rounding errors from the test data.
mysql-test/r/rpl_udf.result@stripped, 2007-03-29 16:42:56-04:00, cbell@mysql_cab_desk. +32 -32
WL#3629 - Replication of Invocation and Invoked Features
This patch changes the result file for the test to match the new expected
values for the SELECT from mysql.func and the return of myfuncsql_double.
scripts/mysql_system_tables_fix.sql@stripped, 2007-03-29 16:42:57-04:00, cbell@mysql_cab_desk. +1 -1
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects a merge error encountered in a previous merge. The
column originator should be listed before time_zone in mysql.event.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: cbell
# Host: mysql_cab_desk.
# Root: C:/source/c++/mysql-5.1_WL_3629_test
--- 1.1/mysql-test/include/rpl_udf.inc 2007-03-29 16:43:13 -04:00
+++ 1.2/mysql-test/include/rpl_udf.inc 2007-03-29 16:43:13 -04:00
@@ -34,6 +34,7 @@
--replace_result $UDF_EXAMPLE_LIB UDF_EXAMPLE_LIB
--error ER_CANT_FIND_DL_ENTRY
eval CREATE FUNCTION myfunc_nonexist RETURNS INTEGER SONAME "$UDF_EXAMPLE_LIB";
+--replace_column 3 UDF_LIB
SELECT * FROM mysql.func;
--disable_info
@@ -105,7 +106,7 @@
--echo "Running on the master"
--enable_info
CREATE FUNCTION myfuncsql_int(i INT) RETURNS INTEGER DETERMINISTIC RETURN i;
-CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 0.95;
+CREATE FUNCTION myfuncsql_double(d DOUBLE) RETURNS INTEGER DETERMINISTIC RETURN d * 2.00;
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
--disable_info
--- 1.1/mysql-test/r/rpl_udf.result 2007-03-29 16:43:13 -04:00
+++ 1.2/mysql-test/r/rpl_udf.result 2007-03-29 16:43:13 -04:00
@@ -16,8 +16,8 @@
ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
SELECT * FROM mysql.func;
name ret dl type
-myfunc_double 1 udf_example.dll function
-myfunc_int 2 udf_example.dll function
+myfunc_double 1 UDF_LIB function
+myfunc_int 2 UDF_LIB function
affected rows: 2
"Running on the slave"
SELECT * FROM mysql.func;
@@ -78,17 +78,17 @@
"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 * 0.95;
+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%';
db name type param_list body comment
-test myfuncsql_double FUNCTION d DOUBLE RETURN d * 0.95
+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%';
db name type param_list body comment
-test myfuncsql_double FUNCTION d DOUBLE RETURN d * 0.95
+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"
@@ -104,18 +104,18 @@
affected rows: 1
SELECT * FROM t1 ORDER BY sum;
sum price
-1 475
-10 5
-100 47
-200 24
+1 1000
+10 10
+100 100
+200 50
affected rows: 4
"Running on the slave"
SELECT * FROM t1 ORDER BY sum;
sum price
-1 475
-10 5
-100 47
-200 24
+1 1000
+10 10
+100 100
+200 50
affected rows: 4
"Running on the master"
ALTER FUNCTION myfuncsql_int COMMENT "This was altered.";
@@ -124,13 +124,13 @@
affected rows: 0
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
db name type param_list body comment
-test myfuncsql_double FUNCTION d DOUBLE RETURN d * 0.95 This was altered.
+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%';
db name type param_list body comment
-test myfuncsql_double FUNCTION d DOUBLE RETURN d * 0.95 This was altered.
+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);
@@ -139,7 +139,7 @@
affected rows: 1
SELECT myfuncsql_double(75.00);
myfuncsql_double(75.00)
-71
+150
affected rows: 1
"Running on the master"
DROP FUNCTION myfuncsql_double;
@@ -168,8 +168,8 @@
ERROR HY000: Can't find symbol 'myfunc_nonexist' in library
SELECT * FROM mysql.func;
name ret dl type
-myfunc_int 2 udf_example.dll function
-myfunc_double 1 udf_example.dll function
+myfunc_int 2 UDF_LIB function
+myfunc_double 1 UDF_LIB function
affected rows: 2
"Running on the slave"
SELECT * FROM mysql.func;
@@ -230,17 +230,17 @@
"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 * 0.95;
+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%';
db name type param_list body comment
-test myfuncsql_double FUNCTION d DOUBLE RETURN d * 0.95
+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%';
db name type param_list body comment
-test myfuncsql_double FUNCTION d DOUBLE RETURN d * 0.95
+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"
@@ -256,18 +256,18 @@
affected rows: 1
SELECT * FROM t1 ORDER BY sum;
sum price
-1 475
-10 5
-100 47
-200 24
+1 1000
+10 10
+100 100
+200 50
affected rows: 4
"Running on the slave"
SELECT * FROM t1 ORDER BY sum;
sum price
-1 475
-10 5
-100 47
-200 24
+1 1000
+10 10
+100 100
+200 50
affected rows: 4
"Running on the master"
ALTER FUNCTION myfuncsql_int COMMENT "This was altered.";
@@ -276,13 +276,13 @@
affected rows: 0
SELECT db, name, type, param_list, body, comment FROM mysql.proc WHERE db = 'test' AND name LIKE 'myfuncsql%';
db name type param_list body comment
-test myfuncsql_double FUNCTION d DOUBLE RETURN d * 0.95 This was altered.
+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%';
db name type param_list body comment
-test myfuncsql_double FUNCTION d DOUBLE RETURN d * 0.95 This was altered.
+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);
@@ -291,7 +291,7 @@
affected rows: 1
SELECT myfuncsql_double(75.00);
myfuncsql_double(75.00)
-71
+150
affected rows: 1
"Running on the master"
DROP FUNCTION myfuncsql_double;
--- 1.62/scripts/mysql_system_tables_fix.sql 2007-03-29 16:43:13 -04:00
+++ 1.63/scripts/mysql_system_tables_fix.sql 2007-03-29 16:43:13 -04:00
@@ -481,7 +481,7 @@
ALTER TABLE event MODIFY COLUMN status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED';
ALTER TABLE event ADD COLUMN time_zone char(64) CHARACTER SET latin1
- NOT NULL DEFAULT 'SYSTEM' AFTER comment;
+ NOT NULL DEFAULT 'SYSTEM' AFTER originator;
#
# TRIGGER privilege
| Thread |
|---|
| • bk commit into 5.1 tree (cbell:1.2532) | cbell | 29 Mar |
