1. 29 Aug, 2007 9 commits
  2. 28 Aug, 2007 9 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
      Streamline "do_close_connection" and "do_send_quit" · 2bb6a44a
      unknown authored
      Fix typo, "next_con" -> "con"
      
      
      client/mysqltest.c:
        Reuse "find_connection_by_name" both from "do_close_connection" and "do_send_quit"
        Adjust alignment of comment
        Fix typo in "do_close_connection", it used the global variable "next_con" instead
        of local variable "con"
      2bb6a44a
    • unknown's avatar
      Remove unportable constructs in loaddata.test · 5f524dad
      unknown authored
      5f524dad
    • unknown's avatar
      Move "analyze_testcase_failure" to mysqltest(since it knows best when · 345c18e4
      unknown authored
      to perform this analyzis)
      
      
      client/mysqltest.c:
        Add function 'show_query' and use it to output some debug queries when
        "sync_with_master" has failed.
      mysql-test/mysql-test-run.pl:
        Move "analyze_testcase_failure" to mysqltest
      345c18e4
    • 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
  3. 27 Aug, 2007 4 commits
  4. 25 Aug, 2007 1 commit
  5. 24 Aug, 2007 12 commits
  6. 23 Aug, 2007 5 commits