1. 15 Aug, 2007 1 commit
    • unknown's avatar
      Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one) · 9c1ffac0
      unknown authored
      mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.
      
      This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).
      
      
      mysql-test/r/handler.result:
        Bug#25856 test result
      mysql-test/t/handler.test:
        Bug#25856 test case
      sql/sql_handler.cc:
        Move the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close
      9c1ffac0
  2. 08 Aug, 2007 1 commit
  3. 06 Aug, 2007 4 commits
  4. 05 Aug, 2007 5 commits
    • 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
      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
  5. 04 Aug, 2007 2 commits
  6. 03 Aug, 2007 7 commits
    • 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
      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
      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
    • unknown's avatar
      .del-readme.txt-grumble-grumble: · 712d7fa2
      unknown authored
        Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble
      
      
      BitKeeper/deleted/.del-readme.txt-grumble-grumble:
        Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble
      712d7fa2
    • unknown's avatar
      After merge fix · be04bf55
      unknown authored
      be04bf55
    • unknown's avatar
      Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 · 0d1972aa
      unknown authored
      into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
      
      
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/t/ctype_utf8.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
      mysql-test/r/ctype_ucs.result:
        After merge fix
      mysql-test/t/ctype_ucs.test:
        After merge fix
      0d1972aa
    • unknown's avatar
      Bug#28875 Conversion between ASCII and LATIN1 charsets does not function · 53df09a9
      unknown authored
      (Regression, caused by a patch for the bug 22646).
      Problem: when result type of date_format() was changed from
      binary string to character string, mixing date_format()
      with a ascii column in CONCAT() stopped to work.
      Fix:
      - adding "repertoire" flag into DTCollation class,
      to mark items which can return only pure ASCII strings.
      - allow character set conversion from pure ASCII to other character sets.
      
      
      include/m_ctype.h:
        Defining new flags.
        Adding new function prototypes.
      mysql-test/r/ctype_ucs.result:
        Adding tests.
      mysql-test/r/ctype_utf8.result:
        Adding tests.
      mysql-test/r/func_time.result:
        Adding tests.
      mysql-test/t/ctype_ucs.test:
        Adding tests.
      mysql-test/t/ctype_utf8.test:
        Adding tests.
      mysql-test/t/func_time.test:
        Adding test.
      mysys/charset.c:
        Adding pure ASCII detection when loading a dynamic character set.
      sql/item.cc:
        - Moving detection of a Unicode superset into function.
        - Adding detection of a ASCII subset.
        - Adding creation of to-ASCII character set convertor when
          safe_charset_converter() failed and when the argument.
          repertoire is know to be pure ASCII.
      sql/item.h:
        - Adding "repertoire" member into DTCollation class.
        - Adding "repertoire" argument to constructors.
        - Adding new methods:
          set_repertoire_from_charset()
          set_repertoire_from_value()
      sql/item_func.cc:
        Adding "repertoire" argument.
      sql/item_strfunc.cc:
        Adding "repertoire" argument.
      sql/item_timefunc.cc:
        Initializing the result repertoire taking into account the "is_ascii"
        flag of the current locale.
      sql/sql_lex.cc:
        Detect 7bit strings, return in Lex->text_string_is_7bit.
      sql/sql_lex.h:
        Adding new member into LEX structure.
        Adding new member into Lex_input_stream
      sql/sql_string.cc:
        Allow simple copy from pure ASCII to a ASCII-based character set.
      sql/sql_yacc.yy:
        Depening on Lex->text_string_is_7bit and character set features,
        create Item_string with MY_REPERTOIRE_ASCII when it is possible.
      strings/conf_to_src.c:
        - Adding printing of the "MY_CS_PUREASCII" flag
        - Adding printing of copyright
      strings/ctype-extra.c:
        Recreating ctype-extra.c: ascii_general_ci and ascii_bin
        are now marked with MY_CS_PUREASCII flag.
      strings/ctype.c:
        Adding new functions.
      53df09a9
  7. 02 Aug, 2007 20 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 5000893f
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      5000893f
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 0fe21fdc
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      0fe21fdc
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 02daa6f3
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      sql/CMakeLists.txt:
        Auto merged
      02daa6f3
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 50cb2b97
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      50cb2b97
    • unknown's avatar
      make_win_bin_dist: · 4d2630ed
      unknown authored
        Simplified copying of 'mysql-test' directory
      
      
      scripts/make_win_bin_dist:
        Simplified copying of 'mysql-test' directory
      4d2630ed
    • unknown's avatar
      Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1 · f639db30
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-5.0
      
      
      myisam/myisamchk.c:
        Auto merged
      f639db30
    • unknown's avatar
      Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 0de7ddf0
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1
      
      
      0de7ddf0
    • unknown's avatar
      myisamchk.c: · fb828592
      unknown authored
        Fix typo in usage.
      
      
      myisam/myisamchk.c:
        Fix typo in usage.
      fb828592
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 6e20710c
      unknown authored
      into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
      
      
      6e20710c
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 9687988e
      unknown authored
      into  mysql.com:/home/ram/work/b30088/b30088.5.0
      
      
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      9687988e
    • unknown's avatar
      CMakeLists.txt (several), make_win_bin_dist: · def8d6b3
      unknown authored
        Aligned client library build and use with the Unix version when it
        comes to what source to include directly in the builds, and what
        libraries to link with (bug#30118).
      
        Also reviewed, corrected and made more clear when static or dynamic
        Thread Local Storage is to be used. Some code duplication was removed,
        and some redundant library usage were removed, reducing the risk of
        incorrect TLS usage.
      
      
      client/CMakeLists.txt:
        - Removed code duplication by moving build of "mysqlclient" to
          the "libmysql" directory
        - Link clients with the new "mysqlclient_notls", to protect for
          the case the clients use more than the client API, and access
          thread data directly.
        - Synced explicit target addition of sources with Unix.
      dbug/CMakeLists.txt:
        No need to set CXX flags, no C++ code
      libmysql/CMakeLists.txt:
        - Aligned more with Unix version when it comes to included source files
        - Build both DLL and static library in this directory
        - Produce separe static TLS version of the static client library, for
           use when building clients in this build that might access TLS
           storage directly.
      mysys/CMakeLists.txt:
        We only have to build the static TLS version, as no clients are
        linking directly with the "mysys" library.
      scripts/make_win_bin_dist:
        Ajusted paths to new "mysqlclient.lib" location in source tree
      sql/CMakeLists.txt:
        Removed duplicate "ha_blackhole.cc" in file listing
        Removed explicit link to "dbug.lib" not needed
        Link with the static TLS "mysqlclient_notls"
      tests/CMakeLists.txt:
        Removed explicit link to "dbug", "mysys", "yassl", "taocrypt" and
        "zlib" not needed.
        Added explicit source addition "../mysys/my_memmem.c".
        No need for setting CXX flags, no C++ code.
        Use the static TLS "mysqlclient_notls" for linkage.
      zlib/CMakeLists.txt:
        No need for a dynamic TLS version of this library, no access to thread
        storage is done from it. Also no need to define MYSQL_CLIENT, not used,
        or __WIN32__ that is handled by the library header without this define.
      def8d6b3
    • unknown's avatar
      Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol · 898333f8
      unknown authored
      Problem: thd->thread_specific_used flag is not set executing a statement
      containig connection_id() function using PS protocol, that leads to 
      improper binlog event creation.
      
      Fix: set the flag in the Item_func_connection_id::fix_fields().
      
      
      sql/item_create.cc:
        Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
          - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
            to have it properly set using PS protocol as well.
      sql/item_func.cc:
        Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
          - set the thd->thread_specific_used flag in the Item_func_connection_id::fix_fields()
            to have it properly set using PS protocol as well.
      sql/sql_parse.cc:
        Fix for bug #30200: mysqlbinlog.test: connection_id() not restored under ps-protocol
          - reset the thd->thread_specific_used flag in the mysql_reset_thd_for_next_command().
      898333f8
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 4fa1ad31
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      4fa1ad31
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · d0738596
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      d0738596
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 90d62296
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/handler.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      90d62296
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · cbbc8bb3
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
      
      
      cbbc8bb3
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 7b1f5425
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      7b1f5425
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 159da8b8
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      configure.in:
        Auto merged
      159da8b8
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build · e399ae5a
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
      
      
      e399ae5a
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 9436e186
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      9436e186