mariadb/libmysqld
unknown 60b7f9d645 Merge bodhi.local:/opt/local/work/tmp_merge
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41


BitKeeper/etc/ignore:
  auto-union
libmysqld/Makefile.am:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/set_var.h:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
sql/sql_class.cc:
  Manual merge.
2006-07-08 02:30:07 +04: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 Fixes to embedded server to be able to run tests with it 2006-02-24 18:34:15 +02:00
emb_qcache.h Fix crash in embedded server due to incorrect storage of results 2005-03-31 19:17:45 -08:00
embedded_priv.h Fixes to embedded server to be able to run tests with it 2006-02-24 18:34:15 +02:00
lib_sql.cc merging 2006-06-26 22:32:02 +05:00
libmysqld.c merging 2006-06-26 22:32:02 +05:00
libmysqld.def Backport fix for mysql client not using SSl library directly 2006-04-22 00:48:13 +02:00
libmysqld.rc query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00
Makefile.am Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-08 02:30:07 +04:00
resource.h query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00