mariadb/netware
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
..
BUILD
comp_err.def
init_db.sql
install_test_db.ncf
isamchk.def
isamlog.def
libmysql.def
libmysql.imp
libmysqlmain.c
Makefile.am
my_manage.c
my_manage.h
my_print_defaults.def
myisam_ftdump.def
myisamchk.def
myisamlog.def
myisampack.def
mysql.def
mysql.xdc
mysql_fix_privilege_tables.pl
mysql_install.def
mysql_install_db.c
mysql_install_db.def
mysql_secure_installation.pl
mysql_test_run.c
mysql_test_run.def
mysql_waitpid.def
mysqladmin.def
mysqlbinlog.def
mysqlcheck.def
mysqld.def
mysqld_safe.c
mysqld_safe.def
mysqldump.def
mysqlimport.def
mysqlshow.def
mysqltest.def
pack_isam.def
perror.def
replace.def
resolve_stack_dump.def
resolveip.def
static_init_db.sql
test_db.sql