1. 11 Dec, 2006 3 commits
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 7dc7c8d9
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      sql/sql_class.h:
        Auto merged
      client/mysqlbinlog.cc:
        Manual merge
      7dc7c8d9
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 721b8f87
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      sql/sql_class.h:
        Auto merged
      721b8f87
    • unknown's avatar
      Bug#23735 mysqlbinlog client fails when reading binlog from stdin · 29ff97f8
      unknown authored
       - Windows opens stdin in text mode by default. Certain characters
         such as CTRL-Z are interpeted as events and the read() method
         will stop. CTRL-Z is the EOF marker in Windows. to get past this
         you have to open stdin in binary mode. Setmode() is used to set
         stdin in binary mode. Errors on setting this mode result in
         halting the function and printing an error message to stderr.
      
      
      client/mysqlbinlog.cc:
        Apply fix to 5.0 as well
      29ff97f8
  2. 08 Dec, 2006 16 commits
  3. 07 Dec, 2006 6 commits
  4. 06 Dec, 2006 5 commits
  5. 05 Dec, 2006 10 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-maint · e669bcd6
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      e669bcd6
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 8ef1be3d
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      8ef1be3d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-maint · c586037a
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      c586037a
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 64f5ce7e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ndb_update.result:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      storage/ndb/src/common/util/socket_io.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/Services.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      storage/ndb/tools/ndb_condig.cpp:
        Auto merged
      storage/ndb/src/common/util/File.cpp:
        Manual merge
      storage/ndb/src/common/util/InputStream.cpp:
        Manual merge
      64f5ce7e
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 429cf988
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      429cf988
    • unknown's avatar
      Remove hack that removes vardir · b121562b
      unknown authored
      b121562b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1-build · 00cfa1c0
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      00cfa1c0
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 439e4aff
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/parser.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/sp_gis.result:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/parser.test:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      439e4aff
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1 · 9282ad20
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
      
      
      9282ad20
    • unknown's avatar
      Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883 · afba0de8
      unknown authored
      
      client/mysqltest.c:
        Exclude
      afba0de8