1. 31 Jan, 2007 7 commits
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341 · 3d6e5fea
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      3d6e5fea
    • unknown's avatar
      Bug#25341: "init.d/mysql stop" may timeout too quickly · f50bf872
      unknown authored
      Thirty five seconds is entirely too short of a period to wait for a server 
      to exit.  Instead, make a valliant effort to make sure it exits, and only
      give up after a very long period (arbitrarily chosen as 15 minutes).
      
      In addition, if we're being asked to restart the server, then don't try
      to start again if trying to stop the server failed.
      ---
      Return zero by default, when the script exits.
      ---
      Set return-/exit-value based on whether we successfully dealt with the 
      PID-file.
      ---
      Don't wait that long if the program we're waiting on exits.  It 
      should only exit if the server is not going to be started.
      
      
      support-files/mysql.server.sh:
        Raise timeout to a pessimistic value, 15 minutes.  We should only be willing
        to give up and exit after an extraordinary effort.
        ---
        Return zero by default, when the script exits.
        ---
        Set return-/exit-value based on whether we successfully dealt with the 
        PID-file.
        ---
        Don't wait that long if the program we're waiting on exits.  It 
        should only exit if the server is not going to be started.
      f50bf872
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · bca07eea
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
      
      
      bca07eea
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1bcc1670
      unknown authored
      into  mysql.com:/home/ram/work/b19690/b19690.5.0
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      1bcc1670
    • unknown's avatar
      after-merge fix. · abf7eb06
      unknown authored
      abf7eb06
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b19690/b19690.4.1 · 86ed0e98
      unknown authored
      into  mysql.com:/home/ram/work/b19690/b19690.5.0
      
      
      mysql-test/r/type_float.result:
        Auto merged
      mysql-test/t/type_float.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/field.h:
        merging
      sql/init.cc:
        merging
      sql/item_cmpfunc.cc:
        merging
      sql/mysql_priv.h:
        merging
      sql/sql_select.cc:
        merging
      86ed0e98
    • unknown's avatar
      fix for bug #19690: ORDER BY eliminates rows from the result · faad7355
      unknown authored
      Depending on the queries we use different data processing methods
      and can lose some data in case of double (and decimal in 4.1) fields.
      
      The fix consists of two parts:
      1. double comparison changed, now double a is equal to double b 
      if (a-b) is less than 5*0.1^(1 + max(a->decimals, b->decimals)). 
      For example, if a->decimals==1, b->decimals==2, a==b if (a-b)<0.005
      2. if we use a temporary table, store double values there as is 
      to avoid any data conversion (rounding).
      
      
      mysql-test/r/type_float.result:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - test result
      mysql-test/t/type_float.test:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - test case
      sql/field.cc:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - use not_fixed flag instead of dec to check bounds.
      sql/field.h:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - Field_Double::not_fixed flag introduced, which is set if dec == NOT_FIXED_DEC
            and is used in the ::store() to check bounds. 
          - new constructor introduced (with not_fixed_arg parameter).
      sql/init.cc:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - fill log_01[] array with 0.1 powers.
      sql/item_cmpfunc.cc:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - compare_real_fixed() and compare_e_real_fixed() introduced,
            they consider double a == double b if a-b is less than 'precision',
            'precision' is set to 5*0.1^(1 + max(a->decimals, b->decimals)), 
            for example, if a->decimals==1, b->decimals==2, 'precision' is 0.005
          - use the above functions if both arguments are fixed.
      sql/item_cmpfunc.h:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - Arg_comparator::presision introduced.
          - Arg_comparator::compare_real_fixed(), Arg_comparator::compare_e_real_fixed() introduced.
      sql/mysql_priv.h:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - log_01 array of 0.1 powers added.
      sql/mysqld.cc:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - log_01 array of 0.1 powers added.
      sql/sql_select.cc:
        fix for bug #19690: ORDER BY eliminates rows from the result
          - if we create double field in a temporary table, set not_fixed flag
            (use proper constructor) to avoid data conversion 
            in the Field_double::store(). Otherwise we can lose some data.
      faad7355
  2. 29 Jan, 2007 15 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 bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f64dd6c1
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
      
      
      f64dd6c1
    • 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
  3. 26 Jan, 2007 5 commits
  4. 25 Jan, 2007 1 commit
  5. 24 Jan, 2007 3 commits
  6. 23 Jan, 2007 5 commits
  7. 22 Jan, 2007 4 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 7efe97cd
      unknown authored
      into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
      
      
      7efe97cd
    • 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