mariadb/BitKeeper/etc
unknown e7eac0274b Merge
BitKeeper/etc/logging_ok:
  auto-union
innobase/trx/trx0trx.c:
  Auto merged
mysql-test/r/ctype_collate.result:
  Auto merged
mysql-test/r/func_system.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
innobase/ut/ut0mem.c:
  e
  merge from 4.1
mysql-test/r/func_group.result:
  merge from 4.1
mysql-test/r/func_str.result:
  merge from 4.1
mysql-test/t/func_group.test:
  merge from 4.1
2005-03-05 18:20:35 +04:00
..
config Ensure that we use unix file format (no \r\n) for all new files 2004-03-20 12:48:14 +02:00
gone gone: 2005-02-09 15:16:14 +01:00
logging_ok Merge 2005-03-05 18:20:35 +04:00
notify notify BitKeeper file /home/bk/mysql/BitKeeper/etc/notify 2000-08-02 01:45:37 +02:00
skipkeys BK automatic LOD removal. 2002-11-07 11:20:17 +04:00