1. 26 Jul, 2005 19 commits
    • unknown's avatar
      Merge hundin.mysql.fi:/home/marko/mysql-4.1 · 2e4283e0
      unknown authored
      into  hundin.mysql.fi:/home/marko/mysql-5.0
      
      
      innobase/include/os0file.h:
        Automerge and manual fix
      innobase/os/os0file.c:
        Automerged
      innobase/trx/trx0sys.c:
        Automerged
      2e4283e0
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 3521daed
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      BitKeeper/deleted/.del-ctype-cp932.c:
        Auto merged
      strings/ctype-big5.c:
        Auto merged
      strings/ctype-gbk.c:
        Auto merged
      strings/ctype-sjis.c:
        Auto merged
      strings/ctype-mb.c:
        after merge fix
      strings/ctype-simple.c:
        after merge fix
      strings/ctype-ucs2.c:
        after merge fix
      strings/ctype-ujis.c:
        after merge fix
      strings/ctype-utf8.c:
        After merge fix
      3521daed
    • unknown's avatar
      ctype-big5.c: · f12ded49
      unknown authored
      ctype-cp932.c:
      ctype-gbk.c:
      ctype-mb.c:
      ctype-simple.c:
      ctype-sjis.c:
      ctype-ucs2.c:
      ctype-ujis.c:
      ctype-utf8.c:
      
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      
      
      strings/ctype-big5.c:
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      strings/ctype-cp932.c:
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      strings/ctype-gbk.c:
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      strings/ctype-mb.c:
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      strings/ctype-simple.c:
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      strings/ctype-sjis.c:
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      strings/ctype-ucs2.c:
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      strings/ctype-ujis.c:
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      strings/ctype-utf8.c:
        Adding explicit cast to return type
        in pointer substructions to avoid
        warnings from some compilers.
      f12ded49
    • unknown's avatar
      InnoDB: Do not flush after each write, not even when creating the · aee8de35
      unknown authored
      data files.  Previously, writes were flushed until the doublewrite
      buffer was created.  That would be too slow on systems where
      os_file_flush() [or fsync(2)] is slow.  (Bug #12125)
      
      
      innobase/include/os0file.h:
        Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
      innobase/os/os0file.c:
        Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
      innobase/trx/trx0sys.c:
        Disable os_do_not_call_flush_at_each_write unless #ifdef UNIV_DO_FLUSH
      aee8de35
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · d66c9e50
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      d66c9e50
    • unknown's avatar
      Bug#10201 group_concat returns string with binary collation · 4d7aaed1
      unknown authored
      item.cc:
        After merge fixes.
      func_gconcat.result:
        After merge fixes
      
      
      mysql-test/r/func_gconcat.result:
        After merge fixes
      sql/item.cc:
        After merge fixes.
      4d7aaed1
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b10201 · 5fa6e3c5
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.hpp:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      include/config-netware.h:
        auto merge fix
      libmysql/libmysql.def:
        after merge fix
      sql/item_func.cc:
        SCCS merged
      5fa6e3c5
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · d66d45ef
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b10201
      
      
      d66d45ef
    • unknown's avatar
      func_gconcat.result, func_gconcat.test: · 8624bcfd
      unknown authored
        Adding test
      item_sum.cc:
        Adding a call for collation/charset aggregation,
            to collect attributes from the arguments. The actual bug fix.
      item_func.h, item_func.cc, item.h, item.cc:
        - Removing collation aggrgation functions from Item_func class
            in item.cc, and adding it as non-class functions in item.cc
            to be able to reuse this code for group_concat.
            - Adding replacement for these functions into Item_func class
            as wrappers for moved functions, to minizize patch size,
      
      
      sql/item.cc:
        - Removing collation aggrgation functions from Item_func class
            in item.cc, and adding it as non-class functions in item.cc
            to be able to reuse this code for group_concat.
            - Adding replacement for these functions into Item_func class
            as wrappers for moved functions, to minizize patch size,
      sql/item.h:
        - Removing collation aggrgation functions from Item_func class
            in item.cc, and adding it as non-class functions in item.cc
            to be able to reuse this code for group_concat.
            - Adding replacement for these functions into Item_func class
            as wrappers for moved functions, to minizize patch size,
      sql/item_func.cc:
        - Removing collation aggrgation functions from Item_func class
            in item.cc, and adding it as non-class functions in item.cc
            to be able to reuse this code for group_concat.
            - Adding replacement for these functions into Item_func class
            as wrappers for moved functions, to minizize patch size,
      sql/item_func.h:
        - Removing collation aggrgation functions from Item_func class
            in item.cc, and adding it as non-class functions in item.cc
            to be able to reuse this code for group_concat.
            - Adding replacement for these functions into Item_func class
            as wrappers for moved functions, to minizize patch size,
      sql/item_sum.cc:
        Adding a call for collation/charset aggregation,
            to collect attributes from the arguments. The actual bug fix.
      mysql-test/t/func_gconcat.test:
        Adding test
      mysql-test/r/func_gconcat.result:
        Adding test
      8624bcfd
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 74e00311
      unknown authored
      into  hundin.mysql.fi:/home/jan/mysql-5.0
      
      
      74e00311
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4cc9707e
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b11546
      
      
      4cc9707e
    • unknown's avatar
      a fix (bug #11546: Bad error message from inserting out of range values, SQL_MODE='tradition'). · 607852cf
      unknown authored
      
      sql/field.cc:
        a fix (bug #11546: Bad error message from inserting out of range values, SQL_MODE='tradition').
        raise an error in case of strict mode for bit fields.
      607852cf
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · a41f7d72
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      a41f7d72
    • unknown's avatar
      ndb - changed config · 359b78f1
      unknown authored
      
      mysql-test/r/ndb_config.result:
        changed config
      359b78f1
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 185525b6
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      185525b6
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 43f8b39d
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-5.0
      
      
      43f8b39d
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1 · 6bac3d43
      unknown authored
      into  mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      6bac3d43
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · c9175888
      unknown authored
      into  hundin.mysql.fi:/home/jan/mysql-5.0
      
      
      c9175888
    • unknown's avatar
      ndb_config test requires ndb · 702f17ee
      unknown authored
      
      mysql-test/t/ndb_config.test:
        test requires ndb
      702f17ee
  2. 25 Jul, 2005 14 commits
  3. 24 Jul, 2005 7 commits