1. 18 Jul, 2006 1 commit
  2. 17 Jul, 2006 2 commits
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/my50-yassl · 11980804
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      extra/yassl/src/socket_wrapper.cpp:
        Auto merged
      extra/yassl/taocrypt/include/runtime.hpp:
        Auto merged
      extra/yassl/src/handshake.cpp:
        Manual merge
      11980804
    • unknown's avatar
      Import yaSSL version 1.3.7 · d5b27ec1
      unknown authored
       - Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"
      
      
      extra/yassl/FLOSS-EXCEPTIONS:
        Import patch yassl.diff
      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_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/mySTL/algorithm.hpp:
        Import patch yassl.diff
      extra/yassl/mySTL/helpers.hpp:
        Import patch yassl.diff
      extra/yassl/mySTL/list.hpp:
        Import patch yassl.diff
      extra/yassl/mySTL/memory.hpp:
        Import patch yassl.diff
      extra/yassl/mySTL/pair.hpp:
        Import patch yassl.diff
      extra/yassl/mySTL/stdexcept.hpp:
        Import patch yassl.diff
      extra/yassl/mySTL/vector.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/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/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
      d5b27ec1
  3. 15 Jul, 2006 1 commit
  4. 14 Jul, 2006 3 commits
  5. 13 Jul, 2006 12 commits
    • unknown's avatar
      4.1 -> 5.0 merge · 35bfad1e
      unknown authored
      
      client/mysql.cc:
        Auto merged
      client/sql_string.h:
        Auto merged
      configure.in:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_string.h:
        Auto merged
      sql/table.cc:
        Auto merged
      35bfad1e
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b6962a4
      unknown authored
      into  mysql.com:/home/tnurnberg/work/mysql-5.0-21014
      
      
      1b6962a4
    • unknown's avatar
      Bug#21014: Segmentation fault of mysqldump on view · f27e9254
      unknown authored
      mysqldump did not select the correct database before trying to dump
      views from it. this resulted in an empty result set, which in turn
      startled mysql-dump into a core-dump.  this only happened for views,
      not for tables, and was only visible with multiple databases that
      weren't by sheer luck in the order mysqldump required, anyway. this
      fixes by selecting the correct database before dumping views; it also
      catches the empty set-condition if it should occur for other reasons.
      
      
      client/mysqldump.c:
        Bug#21014: Segmentation fault of mysqldump on view
        
        failsafe: if "select ... from information_schema.views" returns an
        empty set, don't deref NULL; throw an error instead.
        
        fix: select the correct database not only before dumping tables, but
        before dumping views, as well.
      mysql-test/r/mysqldump.result:
        Bug#21014: Segmentation fault of mysqldump on view
        
        show that mysqldump selects the correct database before trying to dump
        views from it.
      mysql-test/t/mysqldump.test:
        Bug#21014: Segmentation fault of mysqldump on view
        
        show that mysqldump selects the correct database before trying to dump
        views from it.
      f27e9254
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3c2bdb59
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
      
      
      3c2bdb59
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 5392be95
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
      
      
      5392be95
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 316577d6
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/m50--07C2P
      
      
      316577d6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · e553b828
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
      
      
      e553b828
    • unknown's avatar
      Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 · 3ff8200a
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      tests/mysql_client_test.c:
        manual merge
      3ff8200a
    • unknown's avatar
      Bug #19779: mysql_explain_log documentation is outdated. · 754a0923
      unknown authored
      
      scripts/mysql_explain_log.sh:
        Changed explain_log.pl to mysql_explain_log.  Added usage information for printerror. Minor cleanup.
      754a0923
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-kt · b974fa85
      unknown authored
      into  mysql.com:/home/hf/work/mysql-5.0.clean
      
      
      sql-common/client.c:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      b974fa85
    • unknown's avatar
      Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 4bdc4251
      unknown authored
      into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/pending/bug-4.1-15977
      
      
      4bdc4251
    • unknown's avatar
      Bug#20432: mysql client interprets commands in comments · 76215977
      unknown authored
      do not look for client-specific commands while inside a multi-line comment.
      we will allow multi-comments pretty much anywhere within SQL-statements,
      but client-specific commands (help, use, print, ...) must be the first token
      in the input.
      
      
      client/mysql.cc:
        Bug#20432: mysql client interprets commands in comments
      mysql-test/r/mysql_client.result:
        Bug#20432: mysql client interprets commands in comments
        test client-side parsing of comments and client-specific commands
      mysql-test/t/mysql_client.test:
        Bug#20432: mysql client interprets commands in comments
        test client-side parsing of comments and client-specific commands
      76215977
  6. 12 Jul, 2006 6 commits
    • unknown's avatar
      Merge zippy.(none):/home/cmiller/mysql-4.1_bug18470 · 4823bc50
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
      
      
      configure.in:
        Auto merged
      4823bc50
    • unknown's avatar
      Fix a valgrind warning in type_date test. · a7dddd3b
      unknown authored
      
      sql/item_timefunc.cc:
        Fix a valgrind warning in type_date test.	
      a7dddd3b
    • unknown's avatar
      Bug#18470: Compile Failure: strings.s fails make with unknown pseudo-ops · 4bfb28e2
      unknown authored
      The bug is thqt we use some nonstandard assembly codes in our strings
      source, and some assemblers don't know what to do with them:  Specifically,
      Sun's Solaris assembler and Apple's Darwin assembler balk at them.
      
      This patch, rather than trying to test for properties of the assembler, 
      which Autoconf doesn't have any decent facilites for, instead tries to
      compile the code in question and disables assembly if it fails.
      
      There's still the problem of unportable assembly, but I'll leave that 
      to someone who feels like rewriting and debugging it.
      
      
      configure.in:
        Actually try to compile the code in question, since a test for the CPU
        type is insufficient to determine whether our code will compile.
      4bfb28e2
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0 · a08a6f9f
      unknown authored
      into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl
      
      
      ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      a08a6f9f
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-4.1 · 17870724
      unknown authored
      into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-4.1-rpl
      
      
      17870724
    • unknown's avatar
      Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0f7258e0
      unknown authored
      into  maint1.mysql.com:/data/localhome/cmiller/mysql-4.1
      
      
      0f7258e0
  7. 11 Jul, 2006 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 26ddd5cb
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
      
      
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/t/date_formats.test:
        Auto merged
      26ddd5cb
    • unknown's avatar
      Bug#20729: Bad date_format() call makes mysql server crash · ed001f18
      unknown authored
          
      The problem is that the author used the wrong function to send a warning to the 
      user about truncation of data.  push_warning() takes a constant string and 
      push_warning_printf() takes a format and variable arguments to fill it.
      
      Since the string we were complaining about contains percent characters, the 
      printf() code interprets the "%Y" et c. that the user sends.  That's wrong, and
      often causes a crash, especially if the date mentions seconds, "%s".
      
      A alternate fix would be to use  push_warning_printf(..., "%s", warn_buff) .
      
      
      mysql-test/r/date_formats.result:
        Test that an invalid date doesn't crash the server.  We should get a warning back 
        instead of a dead socket.
      mysql-test/t/date_formats.test:
        Test that an invalid date doesn't crash the server.  We should get a warning back 
        instead of a dead socket.
      sql/time.cc:
        Don't try to use warn_buf as the start of a varible arguement list to send 
        to a warning-formatted my_vsnprintf() .
      ed001f18
    • unknown's avatar
      ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x") · 27721ce5
      unknown authored
      
      ndb/src/kernel/error/TimeModule.cpp:
        0=Sunday
      27721ce5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 67d53e36
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
      
      
      sql/sql_table.cc:
        Auto merged
      67d53e36
    • unknown's avatar
      Merge zippy.(none):/home/cmiller/work/mysql/mysql-4.0__bug19006 · d1a31ef5
      unknown authored
      into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1
      
      
      client/sql_string.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/sql_string.h:
        Auto merged
      configure.in:
        Null merge.
      sql/item_strfunc.cc:
        Null merged
      d1a31ef5
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-release · 034522f4
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-amerge
      
      
      sql/handler.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      034522f4
    • unknown's avatar
      Raise the version number. · 0859819a
      unknown authored
      0859819a
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0e694880
      unknown authored
      into  trift2.:/M50/mysql-5.0
      
      
      0e694880
    • unknown's avatar
      Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0-rpl · fabab792
      unknown authored
      into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.0-merge
      
      
      ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      fabab792
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · aedfd072
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
      
      
      sql/opt_range.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      mysql-test/Makefile.am:
        Manual merge.
      aedfd072
  8. 10 Jul, 2006 5 commits