List:Commits« Previous MessageNext Message »
From:Marc Alff Date:July 7 2008 10:00pm
Subject:bzr push into mysql-5.0 tree (marc.alff:2645 to 2645) Bug#30563
View as plain text  
------------------------------------------------------------
revno: 2645
revision-id: marc.alff@stripped
parent: marc.alff@stripped
parent: chad@stripped
committer: Marc Alff <marc.alff@stripped>
branch nick: mysql-5.0-26030
timestamp: Mon 2008-07-07 13:59:07 -0600
message:
  Merge
modified:
  mysql-test/include/have_archive.inc
sp1f-have_archive.inc-20040525194737-y4dmzku2drx4axo3jj4crhl5w7q7iiee
  mysql-test/include/have_bdb.inc
sp1f-have_bdb.inc-20001227013105-mu5cxige5b2f4imsv2ssex36t2junk5o
  mysql-test/include/have_big5.inc
sp1f-have_big5.inc-20031224125944-5tkectrdy42o4sp27tc264vbtsbsp5zk
  mysql-test/include/have_blackhole.inc
sp1f-have_blackhole.inc-20050323001036-3jxeejqyoix6dpttshyi3jeryqgpooir
  mysql-test/include/have_case_sensitive_file_system.inc
sp1f-have_case_sensitive_-20060504065503-xptfsecuke5rlv6udm4ekadrhqqvcnnx
  mysql-test/include/have_compress.inc
sp1f-have_compress.inc-20030410005021-njgg6a7oquvfrivtxbgw52jil6wqvjj7
  mysql-test/include/have_cp1250_ch.inc
sp1f-have_cp1250_ch.inc-20050303101530-hgs6b3lnqann3p7ezzu2oork2bt4c73e
  mysql-test/include/have_cp932.inc
sp1f-have_cp932.inc-20050201103742-esjnhrejoad6u7kin5dcrqhy3cp6cjkv
  mysql-test/include/have_crypt.inc
sp1f-have_crypt.inc-20030128063823-w7dzdgugtv7agyrien2f6sembnqf34ki
  mysql-test/include/have_csv.inc
sp1f-have_csv.inc-20040813035428-w2b3gagsm3lfvmbd732lii7yvqi43ekc
  mysql-test/include/have_eucjpms.inc
sp1f-have_eucjpms.inc-20050201103743-twgzhhnrnqlyk22if43qv5pp6x6mhh3j
  mysql-test/include/have_euckr.inc
sp1f-have_euckr.inc-20051209123331-7j7l35wk7rqbeilf5h2llsgozan57mps
  mysql-test/include/have_exampledb.inc
sp1f-have_exampledb.inc-20040814001331-foxu3jwldzsro54gptl7zst3czglytrj
  mysql-test/include/have_federated_db.inc
sp1f-have_federated_db.in-20041211200116-6vsirzjnw3te4kahmtywdbkqlhy4kmes
  mysql-test/include/have_gb2312.inc
sp1f-have_gb2312.inc-20051209123331-r3djrxfcjo25jhnahmhfpnb5exjh45rw
  mysql-test/include/have_gbk.inc
sp1f-have_gbk.inc-20050722160355-sjecbg3iondw577wdombapw2jo4xnvku
  mysql-test/include/have_geometry.inc
sp1f-have_geometry.inc-20040527153127-b6ftjxs6dm3wyzfjvvhq5mxrkf66nuls
  mysql-test/include/have_innodb.inc
sp1f-have_innobase.inc-20010112144027-m7j2l7rwqewdpugmkwq5nkpcxx7tvweb
  mysql-test/include/have_latin2_ch.inc
sp1f-have_latin2_ch.inc-20060320122819-24bzpko4oaio3gzcxwqxph366tvvcjhb
  mysql-test/include/have_log_bin.inc
sp1f-have_log_bin.inc-20070514123848-agt6xmmfof6c7xqzuz3pb2huybwua5j5
  mysql-test/include/have_lowercase0.inc
sp1f-have_lowercase0.inc-20050818184753-5hr5h7dbooixey5u3zn6qjvl4t6btvdq
  mysql-test/include/have_multi_ndb.inc
sp1f-have_multi_ndb.inc-20050307085452-uck5le2dkc4p6fsvb2s5wmzmcxvu3fvp
  mysql-test/include/have_ndb.inc
sp1f-have_ndb.inc-20040415091459-pytgw6q4edqnevluroaxsv6fsywtyljf
  mysql-test/include/have_query_cache.inc
sp1f-have_query_cache.inc-20020322205505-kc3o7uzgw4xnuu3qrlacp5xh7pza6exx
  mysql-test/include/have_sjis.inc
sp1f-have_sjis.inc-20040325102937-o7cuiclffpte3ihjypzjt3ddqzkwftpg
  mysql-test/include/have_ssl.inc
sp1f-have_ssl.inc-20010831212155-3qqpwe7dttrbcnqqyicfjurswzmnwgwq
  mysql-test/include/have_tis620.inc
sp1f-have_tis620.inc-20031225161058-e77xn25ogqkblhtwdursdputw3ab4bek
  mysql-test/include/have_ucs2.inc
sp1f-have_ucs2.inc-20030523101002-dylfpt3tlwxfx3fomq4nuxs23v32bkk5
  mysql-test/include/have_udf.inc
sp1f-have_udf.inc-20060215161119-xf74h7vjdqy73koybl4szdso2mj6cr5n
  mysql-test/include/have_ujis.inc
sp1f-have_ujis.inc-20030523101003-tlztpr4vjkmdr665l2xwom3sf4onqy5b
    ------------------------------------------------------------
    revno: 2643.1.1
    revision-id: chad@stripped
    parent: timothy.smith@stripped
    parent: chad@stripped
    committer: Chad MILLER <chad@stripped>
    branch nick: mysql-5.0-bugteam
    timestamp: Fri 2008-07-04 13:30:26 -0400
    message:
      Merge bug.
    modified:
      mysql-test/include/have_archive.inc
sp1f-have_archive.inc-20040525194737-y4dmzku2drx4axo3jj4crhl5w7q7iiee
      mysql-test/include/have_bdb.inc
sp1f-have_bdb.inc-20001227013105-mu5cxige5b2f4imsv2ssex36t2junk5o
      mysql-test/include/have_big5.inc
sp1f-have_big5.inc-20031224125944-5tkectrdy42o4sp27tc264vbtsbsp5zk
      mysql-test/include/have_blackhole.inc
sp1f-have_blackhole.inc-20050323001036-3jxeejqyoix6dpttshyi3jeryqgpooir
      mysql-test/include/have_case_sensitive_file_system.inc
sp1f-have_case_sensitive_-20060504065503-xptfsecuke5rlv6udm4ekadrhqqvcnnx
      mysql-test/include/have_compress.inc
sp1f-have_compress.inc-20030410005021-njgg6a7oquvfrivtxbgw52jil6wqvjj7
      mysql-test/include/have_cp1250_ch.inc
sp1f-have_cp1250_ch.inc-20050303101530-hgs6b3lnqann3p7ezzu2oork2bt4c73e
      mysql-test/include/have_cp932.inc
sp1f-have_cp932.inc-20050201103742-esjnhrejoad6u7kin5dcrqhy3cp6cjkv
      mysql-test/include/have_crypt.inc
sp1f-have_crypt.inc-20030128063823-w7dzdgugtv7agyrien2f6sembnqf34ki
      mysql-test/include/have_csv.inc
sp1f-have_csv.inc-20040813035428-w2b3gagsm3lfvmbd732lii7yvqi43ekc
      mysql-test/include/have_eucjpms.inc
sp1f-have_eucjpms.inc-20050201103743-twgzhhnrnqlyk22if43qv5pp6x6mhh3j
      mysql-test/include/have_euckr.inc
sp1f-have_euckr.inc-20051209123331-7j7l35wk7rqbeilf5h2llsgozan57mps
      mysql-test/include/have_exampledb.inc
sp1f-have_exampledb.inc-20040814001331-foxu3jwldzsro54gptl7zst3czglytrj
      mysql-test/include/have_federated_db.inc
sp1f-have_federated_db.in-20041211200116-6vsirzjnw3te4kahmtywdbkqlhy4kmes
      mysql-test/include/have_gb2312.inc
sp1f-have_gb2312.inc-20051209123331-r3djrxfcjo25jhnahmhfpnb5exjh45rw
      mysql-test/include/have_gbk.inc
sp1f-have_gbk.inc-20050722160355-sjecbg3iondw577wdombapw2jo4xnvku
      mysql-test/include/have_geometry.inc
sp1f-have_geometry.inc-20040527153127-b6ftjxs6dm3wyzfjvvhq5mxrkf66nuls
      mysql-test/include/have_innodb.inc
sp1f-have_innobase.inc-20010112144027-m7j2l7rwqewdpugmkwq5nkpcxx7tvweb
      mysql-test/include/have_latin2_ch.inc
sp1f-have_latin2_ch.inc-20060320122819-24bzpko4oaio3gzcxwqxph366tvvcjhb
      mysql-test/include/have_log_bin.inc
sp1f-have_log_bin.inc-20070514123848-agt6xmmfof6c7xqzuz3pb2huybwua5j5
      mysql-test/include/have_lowercase0.inc
sp1f-have_lowercase0.inc-20050818184753-5hr5h7dbooixey5u3zn6qjvl4t6btvdq
      mysql-test/include/have_multi_ndb.inc
sp1f-have_multi_ndb.inc-20050307085452-uck5le2dkc4p6fsvb2s5wmzmcxvu3fvp
      mysql-test/include/have_ndb.inc
sp1f-have_ndb.inc-20040415091459-pytgw6q4edqnevluroaxsv6fsywtyljf
      mysql-test/include/have_query_cache.inc
sp1f-have_query_cache.inc-20020322205505-kc3o7uzgw4xnuu3qrlacp5xh7pza6exx
      mysql-test/include/have_sjis.inc
sp1f-have_sjis.inc-20040325102937-o7cuiclffpte3ihjypzjt3ddqzkwftpg
      mysql-test/include/have_ssl.inc
sp1f-have_ssl.inc-20010831212155-3qqpwe7dttrbcnqqyicfjurswzmnwgwq
      mysql-test/include/have_tis620.inc
sp1f-have_tis620.inc-20031225161058-e77xn25ogqkblhtwdursdputw3ab4bek
      mysql-test/include/have_ucs2.inc
sp1f-have_ucs2.inc-20030523101002-dylfpt3tlwxfx3fomq4nuxs23v32bkk5
      mysql-test/include/have_udf.inc
sp1f-have_udf.inc-20060215161119-xf74h7vjdqy73koybl4szdso2mj6cr5n
      mysql-test/include/have_ujis.inc
sp1f-have_ujis.inc-20030523101003-tlztpr4vjkmdr665l2xwom3sf4onqy5b
    ------------------------------------------------------------
    revno: 2639.2.1
    revision-id: chad@stripped
    parent: mleich@stripped
    committer: Chad MILLER <chad@stripped>
    branch nick: mysql-5.0-bugteam--bug30563
    timestamp: Fri 2008-07-04 12:41:27 -0400
    message:
      Bug#30563: Is not possible to create rpl_ or innodb test if needed \
      	to use ANSI_QUOTES
      
      Make all have_* tests universally safe by using ANSI quotes.
    modified:
      mysql-test/include/have_archive.inc
sp1f-have_archive.inc-20040525194737-y4dmzku2drx4axo3jj4crhl5w7q7iiee
      mysql-test/include/have_bdb.inc
sp1f-have_bdb.inc-20001227013105-mu5cxige5b2f4imsv2ssex36t2junk5o
      mysql-test/include/have_big5.inc
sp1f-have_big5.inc-20031224125944-5tkectrdy42o4sp27tc264vbtsbsp5zk
      mysql-test/include/have_blackhole.inc
sp1f-have_blackhole.inc-20050323001036-3jxeejqyoix6dpttshyi3jeryqgpooir
      mysql-test/include/have_case_sensitive_file_system.inc
sp1f-have_case_sensitive_-20060504065503-xptfsecuke5rlv6udm4ekadrhqqvcnnx
      mysql-test/include/have_compress.inc
sp1f-have_compress.inc-20030410005021-njgg6a7oquvfrivtxbgw52jil6wqvjj7
      mysql-test/include/have_cp1250_ch.inc
sp1f-have_cp1250_ch.inc-20050303101530-hgs6b3lnqann3p7ezzu2oork2bt4c73e
      mysql-test/include/have_cp932.inc
sp1f-have_cp932.inc-20050201103742-esjnhrejoad6u7kin5dcrqhy3cp6cjkv
      mysql-test/include/have_crypt.inc
sp1f-have_crypt.inc-20030128063823-w7dzdgugtv7agyrien2f6sembnqf34ki
      mysql-test/include/have_csv.inc
sp1f-have_csv.inc-20040813035428-w2b3gagsm3lfvmbd732lii7yvqi43ekc
      mysql-test/include/have_eucjpms.inc
sp1f-have_eucjpms.inc-20050201103743-twgzhhnrnqlyk22if43qv5pp6x6mhh3j
      mysql-test/include/have_euckr.inc
sp1f-have_euckr.inc-20051209123331-7j7l35wk7rqbeilf5h2llsgozan57mps
      mysql-test/include/have_exampledb.inc
sp1f-have_exampledb.inc-20040814001331-foxu3jwldzsro54gptl7zst3czglytrj
      mysql-test/include/have_federated_db.inc
sp1f-have_federated_db.in-20041211200116-6vsirzjnw3te4kahmtywdbkqlhy4kmes
      mysql-test/include/have_gb2312.inc
sp1f-have_gb2312.inc-20051209123331-r3djrxfcjo25jhnahmhfpnb5exjh45rw
      mysql-test/include/have_gbk.inc
sp1f-have_gbk.inc-20050722160355-sjecbg3iondw577wdombapw2jo4xnvku
      mysql-test/include/have_geometry.inc
sp1f-have_geometry.inc-20040527153127-b6ftjxs6dm3wyzfjvvhq5mxrkf66nuls
      mysql-test/include/have_innodb.inc
sp1f-have_innobase.inc-20010112144027-m7j2l7rwqewdpugmkwq5nkpcxx7tvweb
      mysql-test/include/have_latin2_ch.inc
sp1f-have_latin2_ch.inc-20060320122819-24bzpko4oaio3gzcxwqxph366tvvcjhb
      mysql-test/include/have_log_bin.inc
sp1f-have_log_bin.inc-20070514123848-agt6xmmfof6c7xqzuz3pb2huybwua5j5
      mysql-test/include/have_lowercase0.inc
sp1f-have_lowercase0.inc-20050818184753-5hr5h7dbooixey5u3zn6qjvl4t6btvdq
      mysql-test/include/have_multi_ndb.inc
sp1f-have_multi_ndb.inc-20050307085452-uck5le2dkc4p6fsvb2s5wmzmcxvu3fvp
      mysql-test/include/have_ndb.inc
sp1f-have_ndb.inc-20040415091459-pytgw6q4edqnevluroaxsv6fsywtyljf
      mysql-test/include/have_query_cache.inc
sp1f-have_query_cache.inc-20020322205505-kc3o7uzgw4xnuu3qrlacp5xh7pza6exx
      mysql-test/include/have_sjis.inc
sp1f-have_sjis.inc-20040325102937-o7cuiclffpte3ihjypzjt3ddqzkwftpg
      mysql-test/include/have_ssl.inc
sp1f-have_ssl.inc-20010831212155-3qqpwe7dttrbcnqqyicfjurswzmnwgwq
      mysql-test/include/have_tis620.inc
sp1f-have_tis620.inc-20031225161058-e77xn25ogqkblhtwdursdputw3ab4bek
      mysql-test/include/have_ucs2.inc
sp1f-have_ucs2.inc-20030523101002-dylfpt3tlwxfx3fomq4nuxs23v32bkk5
      mysql-test/include/have_udf.inc
sp1f-have_udf.inc-20060215161119-xf74h7vjdqy73koybl4szdso2mj6cr5n
      mysql-test/include/have_ujis.inc
sp1f-have_ujis.inc-20030523101003-tlztpr4vjkmdr665l2xwom3sf4onqy5b

Attachment: [text/text/x-diff] patch-2645.diff
Thread
bzr push into mysql-5.0 tree (marc.alff:2645 to 2645) Bug#30563Marc Alff7 Jul