mariadb/libmysqld
unknown 570f328174 merged
BitKeeper/etc/ignore:
  auto-union
client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-03-06 23:20:19 +01:00
..
examples Merge mysql.com:/usr/local/bk/mysql-5.0 2005-11-28 20:14:12 +01: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 Fixes to embedded server to be able to run tests with it 2006-02-24 18:34:15 +02:00
lib_sql.cc merged 2006-03-06 23:20:19 +01:00
libmysqld.c Fixes to embedded server to be able to run tests with it 2006-02-24 18:34:15 +02:00
libmysqld.def Fixes to previous changeset 2005-07-18 20:05:30 +03:00
libmysqld.rc query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00
Makefile.am BUG #15408 - Partitions: subpartition names are not unique 2006-02-21 17:40:07 -06:00
resource.h query_id and my_xid -> ulonglong 2005-01-27 22:38:56 +01:00