1. 04 Oct, 2007 1 commit
    • unknown's avatar
      Issue a warning if a user sets an option or a variable to a value that is... · 78348d4e
      unknown authored
      Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
      
      This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.
      
      
      mysql-test/r/variables.result:
        Fixed the test.
      mysql-test/t/variables.test:
        Fixed the test.
      mysys/my_getopt.c:
        Print a warning to the error log if a user sets an option to a value greater than the option's maximum value.
      sql/set_var.cc:
        Issue an SQL warning if a user assignes a value greater than the variable's maximum value.
      78348d4e
  2. 02 Oct, 2007 3 commits
  3. 07 Sep, 2007 1 commit
    • unknown's avatar
      This patch is a part of work on bug #5731 "key_buffer_size not properly restricted to 4GB". · 76c19c74
      unknown authored
        
      The patch limits read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms for the following reasons:
        
      - I/O code in mysys, code in mf_iocache.c and in some storage engines do not currently work with sizes > 2 GB for those buffers
      - even if the above had been fixed, Windows POSIX read() and write() calls are not 2GB-safe, so setting those buffer to sizes > 2GB would not work correctly on 64-bit Windows.
      
      
      include/my_global.h:
        Removed SSIZE_MAX definition because it's not neeeded anymore.
      sql/mysqld.cc:
        Limit read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms.
      76c19c74
  4. 29 Aug, 2007 3 commits
  5. 28 Aug, 2007 6 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50 · 4dac538a
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      4dac538a
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812 · 484069cf
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
      
      
      484069cf
    • unknown's avatar
      Merge pilot.(none):/data/msvensson/mysql/yassl_import/my50-yassl_import · b8c3ba1f
      unknown authored
      into  pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
      
      
      b8c3ba1f
    • unknown's avatar
      Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117 · 9c3a03a2
      unknown authored
       - Merge sslaccept and sslconnect.
       - Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has
         succeeded, this avoids having to revert anything and thus protects
         against "close_active_vio" in the middle.
       - Add some variance to the testcase
      
      
      mysql-test/t/rpl_ssl.test:
        Add some variance by running two selects before stopping the slave
        Check that number of records in t1 are equal on master and slave
      vio/viossl.c:
        Rewrite sslconnect and sslaccept to automically "reset" the vio
        to VIO_TYPE_SSL. Also use the fd from 'SSL_get_fd' to avoid
        setting vio->sd to -1, that previously occured when "close_active_vio"
        was called during connect/accept.
        
        Merge the two function since they were exactly the same except for one line.
        
        Update the DBUG printouts to be generic(i.e use peer instead of client/server).
      9c3a03a2
    • unknown's avatar
      Import yaSSL version 1.7.2 · fe4abfb2
      unknown authored
      - Fix bug#27265
      - Support for fixing bug#18441
      
      
      extra/yassl/include/openssl/crypto.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/ssl.h:
        Import patch yassl.diff
      extra/yassl/include/yassl_int.hpp:
        Import patch yassl.diff
      extra/yassl/src/handshake.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/yassl_int.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/include/openssl/des_old.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/evp.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/hmac.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/objects.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/sha.h:
        Import patch yassl.diff
      extra/yassl/include/openssl/prefix_ssl.h:
        Update prefixes
      fe4abfb2
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · d54f42c1
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/sql_show.cc:
        Auto merged
      d54f42c1
  6. 27 Aug, 2007 4 commits
  7. 25 Aug, 2007 1 commit
  8. 24 Aug, 2007 12 commits
  9. 23 Aug, 2007 5 commits
  10. 22 Aug, 2007 4 commits
    • unknown's avatar
      Cleanup in the "netware" subdirectory: · 870958d2
      unknown authored
      1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
         so we do not need the ".def" files for the "isam"-specific tools.
      
      2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.
      
      
      BitKeeper/deleted/.del-isamchk.def:
        Delete: netware/isamchk.def
      BitKeeper/deleted/.del-isamlog.def:
        Delete: netware/isamlog.def
      BitKeeper/deleted/.del-pack_isam.def:
        Delete: netware/pack_isam.def
      netware/Makefile.am:
        Use a plain "basename" showing the purpose, not a sed command which is harder to read.
      870958d2
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30201 · 10329092
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      10329092
    • unknown's avatar
      Merge hynda.mysql.fi:/home/my/mysql-5.0-main · 3dbffd24
      unknown authored
      into  hynda.mysql.fi:/home/my/mysql-5.0-marvel
      
      
      3dbffd24
    • unknown's avatar
      Fixed bug #30201. · 891b1659
      unknown authored
      Killing a SELECT query with KILL QUERY or KILL CONNECTION
      causes a server crash if the query cache is enabled.
      
      Normal evaluation of a query may be interrupted by the
      KILL QUERY/CONNECTION statement, in this case the mysql_execute_command
      function returns TRUE, and the thd->killed flag has true value.
      In this case the result of the query may
      be cached incompletely (omitting call to query_cache_insert inside
      the net_real_write function), and next call to query_cache_end_of_result
      may lead to server crash.
      Thus, the query_cache_end_of_result function has been modified to abort
      query cache in the case of killed thread.
      
      
      
      sql/sql_cache.cc:
        Fixed bug #30201.
        The  query_cache_end_of_result function has been modified to abort query
        cache in the case of query execution failure. Also this function has been
        modified to remove incomplete query block.
      891b1659