bzr push into mysql-6.0-falcon-team branch (svoj:2940 to 2941) Bug#35257

[Sergey Vojtovich]

 2941 Sergey Vojtovich	2008-12-17
      An addition to fix for
      BUG#35257 - Falcon: tablespace names are case sensitive
      
      Fixed a test case - Falcon tablespace names are now
      in upper case.
modified:
  mysql-test/suite/backup/r/backup_tablespace.result

 2940 Hakan Kuecuekyilmaz	2008-12-16 [merge]
      Automerge.
modified:
  storage/falcon/Table.cpp
  storage/falcon/Transaction.cpp
  storage/falcon/TransactionManager.cpp
  storage/falcon/ha_falcon.cpp

=== modified file 'mysql-test/suite/backup/r/backup_tablespace.result'
--- a/mysql-test/suite/backup/r/backup_tablespace.result	2008-10-13 12:37:10 +0000
+++ b/mysql-test/suite/backup/r/backup_tablespace.result	2008-12-17 10:04:27 +0000
@@ -50,7 +50,7 @@ DROP TABLESPACE bup_ts ENGINE=FALCON;
 CREATE TABLESPACE bup_ts ADD DATAFILE 'different.dat' ENGINE=FALCON;
 Now restore the database.
 RESTORE FROM 'backup_ts.bak';
-ERROR HY000: Tablespace `bup_ts` needed by tables being restored, but the current
tablespace definition differs from how it was when backup was made.
+ERROR HY000: Tablespace `BUP_TS` needed by tables being restored, but the current
tablespace definition differs from how it was when backup was made.
 Cleanup
 DROP DATABASE IF EXISTS backup_ts;
 DROP TABLESPACE bup_ts ENGINE=FALCON;