1. 21 Feb, 2007 2 commits
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1e2f16ca
      unknown authored
      into  trift2.:/MySQL/M51/merge-5.1
      
      
      configure.in:
        Auto merged
      1e2f16ca
    • unknown's avatar
      Merge trift2.:/MySQL/M50/merge-5.0 · 92ebc521
      unknown authored
      into  trift2.:/MySQL/M51/merge-5.1
      
      
      include/config-win.h:
        Auto merged
      mysys/my_pthread.c:
        Auto merged
      mysys/my_thr_init.c:
        Auto merged
      mysys/thr_alarm.c:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      configure.in:
        Null-merge: 5.0 version number upgrade only, irrelevant for 5.1
      92ebc521
  2. 20 Feb, 2007 10 commits
  3. 16 Feb, 2007 4 commits
    • unknown's avatar
      include/config-win.h : · e48e78b0
      unknown authored
      Companion change to this one
         ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
           include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
      which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
      
      
      include/config-win.h:
        Companion change to this one
           ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0
             include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10
        which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
      e48e78b0
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · ce7c0f23
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      sql/mysql_priv.h:
        Auto merged
      ce7c0f23
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ab40ccad
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      ab40ccad
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · d37ee3ca
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      d37ee3ca
  4. 15 Feb, 2007 2 commits
  5. 14 Feb, 2007 9 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 54a6cd61
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
      
      
      sql/mysql_priv.h:
        Auto merged
      54a6cd61
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 81d9dce1
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      sql/mysql_priv.h:
        Auto merged
      81d9dce1
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-axmrg · d8d43a08
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      mysys/my_pthread.c:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      d8d43a08
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 8fc6c328
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-axmrg
      
      
      mysys/my_pthread.c:
        Auto merged
      8fc6c328
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-axmrg · 28c48ba1
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      28c48ba1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 339e26ab
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-axmrg
      
      
      mysys/my_pthread.c:
        SCCS merged
      339e26ab
    • unknown's avatar
      Post-merge fix · e9bdde0d
      unknown authored
      e9bdde0d
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · f5d883c2
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.1-opt
      
      
      BitKeeper/etc/gone:
        auto-union
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysys/my_getopt.c:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      f5d883c2
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 277b59b8
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.1-opt
      
      
      BitKeeper/etc/gone:
        auto-union
      mysys/my_getopt.c:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/select.result:
        SCCS merged
      mysql-test/t/select.test:
        SCCS merged
      277b59b8
  6. 13 Feb, 2007 13 commits