1. 06 Dec, 2006 5 commits
  2. 05 Dec, 2006 25 commits
  3. 04 Dec, 2006 10 commits
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · a4804e51
      unknown authored
      into  example.com:/work/bug22369-v2/my51
      
      
      a4804e51
    • unknown's avatar
      Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint · fa52873b
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
      
      
      fa52873b
    • unknown's avatar
      Merge kpettersson@bk-internal:/home/bk/mysql-5.1-new-maint · e8236296
      unknown authored
      into  naruto.:C:/cpp/mysql-5.1-maint
      
      
      e8236296
    • unknown's avatar
      Disabled testcase flush2 until pushbild framework can handle test which · 1abd026e
      unknown authored
      disables binlog.
      
      
      mysql-test/t/disabled.def:
        disabled test flush2
      1abd026e
    • unknown's avatar
      Disabled flush2 until pushbuild framework can handle test which · 3b8e73fb
      unknown authored
      disables binlog.
      
      
      mysql-test/t/disabled.def:
        disabled test flush2.
      3b8e73fb
    • unknown's avatar
      Change ::fileno() to fileno() in ndb/common/util/File.cpp. · 56142bb2
      unknown authored
      fileno(), and many other stdio functions, may be macros
      (at least on *BSD).
      
      Don't explicitly qualify it with global scope (::fileno()),
      because it causes syntax errors.
      
      <cstdio> doesn't define *most* of these macros.
      
      It still has a macro for fileno(), however, on FreeBSD 6.1,
      so even using <cstdio> isn't a fix for this.  Better to
      just avoid ::standard_library_function() in general, in
      order to be portable.
      
      
      storage/ndb/src/common/util/File.cpp:
        fileno(), and many other stdio functions, may be macros
        (at least on *BSD).
        
        Don't explicitly qualify it with global scope (::fileno()),
        because it causes syntax errors.
        
        Note that <cstdio> doesn't define *most* of these macros.
        It still has a macro for fileno(), however, on FreeBSD 6.1,
        so even using <cstdio> isn't a fix for this.  Better to
        just avoid ::standard_library_function() in general, in
        order to be portable.
      56142bb2
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 1009083a
      unknown authored
      into  example.com:/work/bug22369-v2/my51
      
      
      1009083a
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 · d0482fee
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      d0482fee
    • unknown's avatar
      Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 · 23a30bdb
      unknown authored
      into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      23a30bdb
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · f3bac9cf
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      Docs/Makefile.am:
        Auto merged
      Makefile.am:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      extra/yassl/taocrypt/include/algebra.hpp:
        Auto merged
      include/Makefile.am:
        Auto merged
      mysql-test/lib/mtr_io.pl:
        Auto merged
      mysql-test/lib/mtr_misc.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/rpl_sp.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/myisam/mi_open.c:
        Auto merged
      storage/myisam/myisampack.c:
        Auto merged
      f3bac9cf