1. 04 Dec, 2006 1 commit
  2. 01 Dec, 2006 4 commits
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 65da49e6
      unknown authored
      into  example.com:/work/bug24395-v2/my50
      
      
      myisam/mi_open.c:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      65da49e6
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043 · 48595c28
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/rpl_sp.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/rpl_sp.result:
        - Merged
      48595c28
    • unknown's avatar
      Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS" · 2f0b1d65
      unknown authored
      - Refactoring of duplicate code
      - Modified bad test cases
      - Changed expected error when operating on information_schema.
      
      
      mysql-test/r/information_schema.result:
        - updated result file with new error code.
      mysql-test/r/rpl_sp.result:
        - Modified test case
      mysql-test/t/information_schema.test:
        - Changed error code for operations on information_schema
      mysql-test/t/rpl_sp.test:
        - Modified test case
      sql/sql_parse.cc:
        - Cleaned up code:
          * replace tab with space
          * simplified if/switch statements
          * refactored duplicated code
      2f0b1d65
    • unknown's avatar
      Bug#17951: myisampack --force --silent : abnormal end in Windows XP · 8a223884
      unknown authored
      -myisampack wrote to a block on the heap that it did not allocate.
      
      
      myisam/myisampack.c:
        Bug#17951: myisampack --force --silent : abnormal end in Windows XP
        -Added additional check to ensure that only the allocated buffer is
        used.
      8a223884
  3. 30 Nov, 2006 4 commits
    • unknown's avatar
      Merge example.com:/work/bug24395-v2/my41 · c429ca84
      unknown authored
      into  example.com:/work/bug24395-v2/my50
      
      fix for bug#24395 merged into 5.0
      
      
      mysql-test/t/alter_table.test:
        Auto merged
      myisam/mi_open.c:
        merge into 5.0 by using macroses available in 5.0
      mysql-test/r/alter_table.result:
        manual merge
      sql/sql_table.cc:
        manual merge
        Added else clause of 
        if (new_table && !new_table->file->is_view)
        This else clauses does keys management on the live table, thus we have
        to force other threads to reopen the table.
      c429ca84
    • unknown's avatar
      Include *.MY* files from std_data in dist · ebed0fe1
      unknown authored
      ebed0fe1
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · daa14544
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      client/mysqltest.c:
        Manual merge
      mysql-test/r/mysqltest.result:
        Manual merge
      daa14544
    • unknown's avatar
      Add "chmod" command to mysqltest · 708bce0a
      unknown authored
      708bce0a
  4. 29 Nov, 2006 13 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 · 30278aed
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      client/mysqltest.c:
        Manual merge
      30278aed
    • unknown's avatar
      Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 · 8e0614c8
      unknown authored
       - chmod the saved files from 4.1 to make sure they are writable
      
      
      mysql-test/t/varbinary.test:
        As the files saved from 4.1 has been in bk they muight be readonly
        Use "chmod" to make sure they are writable
      8e0614c8
    • unknown's avatar
      Add command "chmod" to mysqltest · 0e8ed1b5
      unknown authored
      
      client/mysqltest.c:
        Add "chmod" command
      mysql-test/r/mysqltest.result:
        Update result file
      mysql-test/t/mysqltest.test:
        Add tests for chmod
      0e8ed1b5
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 66466ddf
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      66466ddf
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · acce5337
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      acce5337
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 2aac04f9
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/work/my50-work
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      2aac04f9
    • unknown's avatar
    • unknown's avatar
      Change mode of the checked in 4.1 version files so they are writable · 6f1c3848
      unknown authored
      
      mysql-test/std_data/bug19371.frm:
        Change mode to -rw-rw--w-
      mysql-test/std_data/bug19371.MYD:
        Change mode to -rw-rw--w-
      mysql-test/std_data/bug19371.MYI:
        Change mode to -rw-rw--w-
      6f1c3848
    • unknown's avatar
      Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint · 8e5203ae
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
      
      
      8e5203ae
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043 · 8ac71ce7
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
      
      
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/rpl_sp.result:
        - merged
      mysql-test/t/rpl_sp.test:
        -merged
      8ac71ce7
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · cd69f462
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/yassl_import/mysql-5.0-maint
      
      
      extra/yassl/src/ssl.cpp:
        Auto merged
      cd69f462
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 89d106c1
      unknown authored
      into  mysql.com:/usr/home/ram/work/bug22229/my50-bug22229
      
      
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      89d106c1
    • unknown's avatar
      Import version 1.50 of yaSSL · eb6ab467
      unknown authored
      
      extra/yassl/README:
        Import patch yassl.diff
      extra/yassl/examples/client/client.cpp:
        Import patch yassl.diff
      extra/yassl/examples/echoclient/echoclient.cpp:
        Import patch yassl.diff
      extra/yassl/examples/echoserver/echoserver.cpp:
        Import patch yassl.diff
      extra/yassl/examples/server/server.cpp:
        Import patch yassl.diff
      extra/yassl/include/factory.hpp:
        Import patch yassl.diff
      extra/yassl/include/openssl/ssl.h:
        Import patch yassl.diff
      extra/yassl/include/socket_wrapper.hpp:
        Import patch yassl.diff
      extra/yassl/include/yassl_error.hpp:
        Import patch yassl.diff
      extra/yassl/include/yassl_imp.hpp:
        Import patch yassl.diff
      extra/yassl/include/yassl_int.hpp:
        Import patch yassl.diff
      extra/yassl/include/yassl_types.hpp:
        Import patch yassl.diff
      extra/yassl/src/handshake.cpp:
        Import patch yassl.diff
      extra/yassl/src/make.bat:
        Import patch yassl.diff
      extra/yassl/src/socket_wrapper.cpp:
        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/src/yassl_imp.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_int.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/benchmark/make.bat:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/aes.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/algebra.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/arc4.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/asn.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/block.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/blowfish.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/des.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/integer.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/md5.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/misc.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/modes.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/ripemd.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/rsa.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/sha.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/twofish.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/aes.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/algebra.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/arc4.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/blowfish.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/des.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/src/md4.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/md5.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/misc.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/random.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/ripemd.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/sha.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/twofish.cpp:
        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/test.hpp:
        Import patch yassl.diff
      extra/yassl/include/openssl/prefix_ssl.h:
        New prefic file for ssl.h generated
      eb6ab467
  5. 28 Nov, 2006 18 commits