mariadb/ndb/test
unknown e2edf02421 Merge with 4.1
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
vio/viosocket.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  simple merge
sql/field.cc:
  simple merge
sql/item.h:
  simple merge
sql/sql_lex.h:
  simple merge
sql/sql_yacc.yy:
  Merge
  (join_table_list was not comptely merged. Need to run test to know how things works...)
sql/table.cc:
  Keep code from 5.0, except delted one not needed line
strings/ctype-ucs2.c:
  Auto merge
2005-02-15 17:12:13 +02:00
..
include merge 2005-02-03 17:04:27 +01:00
ndbapi Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-08 11:12:55 +01:00
ndbnet Initial revision of NDB Cluster files 2004-04-14 10:53:21 +02:00
newtonapi ndb source tree cleanup, see respective file 2004-06-07 17:31:32 +00:00
odbc removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
run-test Merge with 4.1 2005-02-15 17:12:13 +02:00
src Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-04 06:10:56 +01:00
tools corrected automerge error 2005-02-03 17:00:51 +01:00
Makefile.am wl1744 - ndb on windows 2004-11-10 00:03:01 +01:00