mariadb/libmysqld
unknown 51f5ac6b29 Merge mysql.com:/home/hf/work/mrg/my50-mrg
into  mysql.com:/home/hf/work/mrg/my51-mrg


sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
include/mysql_com.h:
  merging
libmysqld/lib_sql.cc:
  merging
mysql-test/r/federated.result:
  merging
mysql-test/t/federated.test:
  merging
storage/federated/ha_federated.h:
  mergin
2007-12-01 00:46:44 +04:00
..
examples Makefile.am: 2007-09-26 18:47:55 +02:00
CMakeLists.txt Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server 2007-11-18 00:32:06 +04:00
copyright Added all changes from old 4.0 version: 2001-04-11 13:04:03 +02:00
emb_qcache.cc Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc... 2007-11-30 22:17:11 +04:00
emb_qcache.h Bug #30430 crash:./mtr --embedded-server --ps-protocol cache_innodb func_misc... 2007-11-30 22:17:11 +04:00
embedded_priv.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
lib_sql.cc Merge mysql.com:/home/hf/work/mrg/my50-mrg 2007-12-01 00:46:44 +04:00
libmysqld.c Many files: 2006-12-23 20:17:15 +01:00
libmysqld.def Bug#29903 The CMake build method does not produce the embedded library. 2007-08-03 18:56:24 -04:00
libmysqld.rc query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00
Makefile.am Makefile.am: 2007-09-26 18:47:55 +02:00
resource.h query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00