1. 02 Feb, 2006 21 commits
    • unknown's avatar
      Merge localhost:src/51-new · 5739f659
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-5.1-new
      
      
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        SCCS merged
      5739f659
    • unknown's avatar
      ndb - remove debug printouts · 7e2c70e7
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        remove debug printouts
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        remove debug printouts
      7e2c70e7
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new · 5499e422
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      5499e422
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a95d92f8
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      a95d92f8
    • unknown's avatar
      added more logging in ndb handler · aca168aa
      unknown authored
          enable extra logging in ndb handler during test runs
      
      
      mysql-test/mysql-test-run.pl:
        enable extra logging in ndb handler during test runs
      sql/ha_ndbcluster_binlog.cc:
        added more logging in ndb handler
      aca168aa
    • unknown's avatar
      0321006e
    • unknown's avatar
      disbled sporadically failing testcase · 10b73938
      unknown authored
      10b73938
    • unknown's avatar
      ndb dd - fix newly introduced bug in drop table · 56fadd55
      unknown authored
      
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Fix drop table with mapped pages
      56fadd55
    • unknown's avatar
      ndb dd · 6db8fa17
      unknown authored
        Fix SR bug that extent pages was scanned before undo was run
        Fix bug wrt page flushing/tsman and tup's dirty page list
      
      
      storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        remove some unused code
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Add LCP_PREPARE to pgman
        Change order between TSMAN/LGMAN START_RECREQ
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/diskpage.hpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/lgman.cpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/pgman.cpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/pgman.hpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/tsman.cpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/blocks/tsman.hpp:
        Fix dd SR + dd free space bugs
      storage/ndb/src/kernel/vm/DLFifoList.hpp:
        Fix dd SR + dd free space bugs
      storage/ndb/test/tools/hugoLoad.cpp:
        Fix dd SR + dd free space bugs
      storage/ndb/tools/delete_all.cpp:
        Fix dd SR + dd free space bugs
      6db8fa17
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-release · e24b662d
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      e24b662d
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6519ebab
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql51
      
      6519ebab
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge · 5a3c3045
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/ha_berkeley.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      mysql-test/mysql-test-run.pl:
        SCCS merged
      sql/sql_yacc.yy:
        Manual merge: resolve the conflict with moved sp_if rule
      5a3c3045
    • unknown's avatar
      Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f61c2323
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
      
      f61c2323
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · cc853bc8
      unknown authored
      into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
      
      cc853bc8
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 37a814ec
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.1.new.ctype
      
      37a814ec
    • unknown's avatar
      WL#1386 - CTYPE table for unicode character sets · bba93b58
      unknown authored
      A prerequisite for several fulltext and XML bugs.
      MY_CHARSET_HANDLER now has a new function "ctype"
      to detect a type of the next character in a string
      (i.e. digit, letter, space, punctuation, control, etc),
      which now works correctly for both 8bit and multibyte charsets.
      Previously only 8bit charsets worked correctly,
      while any multibyte character was considered as letter
      in multibyte charsets.
      Many files:
        Adding new function
      Makefile.am:
        Adding build rules for uctypedump,
        a dump tool to create my_uctype.h
        using Unicode Character Database file.
      m_ctype.h:
        Adding declaration of my_uni_ctype,
        ctype data for Unicode.
        Adding new member into MY_CHARSET_HANDLER
      Makefile.am:
        Adding my_uctype.h into noinst_HEADERS
      my_uctype.h, uctypedump.c:
        new files:
        ctype data for unicode,
        and the tool to generate it from 
        a Unicode Character Database file.
      
      
      
      include/Makefile.am:
        Adding my_uctype.h
      include/m_ctype.h:
        Adding declaration of my_uni_ctype,
        ctype data for Unicode.
      strings/Makefile.am:
        Adding build rules for uctypedump,
        a dump tool to create my_uctype.h
        using Unicode Character Database file.
      strings/ctype-big5.c:
        Adding new function
      strings/ctype-bin.c:
        Adding new function
      strings/ctype-cp932.c:
        Adding new function
      strings/ctype-euc_kr.c:
        Adding new function
      strings/ctype-eucjpms.c:
        Adding new function
      strings/ctype-gb2312.c:
        Adding new function
      strings/ctype-gbk.c:
        Adding new function
      strings/ctype-latin1.c:
        Adding new function
      strings/ctype-mb.c:
        Adding new function
      strings/ctype-simple.c:
        Adding new function
      strings/ctype-sjis.c:
        Adding new function
      strings/ctype-tis620.c:
        Adding new function
      strings/ctype-ucs2.c:
        Adding new function
      strings/ctype-ujis.c:
        Adding new function
      strings/ctype-utf8.c:
        Adding new function
      bba93b58
    • unknown's avatar
      Post-merge fixes. · cb91d942
      unknown authored
      
      mysql-test/t/disabled.def:
        disabling new test that was added during null-merge from 5.0
        the new test innodb_unsafe_binlog will be re-enabled when the
        5.1 snapshot for InnoDB is applied. Disabling test rather than
        removing files to make future merges easier (removing the files
        would cause merge conflicts when the files are re-added in the
        5.1 snapshot).
      cb91d942
    • unknown's avatar
      build fix for solaris 10 sparc -max · d1841f72
      unknown authored
      
      sql/ha_ndbcluster.cc:
        ndbcluster_fill_files_table should return int
      d1841f72
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0979459d
      unknown authored
      into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
      
      
      sql/ha_innodb.cc:
        Auto merged
      0979459d
    • unknown's avatar
      build fix when building with example storage engine. · 84940191
      unknown authored
      
      storage/example/ha_example.cc:
        add handlerton call for fill files table
      84940191
  2. 01 Feb, 2006 19 commits