mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/ndb
History
unknown 9f04f9d035 Merge with 4.1 
BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
myisam/myisamlog.c:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/heap_hash.result:
  Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
netware/BUILD/nwbootstrap:
  merge: keep local
scripts/make_binary_distribution.sh:
  merge: keep local
sql/ha_heap.cc:
  Trivial merge
sql/ha_innodb.cc:
  Auto merge (Code already existed in 5.0)
sql/item_cmpfunc.cc:
  Simple merge
sql/item_func.cc:
  Simple merge
sql/item_row.cc:
  Simple merge
sql/item_strfunc.cc:
  Simple merge
sql/item_subselect.cc:
  Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
2005-02-10 02:27:37 +02:00
..
bin .del-mysqlclusterd~7ebaf8faea0a1100: 2004-06-16 16:59:33 +00:00
config added ndb_init.h to distribution 2004-12-21 10:37:12 +01:00
demos Removed unnecessary README files 2004-04-14 15:42:56 +02:00
docs small Makefile.am cleanup 2005-01-28 17:14:03 +01:00
examples Bug#7626 2005-01-13 23:26:59 +01:00
home removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
include Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-05 07:17:53 +01:00
lib Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
src Merge with 4.1 2005-02-10 02:27:37 +02:00
test Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-08 11:12:55 +01:00
tools Merge 2005-01-28 00:47:41 +01:00
Makefile.am wl1744 - more script fixes 2004-11-12 09:18:26 +01:00