mariadb/vio
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
..
docs Fixed searching after ssl directories. 2002-09-05 16:17:08 +03:00
.cvsignore
Makefile.am merge with 4.0.15 2003-08-29 13:44:35 +03:00
test-ssl.c Added patches from Novell 2004-05-25 22:00:14 +03:00
test-sslclient.c Fixes for Netware 2003-01-28 08:38:28 +02:00
test-sslserver.c After merge fixes 2004-12-31 00:44:00 +02:00
vio.c manually merged 2004-12-31 15:26:24 +01:00
vio_priv.h Added missing timeout function for named pipes and shared memory (fixes core dump on windows) 2003-12-15 17:58:15 +02:00
viosocket.c Merge with 4.1 2005-02-15 17:12:13 +02:00
viossl.c 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
viosslfactories.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
viotest-ssl.c Fixes for Netware 2003-01-28 08:38:28 +02:00
viotest-sslconnect.cc Fixed for Ia64 + delayed key creation + a lot of small bug fixes 2000-08-15 20:09:37 +03:00
viotest.cc Fixed for Ia64 + delayed key creation + a lot of small bug fixes 2000-08-15 20:09:37 +03:00