bzr commit into mysql-5.0 tree (MatthiasLeichmleich:2637) Bug#37164, Bug#37167

[MatthiasLeichmleich]

#At file:///work2/5.0/mysql-5.0-bugteam-funcs_1/

------------------------------------------------------------
revno: 2637
revision-id: mleich@stripped
parent: mleich@stripped
committer: Matthias Leich mleich@stripped
branch nick: mysql-5.0-bugteam-funcs_1
timestamp: Di 2008-06-10 18:22:15 +0200
message:
  Fix for
     Bug#37167 funcs_1: Many tests fail if the embedded server is used.
     Bug#37164 funcs_1: Some tests fail if an optional character set is missing.
  and some cleanup within the testsuite related to the fixes above.
  
  Details:
  - Remove the initial loading of data from tests if these data
    are not somewhere retrieved
  - Remove any use of columns with attribute unicode 
    (-> UCS2 is no more needed) from tests where unicode
    properties are not checked or somehow required
  - Create a separate branch of the Character maximum length test
    (CML). If UCS2 is available than this test gets applied to
    every available type of string column with attribute unicode 
    This prevents any loss of coverage by the points above.
  - Disable the execution of is_tables_ndb which gives wrong
    results because of a bug. Correct the exepected results of
    this test.
  - In case of tests failing when applied to the embedded server
      1) Create a variant of this test for the embedded server
    or
      2) Skip the test in case of embedded server
    depending on purpose and complexity of test.
added:
  mysql-test/suite/funcs_1/datadict/is_key_column_usage.inc
is_key_column_usage.-20080610154057-nlcz26syz395f8ql-1
  mysql-test/suite/funcs_1/datadict/is_routines.inc
is_routines.inc-20080610155257-ifvp1hcqvpcw3xft-1
  mysql-test/suite/funcs_1/datadict/is_schemata.inc
is_schemata.inc-20080610155257-ifvp1hcqvpcw3xft-2
  mysql-test/suite/funcs_1/datadict/is_tables.inc
is_tables.inc-20080610155257-ifvp1hcqvpcw3xft-3
  mysql-test/suite/funcs_1/datadict/is_triggers.inc
is_triggers.inc-20080610155257-ifvp1hcqvpcw3xft-4
  mysql-test/suite/funcs_1/datadict/is_views.inc
is_views.inc-20080610154029-j00kwf4u23akuz9b-1
  mysql-test/suite/funcs_1/datadict/tables.inc
tables.inc-20080610153959-v6obzdd8yueo32ki-1
  mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
is_columns_is_embedd-20080610155427-v2x7o7jx9zwajsqy-1
  mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
is_columns_myisam_em-20080610155427-v2x7o7jx9zwajsqy-2
  mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
is_columns_mysql_emb-20080610155427-v2x7o7jx9zwajsqy-3
  mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result
is_key_column_usage_-20080610155427-v2x7o7jx9zwajsqy-4
  mysql-test/suite/funcs_1/r/is_routines_embedded.result
is_routines_embedded-20080610155427-v2x7o7jx9zwajsqy-5
  mysql-test/suite/funcs_1/r/is_schemata_embedded.result
is_schemata_embedded-20080610155427-v2x7o7jx9zwajsqy-6
  mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
is_statistics_mysql_-20080610155427-v2x7o7jx9zwajsqy-7
  mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result
is_table_constraints-20080610155427-v2x7o7jx9zwajsqy-8
  mysql-test/suite/funcs_1/r/is_tables_embedded.result
is_tables_embedded.r-20080610155427-v2x7o7jx9zwajsqy-9
  mysql-test/suite/funcs_1/r/is_tables_myisam_embedded.result
is_tables_myisam_emb-20080610155427-v2x7o7jx9zwajsqy-10
  mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
is_tables_mysql_embe-20080610155427-v2x7o7jx9zwajsqy-11
  mysql-test/suite/funcs_1/r/is_triggers_embedded.result
is_triggers_embedded-20080610155427-v2x7o7jx9zwajsqy-12
  mysql-test/suite/funcs_1/r/is_views_embedded.result
is_views_embedded.re-20080610155427-v2x7o7jx9zwajsqy-13
  mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
is_columns_is_embedd-20080610155412-65fe0xpdy4vgyr3i-1
  mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test
is_columns_myisam_em-20080610155412-65fe0xpdy4vgyr3i-2
  mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test
is_columns_mysql_emb-20080610155412-65fe0xpdy4vgyr3i-3
  mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test
is_key_column_usage_-20080610155412-65fe0xpdy4vgyr3i-4
  mysql-test/suite/funcs_1/t/is_routines_embedded.test
is_routines_embedded-20080610155412-65fe0xpdy4vgyr3i-5
  mysql-test/suite/funcs_1/t/is_schemata_embedded.test
is_schemata_embedded-20080610155412-65fe0xpdy4vgyr3i-6
  mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test
is_statistics_mysql_-20080610155412-65fe0xpdy4vgyr3i-7
  mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test
is_table_constraints-20080610155412-65fe0xpdy4vgyr3i-8
  mysql-test/suite/funcs_1/t/is_tables_embedded.test
is_tables_embedded.t-20080610155412-65fe0xpdy4vgyr3i-9
  mysql-test/suite/funcs_1/t/is_tables_myisam_embedded.test
is_tables_myisam_emb-20080610155412-65fe0xpdy4vgyr3i-10
  mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test
is_tables_mysql_embe-20080610155412-65fe0xpdy4vgyr3i-11
  mysql-test/suite/funcs_1/t/is_triggers_embedded.test
is_triggers_embedded-20080610155412-65fe0xpdy4vgyr3i-12
  mysql-test/suite/funcs_1/t/is_views_embedded.test
is_views_embedded.te-20080610155412-65fe0xpdy4vgyr3i-13
modified:
  mysql-test/suite/funcs_1/datadict/columns.inc
sp1f-columns.inc-20080307163305-z5fe3rsuxgodb7vdv4inxhsgx2crdll3
  mysql-test/suite/funcs_1/datadict/tables1.inc
sp1f-tables1.inc-20080307163305-s6gzaiievmm4owpzuqj47yif53p5yftw
  mysql-test/suite/funcs_1/datadict/tables2.inc
sp1f-tables2.inc-20080307163305-ao7hz2ott2tj4o2kkqjc2gc24niwcd5u
  mysql-test/suite/funcs_1/include/innodb_tb1.inc
sp1f-innodb_tb1.inc-20070206175435-dbhgpmvh3jvpjycnat6rnhcadtkbbz3t
  mysql-test/suite/funcs_1/include/innodb_tb3.inc
sp1f-innodb_tb3.inc-20070206175435-226s3vpm7hwqyfqfmlgzunwuabt2vjlh
  mysql-test/suite/funcs_1/include/innodb_tb4.inc
sp1f-innodb_tb4.inc-20070206175435-3ea4nbjs2navylp4tmvdp6qirkhu5p7j
  mysql-test/suite/funcs_1/include/memory_tb4.inc
sp1f-memory_tb4.inc-20070206175435-upp4xio5f63ns35tmigesipt2yywz6jf
  mysql-test/suite/funcs_1/include/myisam_tb1.inc
sp1f-myisam_tb1.inc-20070206175435-ppvqzhwj4urfshvsx3ima2aiolt6u3ul
  mysql-test/suite/funcs_1/include/myisam_tb3.inc
sp1f-myisam_tb3.inc-20070206175435-46ozmsyoeusi6vqkhzhowmiyzh7iqxd5
  mysql-test/suite/funcs_1/include/myisam_tb4.inc
sp1f-myisam_tb4.inc-20070206175435-avrt3lfdhhz2djc5yrzaqerbhaaqc73a
  mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
sp1f-innodb_trig_frkey.re-20070206175436-dsfxk5e5qw7igoylrhnmbrfa5y6ay5dq
  mysql-test/suite/funcs_1/r/is_columns_innodb.result
sp1f-is_columns_innodb.re-20080307163304-7nvpqbmjf5zbzojk4qdiaynstw3y3j2g
  mysql-test/suite/funcs_1/r/is_columns_memory.result
sp1f-is_columns_memory.re-20080307163304-w4pvmhlppwq7353yai3dn4grdmlhelnx
  mysql-test/suite/funcs_1/r/is_columns_myisam.result
sp1f-is_columns_myisam.re-20080307163304-yilcnout3bbyjf6a6axasqktx5uraj7v
  mysql-test/suite/funcs_1/r/is_tables_innodb.result
sp1f-is_tables_innodb.res-20080307163304-54jwsyg4phs6uxdi7hxmg456xc4g3wiq
  mysql-test/suite/funcs_1/r/is_tables_is.result
sp1f-is_tables_is.result-20080307163304-6xl5vbegso6wet3dzoehxb645vntxpig
  mysql-test/suite/funcs_1/r/is_tables_memory.result
sp1f-is_tables_memory.res-20080307163304-xbkbbqpb3cmhqlf3yavzgjubmtzcqiwu
  mysql-test/suite/funcs_1/r/is_tables_myisam.result
sp1f-is_tables_myisam.res-20080307163304-e4a7cotuvanfvlzekx7hbwyhb5f2gk73
  mysql-test/suite/funcs_1/r/is_tables_mysql.result
sp1f-is_tables_mysql.resu-20080307163304-uuf3e2hr4j4mfefd7ticnk564tguxpnq
  mysql-test/suite/funcs_1/r/is_tables_ndb.result
sp1f-is_tables_ndb.result-20080307163304-unqw2ogbf6mofodourgduawt5bo4z23u
  mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
sp1f-storedproc_06.inc-20070206175437-c7xqg62jkkref7qpcatb4e55xbbsho2a
  mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
sp1f-storedproc_10.inc-20070206175437-2llraij5epdgtaq77iaisyp4mp5zvuyh
  mysql-test/suite/funcs_1/t/disabled.def
sp1f-disabled.def-20070206175437-omhbgzpxfjoru23leqkxfztodlmdl4af
  mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
sp1f-innodb_trig_frkey.te-20070206175438-dgw564ulwjqa3np5kqwz4fyb3jmceh5t
  mysql-test/suite/funcs_1/t/is_basics_mixed.test
sp1f-is_basics_mixed.test-20080307163303-2oztqto5drasm5vyg5fyh3g56she4g2m
  mysql-test/suite/funcs_1/t/is_column_privileges.test
sp1f-is_column_privileges-20080307163303-keh233ljpco5rbvthqlvqn6htu3rwoul
  mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test
sp1f-is_column_privileges-20080307163303-qsrajwvnttvdrmet6qbemglnyjnv5zzw
  mysql-test/suite/funcs_1/t/is_columns.test
sp1f-is_columns.test-20080307163303-oc6d2ty4yotleyggin56cmja47omykqf
  mysql-test/suite/funcs_1/t/is_columns_innodb.test
sp1f-is_columns_innodb.te-20080307163303-ydhchvgdgr7tz52bxhm73ccve5epvt3s
  mysql-test/suite/funcs_1/t/is_columns_is.test
sp1f-is_columns_is.test-20080307163303-projhl5aviz6wflvnkcoukmxy6nra32g
  mysql-test/suite/funcs_1/t/is_columns_memory.test
sp1f-is_columns_memory.te-20080307163303-3s7f5zel2pwihh3nqizpkc4muhwdasuy
  mysql-test/suite/funcs_1/t/is_columns_myisam.test
sp1f-is_columns_myisam.te-20080307163303-6xhvptc257jg7y6u3bffwjyhudfwcfv2
  mysql-test/suite/funcs_1/t/is_columns_mysql.test
sp1f-is_columns_mysql.tes-20080307163303-4c42lnhewccbri2xpvxd73k6xpmn6wk2
  mysql-test/suite/funcs_1/t/is_columns_ndb.test
sp1f-is_columns_ndb.test-20080307163303-jrfiypvi6yqiqvfm5g2th4ct2ap74o7r
  mysql-test/suite/funcs_1/t/is_key_column_usage.test
sp1f-is_key_column_usage.-20080307163303-g6lnlxtwlx5rb2lfoj4zwixuygtjgtl7
  mysql-test/suite/funcs_1/t/is_routines.test
sp1f-is_routines.test-20080307163303-yfrnfl6aslpuumbfiwue4p365bsybjiw
  mysql-test/suite/funcs_1/t/is_schema_privileges.test
sp1f-is_schema_privileges-20080307163303-eugcpzkateacqmjqqycvpggpr7eishuu
  mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
sp1f-is_schema_privileges-20080307163303-zcqapeo6rdvz4paumijy7hmxqrcipjra
  mysql-test/suite/funcs_1/t/is_schemata.test
sp1f-is_schemata.test-20080307163303-54pnt42gy4hjdz7jfow7tksaawj4j6gl
  mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test
sp1f-is_schemata_is_mysql-20080307163303-ixnetelefdvudzhgpsfopoa4ny35vm6c
  mysql-test/suite/funcs_1/t/is_statistics.test
sp1f-is_statistics.test-20080307163303-dbmzsieluhz42cagud4wnzgausim6ei4
  mysql-test/suite/funcs_1/t/is_statistics_mysql.test
sp1f-is_statistics_mysql.-20080307163303-numoc7si6lwk2nxc7h6nywbjs5h6wh2t
  mysql-test/suite/funcs_1/t/is_table_constraints.test
sp1f-is_table_constraints-20080307163303-vcivq6dpe2t2frgih6r7hcxegob557er
  mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test
sp1f-is_table_constraints-20080307163303-l6pipblq3xd46ammvhmnj5j5x2jyt6ah
  mysql-test/suite/funcs_1/t/is_table_privileges.test
sp1f-is_table_privileges.-20080307163303-2ypv6eleg6mhm3sq27ghvief5q6kh4qo
  mysql-test/suite/funcs_1/t/is_tables.test
sp1f-is_tables.test-20080307163304-ztatzhai44munfzegibcmjpp2qksanih
  mysql-test/suite/funcs_1/t/is_tables_innodb.test
sp1f-is_tables_innodb.tes-20080307163304-mlacutwl76d6qzw452fxxijizyl2ne5q
  mysql-test/suite/funcs_1/t/is_tables_memory.test
sp1f-is_tables_memory.tes-20080307163304-55qlmh6jhk2mck6letlks2hxgkgeknw2
  mysql-test/suite/funcs_1/t/is_tables_myisam.test
sp1f-is_tables_myisam.tes-20080307163304-l63n4ojzbywi5cwj2riqkfb5p66e3ql3
  mysql-test/suite/funcs_1/t/is_tables_mysql.test
sp1f-is_tables_mysql.test-20080307163304-42vrqq7pnz4rikmjvmlez5db2ouhi6p4
  mysql-test/suite/funcs_1/t/is_tables_ndb.test
sp1f-is_tables_ndb.test-20080307163304-d66dufq3pvwyeu5enhytsdjiqudlmhno
  mysql-test/suite/funcs_1/t/is_triggers.test
sp1f-is_triggers.test-20080307163304-wyea7aw7hg2dgwbuotbivvq2b7c3ww5k
  mysql-test/suite/funcs_1/t/is_user_privileges.test
sp1f-is_user_privileges.t-20080307163304-3z62hmj34bfvetpdgcjchxgwplpzamkn
  mysql-test/suite/funcs_1/t/is_views.test
sp1f-is_views.test-20080307163304-qqycf44pn24qw6utbuodxwblnutvv643
  mysql-test/suite/funcs_1/triggers/trig_frkey.inc
sp1f-trig_frkey.inc-20070206175439-s6yywz4idr664fal4r36b5avem7hvq3x
  mysql-test/suite/funcs_1/triggers/triggers_03.inc
sp1f-triggers_03.inc-20070206175439-xg3hkddw3jqmctyrsxwrxp5rutis24zo
  mysql-test/suite/funcs_1/views/func_view.inc
sp1f-func_view.inc-20070206175439-2khajzogmehxdksl4yhgbs3l65nofqb4
  mysql-test/suite/funcs_1/views/views_master.inc
sp1f-views_master.inc-20070206175440-b5nt3ii7bl6bewe5lefiyqghwdhssryz

Attachment: [text/text/x-diff] patch-2637.diff