mariadb/ndb
unknown 413d2e28b6 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2006-11-02 02:38:41 +03:00
..
bin .del-mysqlclusterd~7ebaf8faea0a1100: 2004-06-16 16:59:33 +00:00
config BUG#16282 2006-09-11 16:49:44 +02:00
demos Removed unnecessary README files 2004-04-14 15:42:56 +02:00
docs Merge 2005-11-04 02:17:11 +01:00
home removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
include Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp 2006-10-25 10:46:00 +02:00
lib Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
ndbapi-examples updated example makefiles to add libmystrings 2005-03-03 20:21:45 +01:00
src ndb - revert bug to wait for "proper" bug fix 2006-11-01 16:14:49 +01:00
test Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb 2006-10-11 17:21:58 +02:00
tools Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 2006-11-02 02:38:41 +03:00
Makefile.am Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 2006-06-17 15:42:24 +02:00