1. 29 Jan, 2007 14 commits
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work · 29617cad
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      29617cad
    • unknown's avatar
      Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import · 89468ba1
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/work/my50-work
      
      
      89468ba1
    • unknown's avatar
      Add result file for ssl_connect.test · e04d0010
      unknown authored
      
      mysql-test/r/ssl_connect.result:
        New BitKeeper file ``mysql-test/r/ssl_connect.result''
      e04d0010
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work · 753b95c5
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      753b95c5
    • unknown's avatar
      Bug#25417 "/usr/bin/test" installed from yassl/taocrypt/test · f6eb2c33
      unknown authored
       - It's good to build the test programs for yaSSL to check for undefined
         symbols etc but they should not be installed by "make install"
      
      
      extra/yassl/taocrypt/test/Makefile.am:
        "test" is a noinst program
      extra/yassl/testsuite/Makefile.am:
        "testsuite" is a noinst program
      f6eb2c33
    • unknown's avatar
      Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import · bef24ce3
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      bef24ce3
    • unknown's avatar
    • unknown's avatar
      Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import · a7426cd8
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      a7426cd8
    • unknown's avatar
      Import latest version of yaSSL · f0aacbca
      unknown authored
       - Replace SawTooth copyright header with MySQL's
       - Bug#19209 Test 'rpl_openssl' hangs on Windows
       - Spurious "2013 Connection to server lost" errors fixed
         yaSSL doesn't close socket anymore, that is left to the application 
      
      
      extra/yassl/README:
        Import patch yassl.diff
      extra/yassl/include/buffer.hpp:
        Import patch yassl.diff
      extra/yassl/include/cert_wrapper.hpp:
        Import patch yassl.diff
      extra/yassl/include/crypto_wrapper.hpp:
        Import patch yassl.diff
      extra/yassl/include/factory.hpp:
        Import patch yassl.diff
      extra/yassl/include/handshake.hpp:
        Import patch yassl.diff
      extra/yassl/include/lock.hpp:
        Import patch yassl.diff
      extra/yassl/include/log.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/timer.hpp:
        Import patch yassl.diff
      extra/yassl/include/yassl.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/buffer.cpp:
        Import patch yassl.diff
      extra/yassl/src/cert_wrapper.cpp:
        Import patch yassl.diff
      extra/yassl/src/crypto_wrapper.cpp:
        Import patch yassl.diff
      extra/yassl/src/handshake.cpp:
        Import patch yassl.diff
      extra/yassl/src/lock.cpp:
        Import patch yassl.diff
      extra/yassl/src/log.cpp:
        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/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/src/timer.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl.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/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/coding.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/des.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/dh.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/dsa.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/include/hash.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/hmac.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/integer.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/kernelc.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/md2.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/md4.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/modarith.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/modes.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/pwdbased.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/random.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/runtime.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/include/type_traits.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/types.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/algorithm.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/helpers.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/list.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/memory.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/memory_array.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/pair.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/stdexcept.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/mySTL/vector.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/aes.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/aestables.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/asn.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/bftables.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/blowfish.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/coding.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/crypto.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/des.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/dh.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/dsa.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/file.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/hash.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/integer.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/md2.cpp:
        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/rsa.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/sha.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/tftables.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/twofish.cpp:
        Import patch yassl.diff
      f0aacbca
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943 · b91a4749
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      sql/mysql_priv.h:
        Auto merged
      b91a4749
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 · 7620e066
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
      
      
      sql/mysqld.cc:
        Auto merged
      sql/net_serv.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      vio/vio.c:
        Auto merged
      vio/viossl.c:
        Auto merged
      sql/mysql_priv.h:
        Manual merge
      sql/sql_parse.cc:
        Manual merge
      7620e066
    • unknown's avatar
      Bug#22943 syscall pruning in libmysql · a195ad5e
      unknown authored
       - Set the timeout values only where needed
      
      
      sql/mysql_priv.h:
        Add new functions for setting read and write timeout on "net"
      sql/mysqld.cc:
        - Move the setting of "read_timeout" to the value of "connect_timeout" to
          just before 'check_connection' which is the function where we want
          to use the different timeout
        - With the new functions to set timeout on "net", there is no need to
          specifically set the default wait_timeout on windows.
      sql/net_serv.cc:
        Add new functions for setting read and write timeout of "net, when
        server is compiled not to use alarms it will set the write/read timeout
        directly on connection using 'vio_timeout'(using setsockopt if socket)
      sql/repl_failsafe.cc:
        Put unused code within "#if NOT_USED"
      sql/set_var.cc:
        Use 'net_set_*_timeout' when adjusting timeout value
        on the current connection
      sql/slave.cc:
        The read timeout used when connecting to master server is set
        using 'mysql_options' in 'connect_to_master' function
      sql/sql_parse.cc:
        - Set read and write timeout values to "connect_timeout" during
        connect phase
        - Use "read_timeout" value during sslaccept phase, since this is during
        connect phase it implies "connect-timeout"
        - Set read and write timeout value back to default after connect phase
        - Set "read_timeout" to "wait_timeout" while waiting for client.
      sql/sql_repl.cc:
        Set "read_timeout" to "wait_timeout" while ask other mysqld to send file
      sql-common/client.c:
        Call 'vio_timeout' to set up the read and write timeout's for the
        newly created connection. It only need to be done once at connect time.
      vio/vio.c:
        Use 'vio_timeout' for setting timeout also on an SSL connection
        since they both use sockets
      vio/viossl.c:
        Remove 'vio_ssl_timeout' function
      a195ad5e
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/bug19474/my50-bug19474 · 33d25a80
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      33d25a80
    • unknown's avatar
      Bug#19474 readline bug: mysql: free(): invalid pointer · 9a0b8eb1
      unknown authored
       - Write to uninitialised memory occured since _rl_rapped_lines buffer
         was not extended in CHECK_INV_LBREAKS macro
       - Patch submitted to bug-readline@gnu.org
      
      
      cmd-line-utils/readline/display.c:
        Extend _rl_wrapped_lines everytime inv_lbsize is increased
      9a0b8eb1
  2. 26 Jan, 2007 2 commits
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca · 48b8edc2
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.h:
        Auto merged
      48b8edc2
    • unknown's avatar
      Bug #25879: THD::options isn't set with ulonglong values and \ · 783b6eb6
      unknown authored
      	variables
      
      Bits higher than 2**31 were impossible to set on THD::options.  It's
      probably a remnant from a time when options was a 32-bit integer.
      
      Now, use unsigned long-long constants and variables to set and clear
      THD::options.
      ---
      Pulled comments back to column 49.
      
      
      sql/mysql_priv.h:
        THD::options is an ulonglong, so we should define our bit constants 
        that way.
        ---
        Pulled comments back to column 49.
      sql/set_var.h:
        THD::options is a ulonglong, and we if we're going to set bits higher
        than 2**31, then we must treat the bitmasks as a 64-bit number.
      783b6eb6
  3. 25 Jan, 2007 1 commit
  4. 24 Jan, 2007 3 commits
  5. 23 Jan, 2007 4 commits
  6. 22 Jan, 2007 13 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 0e8d2903
      unknown authored
      into  quadxeon.mysql.com:/users/mtaylor/mysql-5.0-maint
      
      
      0e8d2903
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 1e00143d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      1e00143d
    • 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
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 4032f2b5
      unknown authored
      into  mysql.com:/home/ram/work/b22026/b22026.5.0
      
      
      4032f2b5
    • 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 · 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/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.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
  7. 20 Jan, 2007 3 commits