mariadb/libmysqld
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
..
examples small Makefile.am cleanup 2005-01-28 17:14:03 +01:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
emb_qcache.cc Fix for bug #8477 (Embedded query_cache test crashes) 2005-02-12 20:09:40 +04:00
emb_qcache.h SCRUM 2003-12-01 17:19:10 +04:00
embedded_priv.h Proposed fix for #3744 (embedded server, wrong error message if database is 2004-05-17 12:05:57 +05:00
lib_sql.cc Merging conflicts resolved 2005-01-11 21:00:53 +04:00
libmysqld.c fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file) 2005-01-03 19:21:54 +04:00
libmysqld.def libmysqld.def, libmysql.def: 2005-01-12 21:04:31 -06:00
libmysqld.rc Adding binary version information for debug/release version of libmysqld.dll 2004-08-25 02:04:45 -03:00
Makefile.am Precision Math implementation 2005-02-09 02:50:45 +04:00
resource.h Adding binary version information for debug/release version of libmysqld.dll 2004-08-25 02:04:45 -03:00