bzr commit into mysql-6.0 tree (marc.alff:2668) Bug#37069, WL#2110

[Marc Alff]

#At file:///home/malff/BZR-TREE/mysql-6.0-wl2110/

------------------------------------------------------------
revno: 2668
revision-id: marc.alff@stripped
parent: marc.alff@stripped
parent: timothy.smith@stripped
committer: Marc Alff <marc.alff@stripped>
branch nick: mysql-6.0-wl2110
timestamp: Wed 2008-06-18 10:55:24 -0600
message:
  Merge with mysql-6.0
modified:
  mysql-test/lib/mtr_cases.pl   
sp1f-mtr_cases.pl-20050203205008-rrteoawyobvgq6u7zeyce4tmuu334ayg
  mysql-test/r/repair.result    
sp1f-repair.result-20020901175217-bbx3pgbuq4pcl73i4n64nqm42ymdvc3b
  scripts/make_binary_distribution.sh
sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
  sql/sql_plugin.cc             
sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a2
  sql/sql_table.cc              
sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
    ------------------------------------------------------------
    revno: 2664.1.1
    revision-id: timothy.smith@stripped
    parent: anozdrin@stripped
    parent: timothy.smith@stripped
    committer: Timothy Smith <timothy.smith@stripped>
    branch nick: 60
    timestamp: Tue 2008-06-17 21:30:29 -0600
    message:
      Merge up changes from mysql-5.1.
    modified:
      mysql-test/lib/mtr_cases.pl   
sp1f-mtr_cases.pl-20050203205008-rrteoawyobvgq6u7zeyce4tmuu334ayg
      mysql-test/r/repair.result    
sp1f-repair.result-20020901175217-bbx3pgbuq4pcl73i4n64nqm42ymdvc3b
      scripts/make_binary_distribution.sh
sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
      sql/sql_plugin.cc             
sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a2
      sql/sql_table.cc              
sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
    ------------------------------------------------------------
    revno: 2497.236.10
    revision-id: timothy.smith@stripped
    parent: kgeorge@stripped
    parent: timothy.smith@stripped
    committer: Timothy Smith <timothy.smith@stripped>
    branch nick: 51
    timestamp: Tue 2008-06-17 19:20:09 -0600
    message:
      Merge changes from mysql 5.1.25 release clone (BK), applied manually into bzr.
    modified:
      mysql-test/r/repair.result    
sp1f-repair.result-20020901175217-bbx3pgbuq4pcl73i4n64nqm42ymdvc3b
      scripts/make_binary_distribution.sh
sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
      sql/sql_table.cc              
sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
        ------------------------------------------------------------
        revno: 2497.250.2
        tags: mysql-5.1.25
        revision-id: timothy.smith@stripped
        parent: timothy.smith@stripped
        committer: Timothy Smith <timothy.smith@stripped>
        branch nick: 5.1.25-build
        timestamp: Tue 2008-06-17 19:05:56 -0600
        message:
          fix typo
          
          This change was committed to the 5.1.25 release clone, but never
          made it to the mysql-5.1 BK tree.  I'm committing it to mysql-5.1
          bzr now.
        modified:
          mysql-test/r/repair.result    
sp1f-repair.result-20020901175217-bbx3pgbuq4pcl73i4n64nqm42ymdvc3b
          sql/sql_table.cc              
sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
        ------------------------------------------------------------
        revno: 2497.250.1
        revision-id: timothy.smith@stripped
        parent: sp1r-kostja@bodhi.(none)-20080520184326-10676
        committer: Timothy Smith <timothy.smith@stripped>
        branch nick: 5.1.25-build
        timestamp: Tue 2008-06-17 19:04:10 -0600
        message:
          Bug #37024: Wrong location of messagefiles
          
          make_binary_distribution.sh got clobbered by the 5.0 version during a merge.
          This caused a few packaging problems, including message files put in the wrong
          place and some missing files.  Fix is just to revert back to the 5.1 version
          from before the merge.
          
          Problem introduced in
          ChangeSet 1.2606.2.1 2008/05/13 15:56:07 kent@kent-amd64.(none)
          
          This change was made in the 5.1.25 release clone in BK, but never made it to the
main mysql-5.1 BK tree.  I am adding it to mysql-5.1 bzr.
        modified:
          scripts/make_binary_distribution.sh
sp1f-make_binary_distribu-19700101030959-efrhw236bzgbhabfsq3ygx5pkfitz7wy
    ------------------------------------------------------------
    revno: 2497.236.9
    revision-id: kgeorge@stripped
    parent: kgeorge@stripped
    parent: kgeorge@stripped
    committer: Georgi Kodinov <kgeorge@stripped>
    branch nick: disable-federated-5.1
    timestamp: Tue 2008-06-03 16:06:05 +0300
    message:
      null merge
        ------------------------------------------------------------
        revno: 1810.3729.11
        revision-id: kgeorge@stripped
        parent: cmiller@stripped
        committer: Georgi Kodinov <kgeorge@stripped>
        branch nick: disable_federated-5.0
        timestamp: Tue 2008-06-03 13:12:37 +0300
        message:
          Bug#37069 (5.0): implement --skip-federated
        added:
          mysql-test/r/federated_disabled.result
federated_disabled.r-20080603101120-9psmshb22jm34r90-3
          mysql-test/t/federated_disabled-master.opt
federated_disabledma-20080603101120-9psmshb22jm34r90-1
          mysql-test/t/federated_disabled.test
federated_disabled.t-20080603101120-9psmshb22jm34r90-2
        modified:
          sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
    ------------------------------------------------------------
    revno: 2497.236.8
    revision-id: kgeorge@stripped
    parent: chad@stripped
    committer: Georgi Kodinov <kgeorge@stripped>
    branch nick: disable_federated-5.1
    timestamp: Fri 2008-05-30 13:21:45 +0300
    message:
      Bug#37069: Make federated disabled by default
      
      The federated storage engine is now disabled by default.
      mysql-test-run.pl is updated to enable it whenever it's required and available.
    modified:
      mysql-test/lib/mtr_cases.pl   
sp1f-mtr_cases.pl-20050203205008-rrteoawyobvgq6u7zeyce4tmuu334ayg
      sql/sql_plugin.cc             
sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a2

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