1. 20 Nov, 2005 1 commit
  2. 19 Nov, 2005 3 commits
    • guilhem@mysql.com's avatar
      Fix after merge of 5.0 into 5.1. Failed tests before merge: bdb-deadlock, ndb_cache2, ndb_multi2, · b3845d1f
      guilhem@mysql.com authored
      ps_6bdb (this one fails circa once over 4 runs). After the merge: the same PLUS mysql_client_test&sp (due to problem in fix of BUG#14845 which has also
      been noticed in 5.0 too and Konstantin is looking at it) PLUS mysqlcheck (just consequence of mysql_client_test).
      And a replication bugfix (thd->spcont must be taken into account when calling tables_ok(), as in 5.0,
      and so some brackets were missing which changed one test).
      Pekka will look at the NDB code where I just used "ul": ndb_charset test, and storage/ndb/src/kernel/vm/SimulatedBlock.cpp
      and storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (SimulatedBlock.hpp automerged);
      please also check storage/ndb/src/ndbapi/NdbRecAttr.cpp. Petr please check ha_tina.cc.
      b3845d1f
    • guilhem@mysql.com's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a7c3aed5
      guilhem@mysql.com authored
      into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
      a7c3aed5
    • guilhem@mysql.com's avatar
      Merge mysql.com:/home/mysql_src/mysql-5.0-van · 24006266
      guilhem@mysql.com authored
      into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
      (2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
      and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).
      24006266
  3. 18 Nov, 2005 12 commits
  4. 17 Nov, 2005 20 commits
  5. 16 Nov, 2005 4 commits