mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/ndb
History
unknown e9c64ae296 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean


extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/select.test:
  Resolve conflicts
scripts/mysqld_safe.sh:
  Resolve conflict
sql/item.cc:
  Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
  can be longer in 5.0 than 4.1.
sql/log_event.cc:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Remove incorrect fix (merge from 4.1)
sql/sql_show.cc:
  Resolve conflict
2005-07-19 11:05:49 -07: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 Merge mysql.com:/home/jonas/src/mysql-5.0 2005-01-29 07:11:22 +01:00
home removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
include Merge 2005-07-15 14:13:23 +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 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-19 11:05:49 -07:00
test Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-06-30 12:20:52 +02:00
tools Merge 2005-07-15 01:41:59 +02:00
Makefile.am moved sorting and duplicate check for unique indexes from api to kernel 2005-01-27 10:44:47 +01:00