1. 30 Nov, 2005 11 commits
  2. 29 Nov, 2005 17 commits
  3. 28 Nov, 2005 12 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 00274bc5
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      00274bc5
    • unknown's avatar
      Updated show_check.result. · 594ac515
      unknown authored
      
      mysql-test/r/show_check.result:
        Updated result.
      594ac515
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · aecc67b2
      unknown authored
      into  mysql.com:/usr/local/mysql/mysql-5.0
      
      
      aecc67b2
    • unknown's avatar
      Changed mysqld.dsp to avoid compilation error in VC++ · afaf1fd3
      unknown authored
      
      VC++Files/sql/mysqld.dsp:
        Corrected wrong path to ha_archive.cpp (causes compilation
         error in VC++)
      afaf1fd3
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 8c7852ba
      unknown authored
      into  mysql.com:/usr/home/pem/mysql-5.1-new
      
      
      include/my_base.h:
        Auto merged
      libmysqld/examples/Makefile.am:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/ndb_alter_table.result:
        Auto merged
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/t/ndb_alter_table.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/examples/ha_example.cc:
        Auto merged
      storage/myisam/ft_parser.c:
        Auto merged
      storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
        Auto merged
      storage/ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      libmysqld/Makefile.am:
        Manual merge.
      sql/ha_ndbcluster.cc:
        Manual merge.
      sql/mysqld.cc:
        Manual merge.
      8c7852ba
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-5792 · b34c9cfb
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      client/mysql.cc:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      b34c9cfb
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-14956 · 4b50aca5
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/t/ps.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/ps.result:
        SCCS merged
      4b50aca5
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-14155 · 6c41013e
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/t/create.test:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/create.result:
        Resolve conflict
      6c41013e
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · e7bfd242
      unknown authored
      into mysql.com:/M50/mysql-5.0
      
      
      e7bfd242
    • unknown's avatar
    • unknown's avatar
      mysql-test/t/alter_table.test · 7d9861ec
      unknown authored
          Care for case-insignificant platforms (Mac OS X, Windows).
      
      
      mysql-test/t/alter_table.test:
        Care for case-insignificant platforms (Mac OS X, Windows).
      7d9861ec
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · a796fc48
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
      
      
      a796fc48