1. 09 Mar, 2006 8 commits
  2. 08 Mar, 2006 18 commits
  3. 07 Mar, 2006 14 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 3200ef5a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      3200ef5a
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 49b926ad
      unknown authored
      into  linux.site:/home/reggie/work/mysql-5.1
      
      
      mysql-test/r/partition.result:
        Auto merged
      mysql-test/t/partition.test:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/sql_partition.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      49b926ad
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp · 217fdd88
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/trigger-grant.test:
        Auto merged
      217fdd88
    • unknown's avatar
      Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 · 6856ffec
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      6856ffec
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · f11bb1de
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      f11bb1de
    • unknown's avatar
      Bug#17574 Detect cluster start failure and "fail" ndb_* tests · f0f8f114
      unknown authored
       - Update for 5.1
      
      
      mysql-test/mysql-test-run.pl:
        Remove mtr_error call from ndbcluster_install_slave
        Check if ndbcluster_install_slave failed after it's been called. continu with disabled slave cluster if  --force is used.
      f0f8f114
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/bug17574/my50-bug17574 · 4070ab99
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/bug17574/my51-bug17574
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/lib/mtr_cases.pl:
        Manual merge of bug#17574 from 5.0 -> 5.1
      4070ab99
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · c0711619
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      
      client/mysqltest.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/binary.result:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/r/func_math.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/heap.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/t/binary.test:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/ha_federated.cc:
        Auto merged
      sql/ha_federated.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      c0711619
    • unknown's avatar
      Bug#17574 Detect cluster start failure and "fail" ndb_* tests · 32926414
      unknown authored
      
      mysql-test/lib/mtr_cases.pl:
        Always set "ndb_test" if tets name contains ndb. 
        Set to skipped if "--skip-ndbcluster"
      mysql-test/lib/mtr_report.pl:
        Print special error message for ndb_test that are failed due to failure to start or install ndbcluster
      mysql-test/mysql-test-run.pl:
        Remove mtr_error call from ndbcluster_install, instead check after ndbcluster_install if test run should continue or if it should be aborted
        Faile ndb test and print special error message if it's a ndb test and flag_ndb_status_ok is not ok
      32926414
    • unknown's avatar
      mysql.spec.sh: · dd42550b
      unknown authored
        Changed product name from "Community Edition" to "Community Server", bug#17970
      
      
      support-files/mysql.spec.sh:
        Changed product name from "Community Edition" to "Community Server", bug#17970
      dd42550b
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp · fd2c5bfd
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      fd2c5bfd
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 3e30762e
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      3e30762e
    • unknown's avatar
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1355dcfc
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      1355dcfc