mariadb/libmysqld
unknown 15584161e2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/wait_for_socket.sh:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
2006-11-29 02:44:12 +03:00
..
examples Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init 2006-05-31 16:19:06 +02:00
copyright
emb_qcache.cc
emb_qcache.h
embedded_priv.h Merge mysql.com:/home/hf/work/mysql-4.1.mrg 2006-07-18 14:52:29 +05:00
lib_sql.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-11-29 02:44:12 +03:00
libmysqld.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
libmysqld.def bug #16513 (no mysql_set_server_option in libmysqld.dll export) 2006-08-19 15:15:36 +05:00
libmysqld.rc
Makefile.am Merge mysql.com:/home/kent/bk/mysql-4.1 2006-11-27 18:47:07 +01:00
resource.h