1. 08 Aug, 2007 5 commits
  2. 06 Aug, 2007 10 commits
  3. 05 Aug, 2007 8 commits
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new · c4aac844
      unknown authored
      into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
      
      
      mysql-test/mysql-test-run.pl:
        SCCS merged
      c4aac844
    • unknown's avatar
      mysql-test-run.pl: · 57e225bb
      unknown authored
        Search "relwithdebinfo" directory in CMake Visual Studio build
        Search for "mysqld-debug" even in source tree
      
      
      mysql-test/mysql-test-run.pl:
        Search "relwithdebinfo" directory in CMake Visual Studio build
        Search for "mysqld-debug" even in source tree
      57e225bb
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 308c6448
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      308c6448
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · fe87e88f
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      fe87e88f
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 · a3d5f64c
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
      
      
      a3d5f64c
    • unknown's avatar
      Added test for bug #21281 "Pending write lock is incorrectly removed · 88607040
      unknown authored
      when its statement being KILLed". The bug itself was fixed by separate
      patch in 5.0 tree.
      
      
      mysql-test/r/lock_multi.result:
        Added test for bug #21281 "Pending write lock is incorrectly removed
        when its statement being KILLed".
      mysql-test/t/lock_multi.test:
        Added test for bug #21281 "Pending write lock is incorrectly removed
        when its statement being KILLed".
      88607040
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281 · 5b25fc54
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2
      
      
      mysql-test/t/federated.test:
        Auto merged
      mysys/thr_lock.c:
        Auto merged
      mysql-test/r/federated.result:
        SCCS merged
      5b25fc54
    • unknown's avatar
      Fix for bug #21281 "Pending write lock is incorrectly removed when its · af2d0f87
      unknown authored
      statement being KILLed".
      
      When statement which was trying to obtain write lock on then table and
      which was blocked by existing read lock was killed, concurrent statements
      that were trying to obtain read locks on the same table and that were
      blocked by the presence of this pending write lock were not woken up and
      had to wait until this first read lock goes away.
      
      This problem was caused by the fact that we forgot to wake up threads
      which pending requests could have been satisfied after removing lock
      request for the killed thread.
      
      The patch solves the problem by waking up those threads in such situation.
      
      Test for this bug will be added to 5.1 only as it has much better
      facilities for its implementation. Particularly, by using I_S.PROCESSLIST
      and wait_condition.inc script we can wait until thread will be blocked on
      certain table lock without relying on unconditional sleep (which usage
      increases time needed for test runs and might cause spurious test
      failures on slower platforms).
      
      
      mysys/thr_lock.c:
        After removing lock request from the list of waiting lock requests
        (e.g. when we discover that current thread was killed) we should
        wake up other threads waiting for the same lock which pending
        requests now can be satisfied. To implement this behavior we
        move code responsible for waking up threads which pending requests
        can be satisfied from thr_unlock() to new wake_up_waiters() procedure
        and use it in wait_for_lock() and hr_abort_locks_for_thread().
      af2d0f87
  4. 04 Aug, 2007 6 commits
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · 5809417e
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      mysys/charset.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      5809417e
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · ffe0e1b1
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
      
      
      ffe0e1b1
    • unknown's avatar
      Post Merge Fixup. · 06cb99ca
      unknown authored
      06cb99ca
    • unknown's avatar
      Merge amd64.(none):/src/mysql-5.1-maint · e8469adb
      unknown authored
      into  amd64.(none):/src/mysql-5.1-build_29903
      
      
      BitKeeper/etc/ignore:
        auto-union
      client/client_priv.h:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4:
        Auto merged
      client/mysql.cc:
        Auto merged
      libmysqld/CMakeLists.txt:
        Auto merged
      libmysqld/Makefile.am:
        Auto merged
      libmysqld/examples/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
        Manual merge.
      e8469adb
    • unknown's avatar
      Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl-push · a150ca33
      unknown authored
      into  mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
      
      
      a150ca33
    • unknown's avatar
      Bug#29903 The CMake build method does not produce the embedded library. · ac107ac1
      unknown authored
      - GCov fix.
      
      
      mysql-test/r/mysql.result:
        Bug#29903 The CMake build method does not produce the embedded library.
        -Result
      mysql-test/t/mysql.test:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Test for warning message.
      ac107ac1
  5. 03 Aug, 2007 11 commits
    • unknown's avatar
      Bug#29903 The CMake build method does not produce the embedded library. · 21792097
      unknown authored
      - Additional changes to correct link failure in Do-linkall script.
      
      
      libmysqld/libmysqld.def:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Missing exports.
      21792097
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · a455d7f9
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      BitKeeper/deleted/.del-readme.txt-grumble-grumble:
        Auto merged
      a455d7f9
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · c4c20074
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      libmysql/CMakeLists.txt:
        merge fix
      c4c20074
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new · e31f5611
      unknown authored
      into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
      
      
      e31f5611
    • unknown's avatar
      CMakeLists.txt: · edc99e12
      unknown authored
        Removed space between '-D' and symbol
      
      
      CMakeLists.txt:
        Removed space between '-D' and symbol
      edc99e12
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new · 6f43cf82
      unknown authored
      into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
      
      
      BitKeeper/deleted/.del-README~1:
        SCCS merged
      BitKeeper/deleted/.del-configure.js:
        ul
      dbug/CMakeLists.txt:
        SCCS merged
      extra/CMakeLists.txt:
        SCCS merged
      extra/yassl/CMakeLists.txt:
        SCCS merged
      extra/yassl/taocrypt/CMakeLists.txt:
        SCCS merged
      scripts/CMakeLists.txt:
        SCCS merged
      server-tools/instance-manager/CMakeLists.txt:
        SCCS merged
      sql/CMakeLists.txt:
        SCCS merged
      storage/myisam/CMakeLists.txt:
        SCCS merged
      6f43cf82
    • unknown's avatar
      after-merge fix · f2204146
      unknown authored
      
      sql/table.cc:
        do not attempt to set no_replicate if OPEN_FRM_FILE_ONLY was set
      f2204146
    • unknown's avatar
      CMakeLists.txt, README, configure.js · 29bd01e6
      unknown authored
        Several adjustments to make client libraries pass the link test
        on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
      
      
      win/README:
        - Removed references to PARTITION engine, 5.1 only
      win/configure.js:
        - Removed references to PARTITION engine, 5.1 only
      extra/CMakeLists.txt:
        Use the special 'debug' list element to mark that "dbug" library
        is only to be linked against if build type "Debug".
      myisam/CMakeLists.txt:
        Use the special 'debug' list element to mark that "dbug" library
        is only to be linked against if build type "Debug".
      scripts/CMakeLists.txt:
        Use the special 'debug' list element to mark that "dbug" library
        is only to be linked against if build type "Debug".
      server-tools/instance-manager/CMakeLists.txt:
        Use the special 'debug' list element to mark that "dbug" library
        is only to be linked against if build type "Debug".
      sql/CMakeLists.txt:
        Use the special 'debug' list element to mark that "dbug" library
        is only to be linked against if build type "Debug".
      mysys/CMakeLists.txt:
        Restored include path to "mysys" itself
      dbug/CMakeLists.txt:
        Changed to optionally be included to give a file list only
      extra/yassl/CMakeLists.txt:
        Changed to optionally be included to give a file list only
      extra/yassl/taocrypt/CMakeLists.txt:
        Changed to optionally be included to give a file list only
      zlib/CMakeLists.txt:
        Changed to optionally be included to give a file list only
      libmysql/CMakeLists.txt:
        For compatibility with Visual Studio 2005, list all files that are to
        be part of the library build, i.e. libraries can't be built from other
        libraries. Set SOURCE_SUBLIBS and include the file listings from
        "zlib", "dbug", "taocrypt" and "yassl"
      29bd01e6
    • unknown's avatar
      Bug#29903 The CMake build method does not produce the embedded library. · c6c57ed7
      unknown authored
      - Changes to correct and test Windows embedded build.
      
      
      BitKeeper/etc/ignore:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Ignore auto-generated Windows embedded resources.
      CMakeLists.txt:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Hardcode CSV for all configurations.
        - Add client directory for gen_lex_hash dependency.
      client/CMakeLists.txt:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Build the mysqlclient library and echo for the embedded solution.
      client/client_priv.h:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Defined new option.
      client/mysql.cc:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Add server-arg command line parameter
      libmysqld/CMakeLists.txt:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Added auto generated resources; sql_yacc.cc, sql_yacc.h, message.rc
        message.h and lex_hash.h.
        - Link csv library to libmsyqld.
      libmysqld/Makefile.am:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Include CMakeLists.txt in dist.
      libmysqld/examples/CMakeLists.txt:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Follow existing naming convention.
      libmysqld/examples/Makefile.am:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Include CMakeLists.txt in dist.
      mysql-test/mysql-test-run.pl:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Move embedded option block earlier in the script.
        - Added the path to the libmysqld.dll to Windows path.
      win/README:
        Bug#29903 The CMake build method does not produce the embedded library.
        - Add instructions for building/testing the embedded library.
      c6c57ed7
    • unknown's avatar
      Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team · 78a52138
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
      
      
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      strings/conf_to_src.c:
        Auto merged
      strings/ctype-extra.c:
        Auto merged
      78a52138
    • unknown's avatar
      Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 6c1edb11
      unknown authored
      into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
      
      
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      6c1edb11