bzr commit into mysql-6.0-backup branch (Rafal.Somla:2829)

[Rafal Somla]

#At file:///ext/mysql/bzr/mysql-6.0-backup/ based on revid:jorgen.loland@stripped

 2829 Rafal Somla	2009-06-23
      This patch re-enables backup_object_coverage test after removing any
      references to tablespaces and Falcon engine.
     @ mysql-test/suite/backup_extra/include/check-objects.sql
        - Split table and view columns to be able to disable COLUMN_DEFAULT for views.
        - Fix query output order.
     @ mysql-test/suite/backup_extra/include/objects.grammar
        Remove tablespaces from the grammar.
     @ mysql-test/suite/backup_extra/t/backup_object_coverage.test
        - Remove tablespaces.
        - Disable fkey checks when dropping databases.

    modified:
      mysql-test/suite/backup_extra/include/check-objects.sql
      mysql-test/suite/backup_extra/include/objects.grammar
      mysql-test/suite/backup_extra/t/backup_object_coverage.test
=== modified file 'mysql-test/suite/backup_extra/include/check-objects.sql'
--- a/mysql-test/suite/backup_extra/include/check-objects.sql	2009-05-04 05:27:25 +0000
+++ b/mysql-test/suite/backup_extra/include/check-objects.sql	2009-06-23 09:48:26 +0000
@@ -54,28 +54,67 @@ ORDER BY table_schema, table_name;
 SELECT '# table columns' AS '####';
 
 SELECT 
-  TABLE_CATALOG,
-  TABLE_SCHEMA,
-  TABLE_NAME,
-  COLUMN_NAME,
-  ORDINAL_POSITION,
-  COLUMN_DEFAULT,
-  IS_NULLABLE,
-  DATA_TYPE,
-  CHARACTER_MAXIMUM_LENGTH,
-  CHARACTER_OCTET_LENGTH,
-  NUMERIC_PRECISION,
-  NUMERIC_SCALE,
-  CHARACTER_SET_NAME,
-  COLLATION_NAME,
-  COLUMN_TYPE,
-  COLUMN_KEY,
-  EXTRA,
-  PRIVILEGES,
-  COLUMN_COMMENT,
-  STORAGE,
-  FORMAT
-FROM columns WHERE table_schema LIKE 'db%'
+  c.TABLE_CATALOG,
+  c.TABLE_SCHEMA,
+  c.TABLE_NAME,
+  c.COLUMN_NAME,
+  c.ORDINAL_POSITION,
+  c.COLUMN_DEFAULT,
+  c.IS_NULLABLE,
+  c.DATA_TYPE,
+  c.CHARACTER_MAXIMUM_LENGTH,
+  c.CHARACTER_OCTET_LENGTH,
+  c.NUMERIC_PRECISION,
+  c.NUMERIC_SCALE,
+  c.CHARACTER_SET_NAME,
+  c.COLLATION_NAME,
+  c.COLUMN_TYPE,
+  c.COLUMN_KEY,
+  c.EXTRA,
+  c.PRIVILEGES,
+  c.COLUMN_COMMENT,
+  c.STORAGE,
+  c.FORMAT
+FROM columns as c, tables as t 
+WHERE c.table_schema LIKE 'db%'
+      AND c.table_schema = t.table_schema
+      AND c.table_name = t.table_name
+      AND t.table_type = 'BASE_TABLE'
+ORDER BY table_schema, table_name, ordinal_position;
+
+#
+# In some cases column's default value is not correctly reported 
+# for restored views: see BUG#45669.
+# 
+SELECT '# view columns' AS '####';
+
+SELECT 
+  c.TABLE_CATALOG,
+  c.TABLE_SCHEMA,
+  c.TABLE_NAME,
+  c.COLUMN_NAME,
+  c.ORDINAL_POSITION,
+#  c.COLUMN_DEFAULT,    # BUG#45669
+  c.IS_NULLABLE,
+  c.DATA_TYPE,
+  c.CHARACTER_MAXIMUM_LENGTH,
+  c.CHARACTER_OCTET_LENGTH,
+  c.NUMERIC_PRECISION,
+  c.NUMERIC_SCALE,
+  c.CHARACTER_SET_NAME,
+  c.COLLATION_NAME,
+  c.COLUMN_TYPE,
+  c.COLUMN_KEY,
+  c.EXTRA,
+  c.PRIVILEGES,
+  c.COLUMN_COMMENT,
+  c.STORAGE,
+  c.FORMAT
+FROM columns as c, tables as t 
+WHERE c.table_schema LIKE 'db%'
+      AND c.table_schema = t.table_schema
+      AND c.table_name = t.table_name
+      AND t.table_type = 'VIEW'
 ORDER BY table_schema, table_name, ordinal_position;
 
 SELECT '# views' AS '####';
@@ -247,7 +286,7 @@ SELECT
   REFERENCED_TABLE_NAME,
   REFERENCED_COLUMN_NAME
 FROM key_column_usage WHERE table_schema LIKE 'db%'
-ORDER BY table_schema, table_name, column_name, ordinal_position;
+ORDER BY table_schema, table_name, column_name, constraint_name, ordinal_position;
 
 SELECT
   CONSTRAINT_CATALOG,

=== modified file 'mysql-test/suite/backup_extra/include/objects.grammar'
--- a/mysql-test/suite/backup_extra/include/objects.grammar	2009-05-04 05:27:25 +0000
+++ b/mysql-test/suite/backup_extra/include/objects.grammar	2009-06-23 09:48:26 +0000
@@ -24,11 +24,10 @@
 #
 # - users usr0, ..., usr9.
 # - databases db0, ..., db9.
-# - falcon tablespaces ts0,..,ts3;
 #
 # They also assume that the server contains:
 #
-# - storage engines: MyISAM, Falcon, InnoDB, Memory, Archive, CSV and Blackhole;
+# - storage engines: MyISAM, InnoDB, Memory, Archive, CSV and Blackhole;
 # - character sets: ucs2, utf8, utf16, ascii, latin2, macce, cp1256, greek, 
 #                   hebrew, latin5, latin7, cp866, koi8r, big5, gbk, ujis;
 #
@@ -46,6 +45,9 @@
 #
 # Also, procedures, functions, triggers and events have trivial bodies only.
 #
+# Grammar rules related to tablespaces are commented-out because currently
+# user defined tablespaces are not supported in the server.
+#
 
 ############################################################################
 # Global settings and initialization.
@@ -55,7 +57,7 @@
 # @storage_engines array.
 #
 query_init: 
- { @storage_engines= (MyISAM, Falcon, InnoDB, Memory, CSV, Blackhole); undef }
+ { @storage_engines= (MyISAM, InnoDB, Memory, CSV, Blackhole); undef }
  { @charsets= (ucs2, utf8, utf16, ascii, latin2, macce, cp1256, greek, hebrew, latin5, latin7, cp866, koi8r, big5, gbk, ujis); undef }
    GRANT SELECT, CREATE, CREATE VIEW, CREATE ROUTINE ON *.* TO usr0
  ; GRANT SELECT, CREATE, CREATE VIEW, CREATE ROUTINE ON *.* TO usr1
@@ -107,7 +109,7 @@ routine_ref: func_ref | proc_ref ;
 #
 db: { $db_num= $prng->int(0,9); $db= "db$db_num" } ;
 user: { $usr_num= $prng->int(0,9); $user= "usr$usr_num" } ;
-tablespace: { $ts_num= $prng->int(0,3); $ts= "ts$ts_num" } ;
+#tablespace: { $ts_num= $prng->int(0,3); $ts= "ts$ts_num" } ;
 charset_name: { $charset= $prng->arrayElement([@charsets]) } ;
 collation_name: { "${charset}_bin" } ;
 storage_engine: { $se= $ti->{engine}= $prng->arrayElement([@storage_engines]) } ;
@@ -202,7 +204,7 @@ alter_table_spec: 
   | secondary_key 
   | default_value 
 #  | partition_options  #TODO
-  | set_tablespace
+#  | set_tablespace
   | table_ref table_option 
 ;
 

=== modified file 'mysql-test/suite/backup_extra/t/backup_object_coverage.test'
--- a/mysql-test/suite/backup_extra/t/backup_object_coverage.test	2009-05-04 05:27:25 +0000
+++ b/mysql-test/suite/backup_extra/t/backup_object_coverage.test	2009-06-23 09:48:26 +0000
@@ -20,7 +20,6 @@
 #
 
 --source include/have_innodb.inc
---source include/have_falcon.inc
 --source include/have_rqg.inc
 
 let $query_count= 10000; # number of CREATE statements to generate 
@@ -68,11 +67,6 @@ CREATE DATABASE db7;
 CREATE DATABASE db8;
 CREATE DATABASE db9;
 
-CREATE TABLESPACE ts0 ADD DATAFILE 'ts0.data' ENGINE = Falcon;
-CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.data' ENGINE = Falcon;
-CREATE TABLESPACE ts2 ADD DATAFILE 'ts2.data' ENGINE = Falcon;
-CREATE TABLESPACE ts3 ADD DATAFILE 'ts3.data' ENGINE = Falcon;
-
 #################
 --echo #
 --echo #  Start of test
@@ -97,6 +91,11 @@ CREATE TABLESPACE ts3 ADD DATAFILE 'ts3.
 BACKUP DATABASE db0, db1, db2, db3, db4, db5, db6, db7, db8, db9 TO 'boc.bkp';
 
 --echo # 5. drop databases
+#
+# Temporarily disable fkey constraint checks because they can be violated 
+# when databases are dropped.
+#
+SET foreign_key_checks=0;
 DROP DATABASE db0; 
 DROP DATABASE db1;
 DROP DATABASE db2; 
@@ -107,6 +106,7 @@ DROP DATABASE db6;
 DROP DATABASE db7;
 DROP DATABASE db8;
 DROP DATABASE db9;
+SET foreign_key_checks=1;
 
 --echo # 6. restore from backup image
 RESTORE FROM 'boc.bkp';
@@ -153,9 +153,4 @@ DROP DATABASE db7;
 DROP DATABASE db8;
 DROP DATABASE db9;
 
-DROP TABLESPACE ts0 ENGINE = Falcon;
-DROP TABLESPACE ts1 ENGINE = Falcon;
-DROP TABLESPACE ts2 ENGINE = Falcon;
-DROP TABLESPACE ts3 ENGINE = Falcon;
-
 --exit


Attachment: [text/bzr-bundle] bzr/[e-mail]