1. 24 Jan, 2007 1 commit
  2. 23 Jan, 2007 3 commits
  3. 22 Jan, 2007 19 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · ade93118
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
      
      
      ade93118
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · c962dde0
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      extra/yassl/include/openssl/ssl.h:
        Auto merged
      extra/yassl/src/ssl.cpp:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~10:
        Auto merged
      c962dde0
    • unknown's avatar
      Import yaSSL version 1.5.8 · 5e500522
      unknown authored
       - Includes patch for Bug#25189
      
      
      extra/yassl/README:
        Import patch yassl.diff
      extra/yassl/include/openssl/ssl.h:
        Import patch yassl.diff
      extra/yassl/src/make.bat:
        Import patch yassl.diff
      extra/yassl/src/ssl.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_error.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/benchmark/make.bat:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/asn.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/error.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/file.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/asn.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/coding.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/integer.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/make.bat:
        Import patch yassl.diff
      extra/yassl/taocrypt/test/make.bat:
        Import patch yassl.diff
      extra/yassl/taocrypt/test/test.cpp:
        Import patch yassl.diff
      extra/yassl/testsuite/make.bat:
        Import patch yassl.diff
      extra/yassl/testsuite/testsuite.cpp:
        Import patch yassl.diff
      5e500522
    • unknown's avatar
    • unknown's avatar
      after-merge fix. · 1d82f97c
      unknown authored
      
      mysql-test/r/select.result:
        results adjusted.
      1d82f97c
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b22026/b22026.5.0 · 938e16ee
      unknown authored
      into  mysql.com:/home/ram/work/b22026/b22026.5.1
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      938e16ee
    • unknown's avatar
      Fix for bug #22026: Warning when using IF statement and large unsigned bigint · 39fb7b24
      unknown authored
        
      We use INT_RESULT type if all arguments are of type INT for 'if', 'case', 
      'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
      exceed the INT bounds.
      
      
      mysql-test/r/select.result:
        Fix for bug #22026: Warning when using IF statement and large unsigned bigint
          - test result.
      mysql-test/t/select.test:
        Fix for bug #22026: Warning when using IF statement and large unsigned bigint
          - test case.
      sql/item_cmpfunc.cc:
        Fix for bug #22026: Warning when using IF statement and large unsigned bigint
          - take into account unsigned flags aggregating result types:                    
            return INT_RESULT only if two items with INT_RESULT type                      
            have equal unsigned_flags, otherwise return REAL_RESULT.
      39fb7b24
    • unknown's avatar
      332186b6
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 4bf4bf13
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      4bf4bf13
    • unknown's avatar
      Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint · f7d5d23c
      unknown authored
      into  ymer.(none):/usr/local/mysql/x/mysql-5.1-new-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      f7d5d23c
    • unknown's avatar
      Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint · fdb1dcae
      unknown authored
      into  ymer.(none):/usr/local/mysql/x/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      fdb1dcae
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50 · b1e27dab
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/inno/jan20/51
      
      
      mysql-test/r/range.result:
        SCCS merged
      sql/item.cc:
        SCCS merged
      storage/innobase/dict/dict0dict.c:
        Use local
      storage/innobase/handler/ha_innodb.h:
        Use local
      b1e27dab
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50 · f6f4a34b
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/inno/jan20/51
      
      
      mysql-test/r/range.result:
        Auto merged
      sql/item.cc:
        Auto merged
      f6f4a34b
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50 · 53f7c7ad
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/inno/jan20/51
      
      
      mysys/string.c:
        Auto merged
      53f7c7ad
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41 · 49b814e5
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
      
      
      innobase/dict/dict0dict.c:
        Use local
      49b814e5
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41 · 83203e6e
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
      
      
      mysql-test/r/range.result:
        Auto merged
      sql/item.cc:
        Auto merged
      83203e6e
    • unknown's avatar
      Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots · 47555a07
      unknown authored
      Fixes:
      - Bug #24299: 
      - Bug #25596: 
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
        
        Revision r36:
        innodb-4.1: Port r1030 from innodb/branches/5.0:
        
        Replace isspace() with a wrapper ib_isspace(), because on
        Win32 isspace(0xa0) appears to hold.  (Bug #24299)
        
        
        Revision r38:
        ib_isspace(c): Check for c being the null character.  (Bug #25596)
      47555a07
    • unknown's avatar
      Applied innodb-5.1-ss1186 · 8ca71550
      unknown authored
      Fixes bugs:
      - Bug #20877: InnoDB data dictionary memory footprint is too big
      - Bug #24741: existing cascade clauses disappear when adding foreign keys
      
      
      mysql-test/r/innodb.result:
        Applied innodb-5.1-ss1186
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
      mysql-test/t/innodb.test:
        Applied innodb-5.1-ss1186
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
      storage/innobase/buf/buf0flu.c:
        Applied innodb-5.1-ss1186
        
        Revision r1168:
        buf_flush_batch(): Remove the test page_count != ULINT_UNDEFINED.
        The variable is initialized to zero, and after that it is only added to.
        Maybe the one who introduced the variable srv_buf_pool_flushed overlooked
        that there is a separate return statement for returning ULINT_UNDEFINED?
      storage/innobase/dict/dict0load.c:
        Applied innodb-5.1-ss1186
        
        Revision r1186:
        dict_load_foreign(): Use a local variable instead of the 10-bit field
        foreign->n_fields in order to preserve ON UPDATE CASCADE and
        ON DELETE CASCADE flags.  For some reason, gcc does not warn about
        shifting a 10-bit field to right by 24 bits.  (Bug #24741)
        
        This bug was introduced while reducing the memory footprint of the
        InnoDB data dictionary (Bug #20877).
        
        innodb.test, innodb.result: Add a test case.
      storage/innobase/include/ut0ut.h:
        Applied innodb-5.1-ss1186
        
        Revision r1165:
        ut_2_power_up(): Add __attribute__((const)), because otherwise this function
        is repeatedly called in buf_flush_free_margin() due to the definitions
        of BUF_READ_AHEAD_AREA and other macros starting with BUF_READ_AHEAD_.
      storage/innobase/que/que0que.c:
        Applied innodb-5.1-ss1186
        
        Revision r1158:
        Modify que_fork_start_command() to do only one pass over the thread list
        instead of three.
      8ca71550
    • unknown's avatar
      Applied innodb-5.0-ss1230 snapshot · b238db62
      unknown authored
      Fixes:
      - Bug #25596: 
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-5.0-ss1230 snapshot.
        
        r1230
        
        branches/5.0: ib_isspace(c): Check for c being the null character.
        (Bug #25596)
      sql/ha_innodb.h:
        Applied innodb-5.0-ss1230
        
        Trivial indent SPACES -> TAB change.
      b238db62
  4. 21 Jan, 2007 1 commit
  5. 20 Jan, 2007 6 commits
  6. 19 Jan, 2007 10 commits