mariadb/libmysqld
unknown ab4c37dcce Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/embt/my51-embt


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/include/federated.inc:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/flush_block_commit.result:
  SCCS merged
2006-12-08 15:49:43 +04:00
..
examples Merge mysql.com:/home/hf/work/embt/my50-embt 2006-11-13 20:16:46 +04:00
CMakeLists.txt fix for windows build 2006-08-24 22:10:55 -07:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
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 Merge mysql.com:/home/hf/work/mysql-4.1.mrg 2006-07-18 14:52:29 +05:00
lib_sql.cc Merge bk@192.168.21.1:mysql-5.1-opt 2006-12-08 15:49:43 +04:00
libmysqld.c Remove compiler warnings 2006-11-20 22:42:06 +02:00
libmysqld.def Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2 2006-09-06 18:27:26 +02:00
libmysqld.rc query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00
Makefile.am Many files: 2006-11-29 18:36:51 +01:00
resource.h query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00