1. 28 Apr, 2006 5 commits
  2. 27 Apr, 2006 18 commits
    • unknown's avatar
      Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-5.0 · dc101c2c
      unknown authored
      into  mysql.com:/nfstmp1/jwinstead/mysql-5.0-clean
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      dc101c2c
    • unknown's avatar
      Disable udf.test · c357525e
      unknown authored
      c357525e
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 83a71984
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0
      
      
      83a71984
    • unknown's avatar
      Fix merge error · 7bddd524
      unknown authored
      
      extra/yassl/src/yassl_int.cpp:
        Fix merge error, missing {
      extra/yassl/taocrypt/src/integer.cpp:
        Fix merge error, duplicate function definition
      7bddd524
    • unknown's avatar
      Return empty string if file does not exist · 185c89c4
      unknown authored
      Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example
      
      
      mysql-test/lib/mtr_misc.pl:
        Return empty string if file does not exist
      mysql-test/mysql-test-run.pl:
        Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example variable
      185c89c4
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-19393 · 9681b731
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      9681b731
    • unknown's avatar
      Bug #19393: Federated tests fail on Windows under pushbuild · d985ed4c
      unknown authored
        Supplying --skip-rpl to mysql-test-run.pl would always disable the
        slaves, but those slaves may still be needed for the federated tests.
        Now we only disable the slaves when they are not used by any of the
        tests.
      
      
      mysql-test/mysql-test-run.pl:
        Decide whether to set up and start slave databases based entirely on
        which tests are used, and don't allow --skip-rpl to ruin the party,
        since other tests than replication rely on the slaves (namely federated).
      d985ed4c
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 · 8d1230c6
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysql.cc:
        Auto merged
      configure.in:
        Auto merged
      extra/yassl/include/openssl/rsa.h:
        Auto merged
      extra/yassl/include/yassl_int.hpp:
        Auto merged
      extra/yassl/include/yassl_types.hpp:
        Auto merged
      extra/yassl/src/template_instnt.cpp:
        Auto merged
      extra/yassl/taocrypt/include/integer.hpp:
        Auto merged
      extra/yassl/taocrypt/include/misc.hpp:
        Auto merged
      extra/yassl/taocrypt/src/algebra.cpp:
        Auto merged
      extra/yassl/taocrypt/src/template_instnt.cpp:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      extra/yassl/include/openssl/ssl.h:
        Manual merge
      extra/yassl/src/handshake.cpp:
        Manual merge
      extra/yassl/src/yassl_int.cpp:
        Manual merge
      extra/yassl/taocrypt/include/runtime.hpp:
        Manual merge
      extra/yassl/taocrypt/src/integer.cpp:
        Manual merge
      mysql-test/mysql-test-run.pl:
        Manual merge
      mysql-test/r/trigger.result:
        Manual merge
      mysql-test/t/trigger.test:
        Manual merge
      8d1230c6
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 36261a96
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/trigger.result:
        Manual merge
      mysql-test/t/trigger.test:
        Manual merge
      36261a96
    • unknown's avatar
      Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set... · 1bdc15e1
      unknown authored
      Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
      Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library. 
      
      
      mysql-test/include/have_udf.inc:
        Add check if udf_example.so(or similar) is available
      mysql-test/lib/mtr_misc.pl:
        Add funcion "mtr_file_exist" to search for files
      mysql-test/mysql-test-run.pl:
        Add checks to find the udf_example.so library
      mysql-test/r/udf.result:
        Update result
      mysql-test/t/disabled.def:
        Remove udf.test from disabled tests
      mysql-test/t/udf.test:
        Use variable UDF_EXAMPLE_LIB when looking for shared library to load
      mysql-test/r/have_udf_example.require:
        New BitKeeper file ``mysql-test/r/have_udf_example.require''
      1bdc15e1
    • unknown's avatar
      Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 · 66b56724
      unknown authored
      into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
      
      
      sql/set_var.cc:
        Auto merged
      66b56724
    • unknown's avatar
      set_var.cc: · f0e7abfc
      unknown authored
        System variable was added out of lexical order.
      
      
      sql/set_var.cc:
        System variable was added out of lexical order.
      f0e7abfc
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new · e187468d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      configure.in:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      e187468d
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · c8e2e3fd
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
      
      
      c8e2e3fd
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 18a140b3
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      18a140b3
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 96f58e1b
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      96f58e1b
    • unknown's avatar
      Fix bug in ndbcluster.sh on Solaris (now that line is the same as in 5.1) · 8b553a3f
      unknown authored
      
      mysql-test/ndb/ndbcluster.sh:
        redirect to /dev/null to avoid grep -q
      8b553a3f
    • unknown's avatar
      Remove obsolete test · 47ce2876
      unknown authored
      
      mysql-test/r/user_var.result:
        Update results
      mysql-test/t/user_var.test:
        Remove unnecessary test
      47ce2876
  3. 26 Apr, 2006 17 commits