mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
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: 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: 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: 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 commit is contained in:
@ -481,7 +481,7 @@ ALTER TABLE event ADD COLUMN originator INT(10) NOT NULL;
|
||||
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
|
||||
|
Reference in New Issue
Block a user