mariadb/vio
unknown d988576610 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Remove fix as it conflicts with "import from yassl" and it's been
  fixed there
sql/ha_ndbcluster.cc:
  Merge fix of warnings
sql/sql_base.cc:
  Merge
2006-11-29 15:44:09 +01:00
..
docs Fixed searching after ssl directories. 2002-09-05 16:17:08 +03:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
CMakeLists.txt Additional files for cmake support 2006-08-31 19:52:42 +02:00
Makefile.am Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 2006-11-13 18:02:09 +01:00
test-ssl.c Remove valgrind and compiler warnings 2006-05-08 17:14:06 +02:00
test-sslclient.c Remove valgrind and compiler warnings 2006-05-08 17:14:06 +02:00
test-sslserver.c Remove valgrind and compiler warnings 2006-05-08 17:14:06 +02:00
vio.c Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02:00
vio_priv.h Cleanup SSL implementation 2006-03-10 16:41:14 +01:00
viosocket.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
viossl.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
viosslfactories.c Merge mysql.com:/home/my/mysql-5.0 2006-11-22 14:11:36 +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