unknown 8f7696d266 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb ...

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines


extra/perror.c:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/t/disabled.def:
  manual merge

2007-06-17 17:21:27 +02:00

..

consumer_printer.cpp

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore

2007-03-07 13:44:54 +07:00

consumer_printer.hpp

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

consumer_restore.cpp

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

2007-06-17 17:21:27 +02:00

consumer_restore.hpp

BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected. With --no-upgrade (-u) option, user can decide if ignore the upgrade, the default action is to upgrade them.

2007-04-24 09:45:15 +08:00

consumer_restorem.cpp

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

consumer.cpp

Merge mysql.com:/home/kent/bk/main/mysql-5.0

2006-12-23 20:20:40 +01:00

consumer.hpp

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb

2007-02-15 16:27:21 +08:00

ndb_nodegroup_map.h

Many files:

2006-12-27 02:23:51 +01:00

restore_main.cpp

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

2007-05-24 13:24:36 +03:00

Restore.cpp

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca

2007-06-05 18:00:42 +02:00

Restore.hpp

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

2007-04-13 01:45:44 +02:00