unknown 494bccf044 Merging ...

mysql-test/ndb/ndbcluster.sh:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/spatial.h:
  Auto merged
mysql-test/r/type_float.result:
  merging
sql/item_func.cc:
  merging

2006-01-21 18:50:06 +04:00

..

basic_log.result

ndbcluster.sh:

2004-12-08 21:48:32 +00:00

basic.result

updated ndb_mgm test

2005-01-09 23:02:06 +01:00

basic.test

ndbcluster.sh:

2004-12-08 21:48:32 +00:00

Makefile.am

ndb_port_base is obsolete with WL#2278

2005-02-09 19:29:37 +01:00

ndb_config_2_node.ini

ndb_port_base is obsolete with WL#2278

2005-02-09 19:29:37 +01:00

ndbcluster.sh

Merging

2006-01-21 18:50:06 +04:00

restart_log.result

ndbcluster.sh:

2004-12-08 22:56:23 +00:00

restart.result

ndbcluster.sh:

2004-12-08 22:56:23 +00:00

restart.test

updated ndb_mgm test

2005-01-09 23:02:06 +01:00