1. 06 Aug, 2007 1 commit
    • unknown's avatar
      make_win_bin_dist: · dd75eb67
      unknown authored
        Copy embedded .pdb and static debug lib
      
      
      scripts/make_win_bin_dist:
        Copy embedded .pdb and static debug lib
      dd75eb67
  2. 05 Aug, 2007 4 commits
  3. 04 Aug, 2007 2 commits
  4. 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
  5. 02 Aug, 2007 22 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
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 41ac5d83
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      sql/ha_federated.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Manual merge
      mysql-test/t/innodb_mysql.test:
        Manual merge
      41ac5d83
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/41 · e65f8f84
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
      
      
      e65f8f84
  6. 01 Aug, 2007 4 commits
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1b04b4b1
      unknown authored
      into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
      
      
      1b04b4b1
    • unknown's avatar
      Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect · f87acb59
      unknown authored
      restores from mysqlbinlog out
      
      Problem: using "mysqlbinlog | mysql" for recoveries the connection_id() 
      result may differ from what was used when issuing the statement.
      
      Fix: if there is a connection_id() in a statement, write to binlog
      SET pseudo_thread_id= XXX; before it and use the value later on.
      
      
      mysql-test/r/mysqlbinlog.result:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - test result.
      mysql-test/t/mysqlbinlog.test:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - test case.
      sql/item_create.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - set thread_specific_used flag for the connection_id() function.
      sql/item_func.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - always return thd->variables.pseudo_thread_id as a connection_id() 
        result, as it contains a proper value for both master and slave.
      sql/log_event.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - set LOG_EVENT_THREAD_SPECIFIC_F event flag if thread_specific_used
        is set.
      sql/sql_class.cc:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - thd->thread_specific_used introduced, which is set if thread specific 
        value(s) used in a statement.
      sql/sql_class.h:
        Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
        restores from mysqlbinlog out
          - thd->thread_specific_used introduced, which is set if thread specific 
        value(s) used in a statement.
      f87acb59
    • unknown's avatar
      Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · ce045a82
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
      
      
      ce045a82
    • unknown's avatar
      Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint · 12235197
      unknown authored
      into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
      
      
      12235197