1. 29 Mar, 2005 31 commits
  2. 28 Mar, 2005 9 commits
    • unknown's avatar
      Merge · 4884bb8e
      unknown authored
      
      client/mysqltest.c:
        Auto merged
      BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      mysql-test/r/grant2.result:
        Auto merged
      mysql-test/r/metadata.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/ps_6bdb.result:
        Auto merged
      mysql-test/r/type_enum.result:
        Auto merged
      mysql-test/t/grant2.test:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
        SCCS merged
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        SCCS merged
      sql/sql_union.cc:
        DBUG_ASSERT(TRUE) is useless so assume opposite
      4884bb8e
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3eae2226
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      3eae2226
    • unknown's avatar
      ndb - set up long key page vars in ACC_LOCKREQ (bug#????) · ba8e8b06
      unknown authored
      
      ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
        set up long key page vars in ACC_LOCKREQ
      ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
        set up long key page vars in ACC_LOCKREQ
      ba8e8b06
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 4a895da7
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      4a895da7
    • unknown's avatar
      Merge mysql.com:/export/space/pekka/ndb/version/my41 · 28f84799
      unknown authored
      into mysql.com:/export/space/pekka/ndb/version/my50
      
      28f84799
    • unknown's avatar
      ndb - make printSchemaFile available (compile manually) · b8bb41ee
      unknown authored
      
      BitKeeper/deleted/.del-Makefile~b03e75f2bff8d72:
        Delete: ndb/src/kernel/blocks/dbdict/printSchemafile/Makefile
      ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
        compile manually
      b8bb41ee
    • unknown's avatar
      Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1 · e1b34744
      unknown authored
      into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
      
      
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      e1b34744
    • unknown's avatar
      union.test: · a105d5bf
      unknown authored
        Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
        Prove that this problem was fixed with bug9425 fix too.
      
      
      mysql-test/t/union.test:
        Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
        Prove that this problem was fixed with bug9425 fix too.
      a105d5bf
    • unknown's avatar
      item_func.cc: · 30115ace
      unknown authored
        Post merge additional fix for DECIMAL type:
        Bugs: #9425: A user variable doesn't always have implicit coercibility
      
      
      sql/item_func.cc:
        Post merge additional fix for DECIMAL type:
        Bugs: #9425: A user variable doesn't always have implicit coercibility
      30115ace