1. 29 May, 2006 1 commit
    • unknown's avatar
      Import from yaSSL · 34d9365e
      unknown authored
      
      extra/yassl/include/yassl_error.hpp:
        Import patch yassl.diff
      extra/yassl/mySTL/stdexcept.hpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_error.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_int.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/integer.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/misc.cpp:
        Import patch yassl.diff
      34d9365e
  2. 22 May, 2006 1 commit
    • unknown's avatar
      Import from yaSSL · b959d36b
      unknown authored
      Fixes for HPUX etc. 
      Don't define exceptions operator new on hpux as the linker will look for the function
      
      
      extra/yassl/examples/echoserver/echoserver.cpp:
        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/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/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/src/timer.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_error.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_int.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/block.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/md4.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/runtime.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/md4.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/taocrypt.dsp:
        Import patch yassl.diff
      extra/yassl/taocrypt/test/test.cpp:
        Import patch yassl.diff
      extra/yassl/testsuite/test.hpp:
        Import patch yassl.diff
      extra/yassl/mySTL/stdexcept.hpp:
        Don't define exceptions operator new on hpux as the linker will look for the function
      extra/yassl/taocrypt/src/Makefile.am:
        Add md4.cpp to Makefile.am
      b959d36b
  3. 21 May, 2006 2 commits
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 07188950
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.mrg
      
      
      07188950
    • unknown's avatar
      ndb - bug#19956 (occurs only in v5.0) · a57c9674
      unknown authored
      
      mysql-test/r/ndb_blob.result:
        bug#19956 : var* pk
      mysql-test/t/ndb_blob.test:
        bug#19956 : var* pk
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        bug#19956 - check var* length bytes and zero rest of value if any blob attribute
      ndb/src/ndbapi/NdbOperationSearch.cpp:
        bug#19956 - check var* length bytes and zero rest of value if any blob attribute
      a57c9674
  4. 20 May, 2006 4 commits
  5. 19 May, 2006 6 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-1039 · 719bfafc
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      include/sslopt-longopts.h:
        Resolve conflict
      include/sslopt-vars.h:
        Resolve conflict
      mysql-test/r/variables.result:
        Resolve conflict
      mysql-test/t/variables.test:
        Resolve conflict
      719bfafc
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8dff422f
      unknown authored
      into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
      
      
      sql/mysqld.cc:
        Auto merged
      8dff422f
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 891361be
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      891361be
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711 · 5c484b20
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      5c484b20
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711 · f98e7a9e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      include/my_pthread.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      f98e7a9e
    • unknown's avatar
      Bug#15869 Cannot shutdown the server - it restarts · 5ceb394f
      unknown authored
       - A segfault occured when the function 'kill_server' called 
         'my_sigset' with signal number 0. 'my_sigset' is a macro which
         uses 'sigaction' to install the signal handler with an invalid
         signal number will on most platforms return EINVAL but yields
         a segfauilt on IRIX 6.5
       - The server crash was detected by mysqld_safe and it was restarted although
         a shutdown was requested. 
       - Semantics of kill_server(0) is not known, leaving it intact
      
      
      include/my_pthread.h:
        Check return value from sigaction with a DBUG_ASSERT
        Also DBUG_ASSERT if signal number 0 is passed
      sql/mysqld.cc:
        Don't call my_sigset if signo is 0
      5ceb394f
  6. 18 May, 2006 6 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 41e6fb25
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-5.0
      
      
      41e6fb25
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 33c439ce
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
      
      
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/view.result:
        SCCS merged
      mysql-test/t/view.test:
        SCCS merged
      33c439ce
    • unknown's avatar
      Bug #13975: "same string" + 0 has 2 different results · 573d9e47
      unknown authored
        The 'decimals' member of Item_func was being improperly initialized,
        which resulted in improper results when handling large numeric values.
      
      
      mysql-test/r/func_str.result:
        Add test results
      mysql-test/t/func_str.test:
        Add new regression test
      sql/item_strfunc.h:
        Remove unnecessary reset of decimals in Item_func_conv::fix_length_and_dec().
      573d9e47
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 74183117
      unknown authored
      into moonbone.local:/work/19077-bug-5.0-mysql
      
      
      74183117
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · ed5ac749
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
      
      
      ed5ac749
    • unknown's avatar
      Fixed bug #19816. · 087be9ba
      unknown authored
      This bug was introduced when the patch resolving the
      performance problem 17164 was applied. As a result
      of that modification the not_null_tables attributes
      were calculated incorrectly for constant OR conditions.
      This triggered invalid conversion of outer joins into
      inner joins.
      
      
      mysql-test/r/join_outer.result:
        Added a test case for bug #19816.
      mysql-test/t/join_outer.test:
        Added a test case for bug #19816.
      087be9ba
  7. 17 May, 2006 9 commits
    • unknown's avatar
      Fixed bug#19077: A nested materialized derived table is used before being populated. · 1c6beaee
      unknown authored
      The convert_constant_item() function converts constant items to ints on
      prepare phase to optimize execution speed. In this case it tries to evaluate
      subselect which contains a derived table and is contained in a derived table. 
      All derived tables are filled only after all derived tables are prepared.
      So evaluation of subselect with derived table at the prepare phase will
      return a wrong result.
      
      A new flag with_subselect is added to the Item class. It indicates that
      expression which this item represents is a subselect or contains a subselect.
      It is set to 0 by default. It is set to 1 in the Item_subselect constructor
      for subselects.
      For Item_func and Item_cond derived classes it is set after fixing any argument
      in Item_func::fix_fields() and Item_cond::fix_fields accordingly.
      The convert_constant_item() function now doesn't convert a constant item
      if the with_subselect flag set in it. 
      
      
      mysql-test/t/view.test:
        Added test case for bug#19077: A nested materialized derived table is used before being populated.
      mysql-test/t/subselect.test:
        Added test case for bug#19077: A nested materialized derived table is used before being populated.
      mysql-test/r/view.result:
        Added test case for bug#19077: A nested materialized derived table is used before being populated.
      mysql-test/r/subselect.result:
        Added test case for bug#19077: A nested materialized derived table is used before being populated.
      sql/item_subselect.cc:
        Fixed bug#19077: A nested materialized derived table is used before being populated.
        The Item_subselect class constructor sets new with_subselect flag to 1.
      sql/item_func.cc:
        Fixed bug#19077: A nested materialized derived table is used before being populated.
        
        The Item_func::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.
      sql/item_cmpfunc.cc:
        Fixed bug#19077: A nested materialized derived table is used before being populated.
        The convert_constant_item() function now doesn't convert a constant item
        with the with_subselect flag set.
        The Item_cond::fix_fields() sets new with_subselect flag from with_subselect flags of its arguments.
      sql/item.cc:
        Fixed bug#19077: A nested materialized derived table is used before being populated.
        Set new with_subselect flag to default value - 0 in the Item constructor.
      sql/item.h:
        Fixed bug#19077: A nested materialized derived table is used before being populated.
        A new flag with_subselect is added to the Item class. It indicates that
        expression which this item represents is a subselect or contains a subselect.
        It is set to 0 by default.
      1c6beaee
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · ce288ebc
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      BitKeeper/deleted/.del-disabled.def:
        Auto merged
      ce288ebc
    • unknown's avatar
    • unknown's avatar
      Include "config.h" (if it exists) in all yaSSL files via their "runtime.hpp". · 8d4cbe39
      unknown authored
      Fixes bug#19040 "yaSSL does not compile on AIX".
      
      
      extra/yassl/taocrypt/include/runtime.hpp:
        Include "config.h" (if it exists) in all yaSSL files. This is needed to ensure the same 
        configure settings are used for yaSSL as for the other modules linked together.
        Example: the settings for "large file" on AIX.
        Fixes bug#19040 "yaSSL does not compile on AIX".
      8d4cbe39
    • unknown's avatar
      Merge mysql.com:/home/hf/work/mysql-4.1.clean · abc6e665
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.mrg
      
      
      mysql-test/t/init_connect.test:
        Auto merged
      mysql-test/t/wait_timeout.test:
        Auto merged
      abc6e665
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 5fb23aa3
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug18818/my50-bug18818
      
      
      5fb23aa3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 0138267b
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug18818/my41-bug18818
      
      
      0138267b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 76408cc8
      unknown authored
      into  production.mysql.com:/usersnfs/tulin/mysql-4.1
      
      
      76408cc8
    • unknown's avatar
      Fixed bug #19573. · f1efd088
      unknown authored
      The select statement that specified a view could be
      slightly changed when the view was saved in a frm file.
      In particular references to an alias name in the HAVING
      clause could be substituted for the expression named by
      this alias.
      This could result in an error message for a query of
      the form SELECT * FROM <view>. Yet no such message
      appeared when executing the query specifying the view.
      
      
      mysql-test/r/having.result:
        Adjusted results after fixing bug #19573.
      mysql-test/r/view.result:
        Added a test case for bug #19573.
      mysql-test/t/view.test:
        Added a test case for bug #19573.
      f1efd088
  8. 16 May, 2006 11 commits