summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-05-19 18:55:38 +0200
committerunknown <msvensson@pilot.blaudden>2007-05-19 18:55:38 +0200
commit74ba04e90db76326e803d30aa22e3f85440704ff (patch)
tree5aa0192f50c42d6ec39b8855a41b9c28b52fdf2a /scripts
parent3043367e730aecd311813ab70ef58ebacf23dfe2 (diff)
downloadmariadb-git-74ba04e90db76326e803d30aa22e3f85440704ff.tar.gz
Bug#28521 Upgrade from 5.1.17 to 5.1.18 breaks events
- Add test for upgrading from 5.1.17 - it's a beta but anyway good to have a check oif upgrading new system tables for 5.1 - Always put the "originator" column after "comment" to get correct order of columns in "events" table scripts/mysql_system_tables_fix.sql: Make sure the "originator" column ands up after "comment" to get correct order of the columns in event table mysql-test/t/system_mysql_db_fix50117-master.opt: New BitKeeper file ``mysql-test/t/system_mysql_db_fix50117-master.opt'' mysql-test/t/system_mysql_db_fix50117.test: New BitKeeper file ``mysql-test/t/system_mysql_db_fix50117.test''
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_system_tables_fix.sql2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index 6fbf20a2c9f..8ee28cbf1cb 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -440,7 +440,7 @@ ALTER TABLE event ADD sql_mode
'HIGH_NOT_PRECEDENCE'
) DEFAULT '' NOT NULL AFTER on_completion;
ALTER TABLE event MODIFY name char(64) CHARACTER SET utf8 NOT NULL default '';
-ALTER TABLE event ADD COLUMN originator INT(10) NOT NULL;
+ALTER TABLE event ADD COLUMN originator INT(10) NOT NULL AFTER comment;
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