1. 07 Sep, 2007 2 commits
  2. 05 Sep, 2007 3 commits
  3. 04 Sep, 2007 5 commits
  4. 29 Aug, 2007 18 commits
  5. 28 Aug, 2007 12 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
      Fixes for · 8c1e2069
      unknown authored
           Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name
                      for ordering
           Bug#30420 "datadict" tests (all engines) fail: Release build has help tables loaded
           Bug#30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking
           Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
      Attention: Only the build team can check if Bug#30440 is really fixed.
      
      
      mysql-test/suite/funcs_1/README.txt:
        Update README
      mysql-test/suite/funcs_1/datadict/datadict_master.inc:
        1. Exclude the help tables from the INFORMATION_SCHEMA.TABLES
           and the INFORMATION_SCHEMA.STATISTICS selects.
        2. Replace error numbers with error names
        3. Sort some results with mysqltest builtin function
        4. Some other minor changes
      mysql-test/suite/funcs_1/r/innodb__datadict.result:
        Updated expected results
      mysql-test/suite/funcs_1/r/memory__datadict.result:
        Updated expected results
      mysql-test/suite/funcs_1/r/myisam__datadict.result:
        Updated expected results
      mysql-test/suite/funcs_1/t/innodb__datadict.test:
        Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
      mysql-test/suite/funcs_1/t/memory__datadict.test:
        Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
      mysql-test/suite/funcs_1/t/myisam__datadict.test:
        Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
      mysql-test/suite/funcs_1/r/datadict_help_tables_build.result:
        File with expected results
      mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result:
        File with expected results
      mysql-test/suite/funcs_1/t/datadict_help_tables_build.test:
        Additional test checking the information about the help tables within
               INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
        as compensation for the removed checks within datadict_master.inc.
        Variant for use during build tests (non empty help tables)
      mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test:
        Additional test checking the information about the help tables within
               INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
        as compensation for the removed checks within datadict_master.inc.
        Variant for use during development tests (empty help tables)
      8c1e2069
    • 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
      fix bug in test case for bug#25714 · e968129c
      unknown authored
      
      mysql-test/include/have_bug25714.inc:
        this is not how you access variables
      e968129c
    • 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
      build fix for aix and others · a85d1b2e
      unknown authored
      
      libmysql/libmysql.c:
        build fix: DBUG_ENTER can't be this late
      a85d1b2e
    • 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