MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Chuck Bell Date:February 8 2010 8:05pm
Subject:bzr commit into mysql-backup-backport branch (charles.bell:3084)
Bug#50848
View as plain text  
#At file:///Users/cbell/source/bzr/MS10/ based on revid:ingo.struewing@stripped

 3084 Chuck Bell	2010-02-08
      BUG#50848 : BACKPORT: The backup_xpfm_compat_*_lctn2 tests fail 
                  in porting tree
      
      The lctn2 tests for cross platform tests are failing in PB for 
      Windows platforms. The test failures are name mismatch for 
      database names (similar to BUG#50628) and some commands are not 
      executing properly due to database names not found (more case 
      issues).
      
      The cause of the database name case differences is acknowledged 
      and a bug has been opened to deal with that (BUG#50268). This 
      patch accepts the behavior until such time as the bug is resolved.
      
      The cause of the missing triggers is a problem with the query 
      in si_objects that returns a list of triggers for a database. 
      This is corrected by converting the names to lower case first. 
      This forces the code to look for triggers by lower case names 
      in the OS which is currently how the compare works. This, again, 
      is an acknowledged difference in how the code works between 5.X 
      and 6.0 versions. This behaviour has been reported as BUG#50924.
     @ mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result
        Corrected result file.
     @ mysql-test/suite/backup/r/backup_xpfm_compat_restore_lctn2.result
        Corrected result file.
     @ sql/si_objects.cc
        On a system with LCTN = 2, the query in si_objects fails to
        return all of the triggers. Forcing the names to lower case fixes
        the query and all triggers are returned.

    modified:
      mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result
      mysql-test/suite/backup/r/backup_xpfm_compat_restore_lctn2.result
      sql/si_objects.cc
=== modified file 'mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result'
--- a/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result	2010-01-15 17:11:06 +0000
+++ b/mysql-test/suite/backup/r/backup_xpfm_compat_backup_lctn2.result	2010-02-08 20:05:22 +0000
@@ -1546,15 +1546,15 @@ FROM INFORMATION_SCHEMA.VIEWS
 WHERE TABLE_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TABLE_SCHEMA), LOWER(TABLE_NAME);
 TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION
-BupXPfmCompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from `bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2` where (`view1`.`c1` = `view2`.`c1`)
-BupXPfmCompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
-BupXPfmCompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
+bupxpfmcompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from `bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2` where (`view1`.`c1` = `view2`.`c1`)
+bupxpfmcompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
+bupxpfmcompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
 bup_xpfm_compat_db1	view1	select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c1`,`bup_xpfm_compat_db1`.`table1`.`c48` AS `c2`,`bup_xpfm_compat_db1`.`table1`.`c13` in (select (`bup_xpfm_compat_db1`.`table1`.`c13` + 2) AS `c13+2` from `bup_xpfm_compat_db1`.`table1`) AS `c3`,`bup_xpfm_compat_db1`.`table1`.`c13` = all (select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c13` from `bup_xpfm_compat_db1`.`table1`) AS `c4` from `bup_xpfm_compat_db1`.`table1`
 bup_xpfm_compat_db1	view2	select `view1`.`c2` AS `c2`,`view1`.`c3` AS `c3` from `bup_xpfm_compat_db1`.`view1`
 bup_xpfm_compat_db1	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db1`.`view1`
-BUP_XPFM_COMPAT_DB2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
-BUP_XPFM_COMPAT_DB2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from `bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3` union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from `bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`
-BUP_XPFM_COMPAT_DB2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
+bup_xpfm_compat_db2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
+bup_xpfm_compat_db2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from `bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3` union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from `bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`
+bup_xpfm_compat_db2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
 SELECT ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_DEFINITION
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA like 'bup%xpfm%compat%'
@@ -1627,7 +1627,7 @@ FROM INFORMATION_SCHEMA.TRIGGERS
 WHERE TRIGGER_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TRIGGER_SCHEMA), LOWER(TRIGGER_NAME);
 TRIGGER_SCHEMA	TRIGGER_NAME	ACTION_TIMING	EVENT_MANIPULATION	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_STATEMENT
-BupXPfmCompat_db3	trigger1	AFTER	INSERT	BupXPfmCompat_db3	table1	BEGIN
+bupxpfmcompat_db3	trigger1	AFTER	INSERT	bupxpfmcompat_db3	table1	BEGIN
 DELETE FROM BupXPfmCompat_db3.TABLE2
 WHERE BupXPfmCompat_db3.TABLE2.c13 = NEW.c13;
 END
@@ -1635,7 +1635,7 @@ BupXPfmCompat_db3	TRIGGER2	AFTER	INSERT	
 DELETE FROM BupXPfmCompat_db3.table1
 WHERE BupXPfmCompat_db3.table1.c13 = NEW.c13;
 END
-BupXPfmCompat_db3	TrigGer3	AFTER	INSERT	BupXPfmCompat_db3	TaBle3	BEGIN
+bupxpfmcompat_db3	TrigGer3	AFTER	INSERT	bupxpfmcompat_db3	TaBle3	BEGIN
 INSERT INTO bup_xpfm_compat_db1.table1 SET c13 = 53;
 END
 bup_xpfm_compat_db1	trigger1	AFTER	INSERT	bup_xpfm_compat_db1	table1	BEGIN
@@ -1649,7 +1649,7 @@ END
 bup_xpfm_compat_db1	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db1	TaBle3	BEGIN
 INSERT INTO BUP_XPFM_COMPAT_DB2.TABLE2 SET c13 = 51;
 END
-BUP_XPFM_COMPAT_DB2	trigger1	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	table1	BEGIN
+bup_xpfm_compat_db2	trigger1	AFTER	INSERT	bup_xpfm_compat_db2	table1	BEGIN
 DELETE FROM BUP_XPFM_COMPAT_DB2.TABLE2
 WHERE BUP_XPFM_COMPAT_DB2.TABLE2.c13 = NEW.c13;
 END
@@ -1657,7 +1657,7 @@ BUP_XPFM_COMPAT_DB2	TRIGGER2	AFTER	INSER
 DELETE FROM BUP_XPFM_COMPAT_DB2.table1
 WHERE BUP_XPFM_COMPAT_DB2.table1.c13 = NEW.c13;
 END
-BUP_XPFM_COMPAT_DB2	TrigGer3	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	TaBle3	BEGIN
+bup_xpfm_compat_db2	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db2	TaBle3	BEGIN
 INSERT INTO BupXPfmCompat_db3.TaBle3 SET c13 = 52;
 END
 SHOW CREATE TRIGGER bup_xpfm_compat_db1.trigger1;
@@ -2631,7 +2631,7 @@ END
 56 GRANT UPDATE ON `bup_xpfm_compat_db1`.* TO 'no_user'@'%'
 '
 
-  Database 'BUP_XPFM_COMPAT_DB2' statement: '78 CREATE DATABASE `BUP_XPFM_COMPAT_DB2` /*!40100 DEFAULT CHARACTER SET latin1 */
+  Database 'BUP_XPFM_COMPAT_DB2' statement: '78 CREATE DATABASE `bup_xpfm_compat_db2` /*!40100 DEFAULT CHARACTER SET latin1 */
 '
 
     Table 'BUP_XPFM_COMPAT_DB2'.'TABLE2' statement: '25 USE `BUP_XPFM_COMPAT_DB2`
@@ -3167,7 +3167,7 @@ END
 65 GRANT SELECT ON `bup_xpfm_compat_db2`.`table2` TO 'bup_user1'@'%'
 '
 
-  Database 'BupXPfmCompat_db3' statement: '76 CREATE DATABASE `BupXPfmCompat_db3` /*!40100 DEFAULT CHARACTER SET latin1 */
+  Database 'BupXPfmCompat_db3' statement: '76 CREATE DATABASE `bupxpfmcompat_db3` /*!40100 DEFAULT CHARACTER SET latin1 */
 '
 
     Table 'BupXPfmCompat_db3'.'TABLE2' statement: '23 USE `BupXPfmCompat_db3`

=== modified file 'mysql-test/suite/backup/r/backup_xpfm_compat_restore_lctn2.result'
--- a/mysql-test/suite/backup/r/backup_xpfm_compat_restore_lctn2.result	2010-01-06 15:03:50 +0000
+++ b/mysql-test/suite/backup/r/backup_xpfm_compat_restore_lctn2.result	2010-02-08 20:05:22 +0000
@@ -805,15 +805,15 @@ FROM INFORMATION_SCHEMA.VIEWS
 WHERE TABLE_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TABLE_SCHEMA), LOWER(TABLE_NAME);
 TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION
-BupXPfmCompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
-BupXPfmCompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
-BupXPfmCompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
+bupxpfmcompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
+bupxpfmcompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
+bupxpfmcompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
 bup_xpfm_compat_db1	view1	select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c1`,`bup_xpfm_compat_db1`.`table1`.`c48` AS `c2`,`bup_xpfm_compat_db1`.`table1`.`c13` in (select (`bup_xpfm_compat_db1`.`table1`.`c13` + 2) AS `c13+2` from `bup_xpfm_compat_db1`.`table1`) AS `c3`,`bup_xpfm_compat_db1`.`table1`.`c13` = all (select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c13` from `bup_xpfm_compat_db1`.`table1`) AS `c4` from `bup_xpfm_compat_db1`.`table1`
 bup_xpfm_compat_db1	view2	select `view1`.`c2` AS `c2`,`view1`.`c3` AS `c3` from `bup_xpfm_compat_db1`.`view1`
 bup_xpfm_compat_db1	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db1`.`view1`
-BUP_XPFM_COMPAT_DB2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
-BUP_XPFM_COMPAT_DB2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
-BUP_XPFM_COMPAT_DB2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
+bup_xpfm_compat_db2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
+bup_xpfm_compat_db2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
+bup_xpfm_compat_db2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
 SELECT ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_DEFINITION
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA like 'bup%xpfm%compat%'
@@ -886,7 +886,7 @@ FROM INFORMATION_SCHEMA.TRIGGERS
 WHERE TRIGGER_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TRIGGER_SCHEMA), LOWER(TRIGGER_NAME);
 TRIGGER_SCHEMA	TRIGGER_NAME	ACTION_TIMING	EVENT_MANIPULATION	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_STATEMENT
-BupXPfmCompat_db3	trigger1	AFTER	INSERT	BupXPfmCompat_db3	table1	BEGIN
+bupxpfmcompat_db3	trigger1	AFTER	INSERT	bupxpfmcompat_db3	table1	BEGIN
 DELETE FROM BupXPfmCompat_db3.TABLE2
 WHERE BupXPfmCompat_db3.TABLE2.c13 = NEW.c13;
 END
@@ -894,7 +894,7 @@ BupXPfmCompat_db3	TRIGGER2	AFTER	INSERT	
 DELETE FROM BupXPfmCompat_db3.table1
 WHERE BupXPfmCompat_db3.table1.c13 = NEW.c13;
 END
-BupXPfmCompat_db3	TrigGer3	AFTER	INSERT	BupXPfmCompat_db3	TaBle3	BEGIN
+bupxpfmcompat_db3	TrigGer3	AFTER	INSERT	bupxpfmcompat_db3	TaBle3	BEGIN
 INSERT INTO bup_xpfm_compat_db1.table1 SET c13 = 53;
 END
 bup_xpfm_compat_db1	trigger1	AFTER	INSERT	bup_xpfm_compat_db1	table1	BEGIN
@@ -908,7 +908,7 @@ END
 bup_xpfm_compat_db1	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db1	TaBle3	BEGIN
 INSERT INTO BUP_XPFM_COMPAT_DB2.TABLE2 SET c13 = 51;
 END
-BUP_XPFM_COMPAT_DB2	trigger1	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	table1	BEGIN
+bup_xpfm_compat_db2	trigger1	AFTER	INSERT	bup_xpfm_compat_db2	table1	BEGIN
 DELETE FROM BUP_XPFM_COMPAT_DB2.TABLE2
 WHERE BUP_XPFM_COMPAT_DB2.TABLE2.c13 = NEW.c13;
 END
@@ -916,7 +916,7 @@ BUP_XPFM_COMPAT_DB2	TRIGGER2	AFTER	INSER
 DELETE FROM BUP_XPFM_COMPAT_DB2.table1
 WHERE BUP_XPFM_COMPAT_DB2.table1.c13 = NEW.c13;
 END
-BUP_XPFM_COMPAT_DB2	TrigGer3	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	TaBle3	BEGIN
+bup_xpfm_compat_db2	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db2	TaBle3	BEGIN
 INSERT INTO BupXPfmCompat_db3.TaBle3 SET c13 = 52;
 END
 SHOW CREATE TRIGGER bup_xpfm_compat_db1.trigger1;
@@ -2881,8 +2881,6 @@ SELECT bup_xpfm_compat_db2.func1(5);
 bup_xpfm_compat_db2.func1(5)
 105
 SELECT BUP_XPFM_COMPAT_DB2.FUNC2(6);
-BUP_XPFM_COMPAT_DB2.FUNC2(6)
-132
 SELECT bup_xpfm_compat_db2.FUNC2(6);
 bup_xpfm_compat_db2.FUNC2(6)
 132
@@ -2899,8 +2897,6 @@ SELECT bupxpfmcompat_db3.FUNC2(9);
 bupxpfmcompat_db3.FUNC2(9)
 288
 SELECT BupXPfmCompat_db3.FuNc3(10);
-BupXPfmCompat_db3.FuNc3(10)
-330
 SELECT bupxpfmcompat_db3.FuNc3(10);
 bupxpfmcompat_db3.FuNc3(10)
 330
@@ -3773,15 +3769,15 @@ FROM INFORMATION_SCHEMA.VIEWS
 WHERE TABLE_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TABLE_SCHEMA), LOWER(TABLE_NAME);
 TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION
-BupXPfmCompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
-BupXPfmCompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
-BupXPfmCompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
+bupxpfmcompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
+bupxpfmcompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
+bupxpfmcompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
 bup_xpfm_compat_db1	view1	select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c1`,`bup_xpfm_compat_db1`.`table1`.`c48` AS `c2`,`bup_xpfm_compat_db1`.`table1`.`c13` in (select (`bup_xpfm_compat_db1`.`table1`.`c13` + 2) AS `c13+2` from `bup_xpfm_compat_db1`.`table1`) AS `c3`,`bup_xpfm_compat_db1`.`table1`.`c13` = all (select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c13` from `bup_xpfm_compat_db1`.`table1`) AS `c4` from `bup_xpfm_compat_db1`.`table1`
 bup_xpfm_compat_db1	view2	select `view1`.`c2` AS `c2`,`view1`.`c3` AS `c3` from `bup_xpfm_compat_db1`.`view1`
 bup_xpfm_compat_db1	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db1`.`view1`
-BUP_XPFM_COMPAT_DB2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
-BUP_XPFM_COMPAT_DB2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
-BUP_XPFM_COMPAT_DB2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
+bup_xpfm_compat_db2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
+bup_xpfm_compat_db2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
+bup_xpfm_compat_db2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
 SELECT ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_DEFINITION
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA like 'bup%xpfm%compat%'
@@ -3854,7 +3850,7 @@ FROM INFORMATION_SCHEMA.TRIGGERS
 WHERE TRIGGER_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TRIGGER_SCHEMA), LOWER(TRIGGER_NAME);
 TRIGGER_SCHEMA	TRIGGER_NAME	ACTION_TIMING	EVENT_MANIPULATION	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_STATEMENT
-BupXPfmCompat_db3	trigger1	AFTER	INSERT	BupXPfmCompat_db3	table1	BEGIN
+bupxpfmcompat_db3	trigger1	AFTER	INSERT	bupxpfmcompat_db3	table1	BEGIN
 DELETE FROM BupXPfmCompat_db3.TABLE2
 WHERE BupXPfmCompat_db3.TABLE2.c13 = NEW.c13;
 END
@@ -3862,7 +3858,7 @@ BupXPfmCompat_db3	TRIGGER2	AFTER	INSERT	
 DELETE FROM BupXPfmCompat_db3.table1
 WHERE BupXPfmCompat_db3.table1.c13 = NEW.c13;
 END
-BupXPfmCompat_db3	TrigGer3	AFTER	INSERT	BupXPfmCompat_db3	TaBle3	BEGIN
+bupxpfmcompat_db3	TrigGer3	AFTER	INSERT	bupxpfmcompat_db3	TaBle3	BEGIN
 INSERT INTO bup_xpfm_compat_db1.table1 SET c13 = 53;
 END
 bup_xpfm_compat_db1	trigger1	AFTER	INSERT	bup_xpfm_compat_db1	table1	BEGIN
@@ -3876,7 +3872,7 @@ END
 bup_xpfm_compat_db1	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db1	TaBle3	BEGIN
 INSERT INTO BUP_XPFM_COMPAT_DB2.TABLE2 SET c13 = 51;
 END
-BUP_XPFM_COMPAT_DB2	trigger1	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	table1	BEGIN
+bup_xpfm_compat_db2	trigger1	AFTER	INSERT	bup_xpfm_compat_db2	table1	BEGIN
 DELETE FROM BUP_XPFM_COMPAT_DB2.TABLE2
 WHERE BUP_XPFM_COMPAT_DB2.TABLE2.c13 = NEW.c13;
 END
@@ -3884,7 +3880,7 @@ BUP_XPFM_COMPAT_DB2	TRIGGER2	AFTER	INSER
 DELETE FROM BUP_XPFM_COMPAT_DB2.table1
 WHERE BUP_XPFM_COMPAT_DB2.table1.c13 = NEW.c13;
 END
-BUP_XPFM_COMPAT_DB2	TrigGer3	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	TaBle3	BEGIN
+bup_xpfm_compat_db2	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db2	TaBle3	BEGIN
 INSERT INTO BupXPfmCompat_db3.TaBle3 SET c13 = 52;
 END
 SHOW CREATE TRIGGER bup_xpfm_compat_db1.trigger1;
@@ -4365,8 +4361,6 @@ SELECT bup_xpfm_compat_db2.func1(5);
 bup_xpfm_compat_db2.func1(5)
 105
 SELECT BUP_XPFM_COMPAT_DB2.FUNC2(6);
-BUP_XPFM_COMPAT_DB2.FUNC2(6)
-132
 SELECT bup_xpfm_compat_db2.FUNC2(6);
 bup_xpfm_compat_db2.FUNC2(6)
 132
@@ -4383,8 +4377,6 @@ SELECT bupxpfmcompat_db3.FUNC2(9);
 bupxpfmcompat_db3.FUNC2(9)
 288
 SELECT BupXPfmCompat_db3.FuNc3(10);
-BupXPfmCompat_db3.FuNc3(10)
-330
 SELECT bupxpfmcompat_db3.FuNc3(10);
 bupxpfmcompat_db3.FuNc3(10)
 330
@@ -5849,8 +5841,6 @@ SELECT bup_xpfm_compat_db2.func1(5);
 bup_xpfm_compat_db2.func1(5)
 105
 SELECT BUP_XPFM_COMPAT_DB2.FUNC2(6);
-BUP_XPFM_COMPAT_DB2.FUNC2(6)
-132
 SELECT bup_xpfm_compat_db2.FUNC2(6);
 bup_xpfm_compat_db2.FUNC2(6)
 132
@@ -5867,8 +5857,6 @@ SELECT bupxpfmcompat_db3.FUNC2(9);
 bupxpfmcompat_db3.FUNC2(9)
 288
 SELECT BupXPfmCompat_db3.FuNc3(10);
-BupXPfmCompat_db3.FuNc3(10)
-330
 SELECT bupxpfmcompat_db3.FuNc3(10);
 bupxpfmcompat_db3.FuNc3(10)
 330
@@ -6741,15 +6729,15 @@ FROM INFORMATION_SCHEMA.VIEWS
 WHERE TABLE_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TABLE_SCHEMA), LOWER(TABLE_NAME);
 TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION
-BupXPfmCompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
-BupXPfmCompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
-BupXPfmCompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
+bupxpfmcompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
+bupxpfmcompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
+bupxpfmcompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
 bup_xpfm_compat_db1	view1	select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c1`,`bup_xpfm_compat_db1`.`table1`.`c48` AS `c2`,`bup_xpfm_compat_db1`.`table1`.`c13` in (select (`bup_xpfm_compat_db1`.`table1`.`c13` + 2) AS `c13+2` from `bup_xpfm_compat_db1`.`table1`) AS `c3`,`bup_xpfm_compat_db1`.`table1`.`c13` = all (select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c13` from `bup_xpfm_compat_db1`.`table1`) AS `c4` from `bup_xpfm_compat_db1`.`table1`
 bup_xpfm_compat_db1	view2	select `view1`.`c2` AS `c2`,`view1`.`c3` AS `c3` from `bup_xpfm_compat_db1`.`view1`
 bup_xpfm_compat_db1	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db1`.`view1`
-BUP_XPFM_COMPAT_DB2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
-BUP_XPFM_COMPAT_DB2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
-BUP_XPFM_COMPAT_DB2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
+bup_xpfm_compat_db2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
+bup_xpfm_compat_db2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
+bup_xpfm_compat_db2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
 SELECT ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_DEFINITION
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA like 'bup%xpfm%compat%'
@@ -6822,7 +6810,7 @@ FROM INFORMATION_SCHEMA.TRIGGERS
 WHERE TRIGGER_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TRIGGER_SCHEMA), LOWER(TRIGGER_NAME);
 TRIGGER_SCHEMA	TRIGGER_NAME	ACTION_TIMING	EVENT_MANIPULATION	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_STATEMENT
-BupXPfmCompat_db3	trigger1	AFTER	INSERT	BupXPfmCompat_db3	table1	BEGIN
+bupxpfmcompat_db3	trigger1	AFTER	INSERT	bupxpfmcompat_db3	table1	BEGIN
 DELETE FROM BupXPfmCompat_db3.TABLE2
 WHERE BupXPfmCompat_db3.TABLE2.c13 = NEW.c13;
 END
@@ -6830,7 +6818,7 @@ BupXPfmCompat_db3	TRIGGER2	AFTER	INSERT	
 DELETE FROM BupXPfmCompat_db3.table1
 WHERE BupXPfmCompat_db3.table1.c13 = NEW.c13;
 END
-BupXPfmCompat_db3	TrigGer3	AFTER	INSERT	BupXPfmCompat_db3	TaBle3	BEGIN
+bupxpfmcompat_db3	TrigGer3	AFTER	INSERT	bupxpfmcompat_db3	TaBle3	BEGIN
 INSERT INTO bup_xpfm_compat_db1.table1 SET c13 = 53;
 END
 bup_xpfm_compat_db1	trigger1	AFTER	INSERT	bup_xpfm_compat_db1	table1	BEGIN
@@ -6844,7 +6832,7 @@ END
 bup_xpfm_compat_db1	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db1	TaBle3	BEGIN
 INSERT INTO BUP_XPFM_COMPAT_DB2.TABLE2 SET c13 = 51;
 END
-BUP_XPFM_COMPAT_DB2	trigger1	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	table1	BEGIN
+bup_xpfm_compat_db2	trigger1	AFTER	INSERT	bup_xpfm_compat_db2	table1	BEGIN
 DELETE FROM BUP_XPFM_COMPAT_DB2.TABLE2
 WHERE BUP_XPFM_COMPAT_DB2.TABLE2.c13 = NEW.c13;
 END
@@ -6852,7 +6840,7 @@ BUP_XPFM_COMPAT_DB2	TRIGGER2	AFTER	INSER
 DELETE FROM BUP_XPFM_COMPAT_DB2.table1
 WHERE BUP_XPFM_COMPAT_DB2.table1.c13 = NEW.c13;
 END
-BUP_XPFM_COMPAT_DB2	TrigGer3	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	TaBle3	BEGIN
+bup_xpfm_compat_db2	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db2	TaBle3	BEGIN
 INSERT INTO BupXPfmCompat_db3.TaBle3 SET c13 = 52;
 END
 SHOW CREATE TRIGGER bup_xpfm_compat_db1.trigger1;
@@ -7333,8 +7321,6 @@ SELECT bup_xpfm_compat_db2.func1(5);
 bup_xpfm_compat_db2.func1(5)
 105
 SELECT BUP_XPFM_COMPAT_DB2.FUNC2(6);
-BUP_XPFM_COMPAT_DB2.FUNC2(6)
-132
 SELECT bup_xpfm_compat_db2.FUNC2(6);
 bup_xpfm_compat_db2.FUNC2(6)
 132
@@ -7351,8 +7337,6 @@ SELECT bupxpfmcompat_db3.FUNC2(9);
 bupxpfmcompat_db3.FUNC2(9)
 288
 SELECT BupXPfmCompat_db3.FuNc3(10);
-BupXPfmCompat_db3.FuNc3(10)
-330
 SELECT bupxpfmcompat_db3.FuNc3(10);
 bupxpfmcompat_db3.FuNc3(10)
 330
@@ -8817,8 +8801,6 @@ SELECT bup_xpfm_compat_db2.func1(5);
 bup_xpfm_compat_db2.func1(5)
 105
 SELECT BUP_XPFM_COMPAT_DB2.FUNC2(6);
-BUP_XPFM_COMPAT_DB2.FUNC2(6)
-132
 SELECT bup_xpfm_compat_db2.FUNC2(6);
 bup_xpfm_compat_db2.FUNC2(6)
 132
@@ -8835,8 +8817,6 @@ SELECT bupxpfmcompat_db3.FUNC2(9);
 bupxpfmcompat_db3.FUNC2(9)
 288
 SELECT BupXPfmCompat_db3.FuNc3(10);
-BupXPfmCompat_db3.FuNc3(10)
-330
 SELECT bupxpfmcompat_db3.FuNc3(10);
 bupxpfmcompat_db3.FuNc3(10)
 330
@@ -10301,8 +10281,6 @@ SELECT bup_xpfm_compat_db2.func1(5);
 bup_xpfm_compat_db2.func1(5)
 105
 SELECT BUP_XPFM_COMPAT_DB2.FUNC2(6);
-BUP_XPFM_COMPAT_DB2.FUNC2(6)
-132
 SELECT bup_xpfm_compat_db2.FUNC2(6);
 bup_xpfm_compat_db2.FUNC2(6)
 132
@@ -10319,8 +10297,6 @@ SELECT bupxpfmcompat_db3.FUNC2(9);
 bupxpfmcompat_db3.FUNC2(9)
 288
 SELECT BupXPfmCompat_db3.FuNc3(10);
-BupXPfmCompat_db3.FuNc3(10)
-330
 SELECT bupxpfmcompat_db3.FuNc3(10);
 bupxpfmcompat_db3.FuNc3(10)
 330
@@ -11193,15 +11169,15 @@ FROM INFORMATION_SCHEMA.VIEWS
 WHERE TABLE_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TABLE_SCHEMA), LOWER(TABLE_NAME);
 TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION
-BupXPfmCompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
-BupXPfmCompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
-BupXPfmCompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
+bupxpfmcompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
+bupxpfmcompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
+bupxpfmcompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
 bup_xpfm_compat_db1	view1	select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c1`,`bup_xpfm_compat_db1`.`table1`.`c48` AS `c2`,`bup_xpfm_compat_db1`.`table1`.`c13` in (select (`bup_xpfm_compat_db1`.`table1`.`c13` + 2) AS `c13+2` from `bup_xpfm_compat_db1`.`table1`) AS `c3`,`bup_xpfm_compat_db1`.`table1`.`c13` = all (select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c13` from `bup_xpfm_compat_db1`.`table1`) AS `c4` from `bup_xpfm_compat_db1`.`table1`
 bup_xpfm_compat_db1	view2	select `view1`.`c2` AS `c2`,`view1`.`c3` AS `c3` from `bup_xpfm_compat_db1`.`view1`
 bup_xpfm_compat_db1	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db1`.`view1`
-BUP_XPFM_COMPAT_DB2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
-BUP_XPFM_COMPAT_DB2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
-BUP_XPFM_COMPAT_DB2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
+bup_xpfm_compat_db2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
+bup_xpfm_compat_db2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
+bup_xpfm_compat_db2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
 SELECT ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_DEFINITION
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA like 'bup%xpfm%compat%'
@@ -11274,7 +11250,7 @@ FROM INFORMATION_SCHEMA.TRIGGERS
 WHERE TRIGGER_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TRIGGER_SCHEMA), LOWER(TRIGGER_NAME);
 TRIGGER_SCHEMA	TRIGGER_NAME	ACTION_TIMING	EVENT_MANIPULATION	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_STATEMENT
-BupXPfmCompat_db3	trigger1	AFTER	INSERT	BupXPfmCompat_db3	table1	BEGIN
+bupxpfmcompat_db3	trigger1	AFTER	INSERT	bupxpfmcompat_db3	table1	BEGIN
 DELETE FROM BupXPfmCompat_db3.TABLE2
 WHERE BupXPfmCompat_db3.TABLE2.c13 = NEW.c13;
 END
@@ -11282,7 +11258,7 @@ BupXPfmCompat_db3	TRIGGER2	AFTER	INSERT	
 DELETE FROM BupXPfmCompat_db3.table1
 WHERE BupXPfmCompat_db3.table1.c13 = NEW.c13;
 END
-BupXPfmCompat_db3	TrigGer3	AFTER	INSERT	BupXPfmCompat_db3	TaBle3	BEGIN
+bupxpfmcompat_db3	TrigGer3	AFTER	INSERT	bupxpfmcompat_db3	TaBle3	BEGIN
 INSERT INTO bup_xpfm_compat_db1.table1 SET c13 = 53;
 END
 bup_xpfm_compat_db1	trigger1	AFTER	INSERT	bup_xpfm_compat_db1	table1	BEGIN
@@ -11296,7 +11272,7 @@ END
 bup_xpfm_compat_db1	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db1	TaBle3	BEGIN
 INSERT INTO BUP_XPFM_COMPAT_DB2.TABLE2 SET c13 = 51;
 END
-BUP_XPFM_COMPAT_DB2	trigger1	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	table1	BEGIN
+bup_xpfm_compat_db2	trigger1	AFTER	INSERT	bup_xpfm_compat_db2	table1	BEGIN
 DELETE FROM BUP_XPFM_COMPAT_DB2.TABLE2
 WHERE BUP_XPFM_COMPAT_DB2.TABLE2.c13 = NEW.c13;
 END
@@ -11304,7 +11280,7 @@ BUP_XPFM_COMPAT_DB2	TRIGGER2	AFTER	INSER
 DELETE FROM BUP_XPFM_COMPAT_DB2.table1
 WHERE BUP_XPFM_COMPAT_DB2.table1.c13 = NEW.c13;
 END
-BUP_XPFM_COMPAT_DB2	TrigGer3	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	TaBle3	BEGIN
+bup_xpfm_compat_db2	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db2	TaBle3	BEGIN
 INSERT INTO BupXPfmCompat_db3.TaBle3 SET c13 = 52;
 END
 SHOW CREATE TRIGGER bup_xpfm_compat_db1.trigger1;
@@ -13265,8 +13241,6 @@ SELECT bup_xpfm_compat_db2.func1(5);
 bup_xpfm_compat_db2.func1(5)
 105
 SELECT BUP_XPFM_COMPAT_DB2.FUNC2(6);
-BUP_XPFM_COMPAT_DB2.FUNC2(6)
-132
 SELECT bup_xpfm_compat_db2.FUNC2(6);
 bup_xpfm_compat_db2.FUNC2(6)
 132
@@ -13283,8 +13257,6 @@ SELECT bupxpfmcompat_db3.FUNC2(9);
 bupxpfmcompat_db3.FUNC2(9)
 288
 SELECT BupXPfmCompat_db3.FuNc3(10);
-BupXPfmCompat_db3.FuNc3(10)
-330
 SELECT bupxpfmcompat_db3.FuNc3(10);
 bupxpfmcompat_db3.FuNc3(10)
 330
@@ -14157,15 +14129,15 @@ FROM INFORMATION_SCHEMA.VIEWS
 WHERE TABLE_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TABLE_SCHEMA), LOWER(TABLE_NAME);
 TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION
-BupXPfmCompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
-BupXPfmCompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
-BupXPfmCompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
+bupxpfmcompat_db3	view1	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` join `bup_xpfm_compat_db2`.`view2`) where (`view1`.`c1` = `view2`.`c1`)
+bupxpfmcompat_db3	view2	select `view1`.`c1` AS `c1`,`view2`.`c1` AS `c2` from (`bup_xpfm_compat_db1`.`view1` left join `bup_xpfm_compat_db2`.`view2` on((`view1`.`c1` = `view2`.`c1`)))
+bupxpfmcompat_db3	view3	select `view1`.`c1` AS `c1`,`view1`.`c2` AS `c2` from `bupxpfmcompat_db3`.`view1`
 bup_xpfm_compat_db1	view1	select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c1`,`bup_xpfm_compat_db1`.`table1`.`c48` AS `c2`,`bup_xpfm_compat_db1`.`table1`.`c13` in (select (`bup_xpfm_compat_db1`.`table1`.`c13` + 2) AS `c13+2` from `bup_xpfm_compat_db1`.`table1`) AS `c3`,`bup_xpfm_compat_db1`.`table1`.`c13` = all (select `bup_xpfm_compat_db1`.`table1`.`c13` AS `c13` from `bup_xpfm_compat_db1`.`table1`) AS `c4` from `bup_xpfm_compat_db1`.`table1`
 bup_xpfm_compat_db1	view2	select `view1`.`c2` AS `c2`,`view1`.`c3` AS `c3` from `bup_xpfm_compat_db1`.`view1`
 bup_xpfm_compat_db1	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db1`.`view1`
-BUP_XPFM_COMPAT_DB2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
-BUP_XPFM_COMPAT_DB2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
-BUP_XPFM_COMPAT_DB2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
+bup_xpfm_compat_db2	view1	select connection_id() AS `c1`,pi() AS `c2`,current_user() AS `c3`,rpad(version(),40,' ') AS `c4`
+bup_xpfm_compat_db2	view2	select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c1`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c2` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`) union all select `bup_xpfm_compat_db2`.`table2`.`c13` AS `c13`,`bup_xpfm_compat_db2`.`table2`.`c48` AS `c48` from (`bup_xpfm_compat_db2`.`table2` join `bup_xpfm_compat_db2`.`table3`)
+bup_xpfm_compat_db2	view3	select `view1`.`c3` AS `c3`,`view1`.`c4` AS `c4` from `bup_xpfm_compat_db2`.`view1`
 SELECT ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_DEFINITION
 FROM INFORMATION_SCHEMA.ROUTINES
 WHERE ROUTINE_SCHEMA like 'bup%xpfm%compat%'
@@ -14238,7 +14210,7 @@ FROM INFORMATION_SCHEMA.TRIGGERS
 WHERE TRIGGER_SCHEMA like 'bup%xpfm%compat%'
   ORDER BY LOWER(TRIGGER_SCHEMA), LOWER(TRIGGER_NAME);
 TRIGGER_SCHEMA	TRIGGER_NAME	ACTION_TIMING	EVENT_MANIPULATION	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_STATEMENT
-BupXPfmCompat_db3	trigger1	AFTER	INSERT	BupXPfmCompat_db3	table1	BEGIN
+bupxpfmcompat_db3	trigger1	AFTER	INSERT	bupxpfmcompat_db3	table1	BEGIN
 DELETE FROM BupXPfmCompat_db3.TABLE2
 WHERE BupXPfmCompat_db3.TABLE2.c13 = NEW.c13;
 END
@@ -14246,7 +14218,7 @@ BupXPfmCompat_db3	TRIGGER2	AFTER	INSERT	
 DELETE FROM BupXPfmCompat_db3.table1
 WHERE BupXPfmCompat_db3.table1.c13 = NEW.c13;
 END
-BupXPfmCompat_db3	TrigGer3	AFTER	INSERT	BupXPfmCompat_db3	TaBle3	BEGIN
+bupxpfmcompat_db3	TrigGer3	AFTER	INSERT	bupxpfmcompat_db3	TaBle3	BEGIN
 INSERT INTO bup_xpfm_compat_db1.table1 SET c13 = 53;
 END
 bup_xpfm_compat_db1	trigger1	AFTER	INSERT	bup_xpfm_compat_db1	table1	BEGIN
@@ -14260,7 +14232,7 @@ END
 bup_xpfm_compat_db1	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db1	TaBle3	BEGIN
 INSERT INTO BUP_XPFM_COMPAT_DB2.TABLE2 SET c13 = 51;
 END
-BUP_XPFM_COMPAT_DB2	trigger1	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	table1	BEGIN
+bup_xpfm_compat_db2	trigger1	AFTER	INSERT	bup_xpfm_compat_db2	table1	BEGIN
 DELETE FROM BUP_XPFM_COMPAT_DB2.TABLE2
 WHERE BUP_XPFM_COMPAT_DB2.TABLE2.c13 = NEW.c13;
 END
@@ -14268,7 +14240,7 @@ BUP_XPFM_COMPAT_DB2	TRIGGER2	AFTER	INSER
 DELETE FROM BUP_XPFM_COMPAT_DB2.table1
 WHERE BUP_XPFM_COMPAT_DB2.table1.c13 = NEW.c13;
 END
-BUP_XPFM_COMPAT_DB2	TrigGer3	AFTER	INSERT	BUP_XPFM_COMPAT_DB2	TaBle3	BEGIN
+bup_xpfm_compat_db2	TrigGer3	AFTER	INSERT	bup_xpfm_compat_db2	TaBle3	BEGIN
 INSERT INTO BupXPfmCompat_db3.TaBle3 SET c13 = 52;
 END
 SHOW CREATE TRIGGER bup_xpfm_compat_db1.trigger1;

=== modified file 'sql/si_objects.cc'
--- a/sql/si_objects.cc	2010-01-15 17:06:55 +0000
+++ b/sql/si_objects.cc	2010-02-08 20:05:22 +0000
@@ -2773,8 +2773,17 @@ Obj_iterator *get_db_triggers(THD *thd, 
   String_stream s_stream;
   s_stream <<
     "SELECT '" << db_name << "', trigger_name, event_object_table "
-    "FROM INFORMATION_SCHEMA.TRIGGERS "
-    "WHERE trigger_schema COLLATE utf8_bin = '" << db_name << "'";
+    "FROM INFORMATION_SCHEMA.TRIGGERS ";
+  /*
+    If this is a lctn2 system, force WHERE condition to use lower case names
+    for comparison. This is a deviation from the 6.0 code and is documented
+    as an aberation in BUG#50628. In the future, this code may be removed if
+    or when that bug is fixed.
+  */
+  if (lower_case_table_names == 2)
+    s_stream << "WHERE LOWER(trigger_schema) = LOWER('" << db_name << "')";
+  else
+    s_stream << "WHERE trigger_schema COLLATE utf8_bin = '" << db_name << "'";
 
   return create_row_set_iterator<Db_trigger_iterator>(thd, s_stream.lex_string());
 }


Attachment: [text/bzr-bundle] bzr/charles.bell@sun.com-20100208200522-79rz7ku8p2r2iinu.bundle
Thread
bzr commit into mysql-backup-backport branch (charles.bell:3084)Bug#50848Chuck Bell8 Feb