1. 12 Dec, 2005 15 commits
    • unknown's avatar
      * made the following changes for the generic 5.1 RPM spec file · 070c6521
      unknown authored
      - Added zlib to the list of (static) libraries installed
      - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
      - Compile MySQL with bundled zlib
      - Fixed %packager name to "MySQL Production Engineering Team"
      
      
      070c6521
    • unknown's avatar
      Merge snake-hub.snake.net:/tmp/mysql-5.0 · 485a5f69
      unknown authored
      into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
      
      
      client/mysqltest.c:
        Auto merged
      485a5f69
    • unknown's avatar
      mysqltest.c: · a4708948
      unknown authored
        Put options in proper order.
      
      
      client/mysqltest.c:
        Put options in proper order.
      a4708948
    • unknown's avatar
      16d4b1d8
    • unknown's avatar
      rpl_until.test + rpl_until.result Fix (completion) for bug#12429 · cc3f2163
      unknown authored
      Manual merge from 4.1,
      extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
      
      
      mysql-test/t/rpl_until.test:
        Auto merged
      mysql-test/r/rpl_until.result:
        Manual merge from 4.1,
        extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
      cc3f2163
    • unknown's avatar
      rpl_until.test + rpl_until.result · 56830072
      unknown authored
      Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
      The value is not important, and it depends on timing. Mask it.
      
      Backport and extension of a fix made by Matthias in 5.0, originally it was
      1.1976 05/12/05 17:57:48 mleich@mysql.com
      
      
      mysql-test/r/rpl_until.result:
        Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
        The value is not important, and it depends on timing. Mask it.
        
        Backport and extension of a fix made by Matthias in 5.0, originally it was
        1.1976 05/12/05 17:57:48 mleich@mysql.com
      mysql-test/t/rpl_until.test:
        Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
        The value is not important, and it depends on timing. Mask it.
        
        Backport and extension of a fix made by Matthias in 5.0, originally it was
        1.1976 05/12/05 17:57:48 mleich@mysql.com
      56830072
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d4afe0f1
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      d4afe0f1
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · fb0d4c3b
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      mysql-test/t/symlink.test:
        Auto merged
      scripts/make_win_src_distribution.sh:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      fb0d4c3b
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ca7b228d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      sql/sp_head.cc:
        Auto merged
      ca7b228d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 54ad687e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      54ad687e
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 6a460be7
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      6a460be7
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · e6145a7d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug9535/my51-bug9535
      
      
      e6145a7d
    • unknown's avatar
      Merge mysql.com:/home/dlenev/src/mysql-5.0-merges · 346694bd
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.1-merges
      
      
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      346694bd
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 031ec5d2
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      mysql-test/r/sp.result:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      031ec5d2
    • unknown's avatar
      Merge WL#2984 · e8edf40f
      unknown authored
      
      mysql-test/r/sp-vars.result:
        Merge
      mysql-test/r/sp.result:
        Merge
      mysql-test/r/type_newdecimal-big.result:
        Merge
      mysql-test/t/type_newdecimal-big.test:
        Merge
      sql/sp_head.cc:
        Merge
      sql/sql_select.cc:
        Merge
      e8edf40f
  2. 11 Dec, 2005 1 commit
    • unknown's avatar
      make_win_src_distribution.sh: · ff410f95
      unknown authored
        Removed Visual Studio 6 project files, as they are not maintained
      
      
      scripts/make_win_src_distribution.sh:
        Removed Visual Studio 6 project files, as they are not maintained
      ff410f95
  3. 09 Dec, 2005 1 commit
    • unknown's avatar
      Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 · 16bca982
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge
      
      
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      BitKeeper/deleted/.del-type_newdecimal-big.result:
        Auto merged
      BitKeeper/deleted/.del-type_newdecimal-big.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.h:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/field.cc:
        Merge.
      sql/sp_head.cc:
        Merge.
      sql/sql_select.cc:
        Merge.
      16bca982
  4. 08 Dec, 2005 3 commits
    • unknown's avatar
      mysqld.cc: · eea6e15d
      unknown authored
        Bug#14960, reverted code to make symdir work on Windows
      symlink.test:
        Disabled test case on Windows
      
      
      mysql-test/t/symlink.test:
        Disabled test case on Windows
      sql/mysqld.cc:
        Bug#14960, reverted code to make symdir work on Windows
      eea6e15d
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2309be62
      unknown authored
      into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-new
      
      
      2309be62
    • unknown's avatar
      The innodb-5.0-ss52 snapshot changes were erroneously auto-merged · f8d6d137
      unknown authored
       to 5.1. Undoing the merge.
      
      
      mysql-test/r/innodb.result:
        Undoing erroneous auto-merge 5.0 -> 5.1
      mysql-test/t/innodb.test:
        Undoing erroneous auto-merge 5.0 -> 5.1
      sql/ha_innodb.cc:
        Undoing erroneous auto-merge 5.0 -> 5.1
      sql/ha_innodb.h:
        Undoing erroneous auto-merge 5.0 -> 5.1
      storage/innobase/btr/btr0sea.c:
        Undoing erroneous auto-merge 5.0 -> 5.1
      storage/innobase/dict/dict0dict.c:
        Undoing erroneous auto-merge 5.0 -> 5.1
      storage/innobase/dict/dict0load.c:
        Undoing erroneous auto-merge 5.0 -> 5.1
      storage/innobase/include/buf0buf.h:
        Undoing erroneous auto-merge 5.0 -> 5.1
      storage/innobase/include/dict0dict.h:
        Undoing erroneous auto-merge 5.0 -> 5.1
      storage/innobase/include/dict0load.h:
        Undoing erroneous auto-merge 5.0 -> 5.1
      storage/innobase/include/rem0cmp.h:
        Undoing erroneous auto-merge 5.0 -> 5.1
      storage/innobase/rem/rem0cmp.c:
        Undoing erroneous auto-merge 5.0 -> 5.1
      storage/innobase/row/row0mysql.c:
        Undoing erroneous auto-merge 5.0 -> 5.1
      f8d6d137
  5. 07 Dec, 2005 20 commits