1. 14 Jun, 2006 6 commits
  2. 13 Jun, 2006 1 commit
  3. 12 Jun, 2006 14 commits
  4. 10 Jun, 2006 3 commits
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 2dd1dc62
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-amerge
      
      
      mysql-test/r/lock_multi.result:
        Merging 5.0-engines to 5.0 master.
      mysql-test/t/lock_multi.test:
        Merging 5.0-engines to 5.0 master.
      2dd1dc62
    • unknown's avatar
      Post-merge fixes · a74154f4
      unknown authored
      a74154f4
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/tmp_merge · ddd55d43
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      VC++Files/client/mysql.dsp:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      client/mysqldump.c:
        Manual merge
      mysql-test/r/func_time.result:
        Manual merge
      ddd55d43
  5. 09 Jun, 2006 3 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 8e418820
      unknown authored
      into  mysql.com:/data0/mysqldev/my/mysql-5.0
      
      
      8e418820
    • unknown's avatar
      Merge trift2.mysql.com:/M50/bug20303-5.0 · 9e9a14ba
      unknown authored
      into trift2.mysql.com:/M50/mysql-5.0
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      9e9a14ba
    • unknown's avatar
      Merge mysql.com:/home/marty/MySQL/mysql-4.1 · b2d3ac1b
      unknown authored
      into  mysql.com:/home/marty/MySQL/mysql-5.0
      
      
      ndb/src/ndbapi/ndberror.c:
        Auto merged
      BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
        Merge (keeping local)
      BitKeeper/deleted/.del-NdbResultSet.hpp~e0042f4c18088ff6:
        Merge (keeping local)
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        Merge
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Merge
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Merge
      sql/ha_ndbcluster.cc:
        Merge (using local, will fix manually)
      sql/ha_ndbcluster.h:
        Merge
      b2d3ac1b
  6. 08 Jun, 2006 8 commits
  7. 07 Jun, 2006 3 commits
  8. 06 Jun, 2006 2 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 958e8387
      unknown authored
      into  mysql.com:/data0/mysqldev/my/mysql-5.0
      
      
      958e8387
    • unknown's avatar
      Fixed some problems for Windows build · 5efb70d7
      unknown authored
      
      VC++Files/client/mysql.dsp:
        Fixed omission of mysys\my_conio.c.
      VC++Files/client/mysql_ia64.dsp:
        Fixed omission of mysys\my_conio.c.
      client/mysqldump.c:
        VS compiler does not accept variable declarations within blocks.
        Such a behaviour complies with the Standard C.
      5efb70d7