mariadb/Build-tools
unknown 7013d8ef0a Merge with 3.23.54
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
  Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Build-tools/mysql-copyright-2:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
heap/heapdef.h:
  Auto merged
heap/hp_open.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysys/safemalloc.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.res:
  Auto merged
Build-tools/Do-compile:
  merge
Docs/manual.texi:
  merge
configure.in:
  merge
mysql-test/r/distinct.result:
  merge
mysql-test/r/null_key.result:
  merge
sql/ha_innodb.cc:
  merge
sql/item.h:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge
support-files/mysql.spec.sh:
  merge
2002-10-16 13:11:25 +03:00
..
cvs-sanity-check Import changeset 2000-07-31 21:29:14 +02:00
Do-all-build-steps merge 2002-03-06 19:53:31 +02:00
Do-compile Merge with 3.23.54 2002-10-16 13:11:25 +03:00
Do-create-perl-rpms Import changeset 2000-07-31 21:29:14 +02:00
Do-linux-build Merge with 3.23.52 2002-06-17 16:08:34 +03:00
Do-local-patch-file Import changeset 2000-07-31 21:29:14 +02:00
Do-patch-file Deleted some old Makefiles 2002-04-17 15:32:28 +02:00
Do-rpm merge with 3.23.51 2002-05-16 18:20:49 +03:00
mysql-copyright - replaced Docs/LICENSE with Docs/MySQLEULA.txt 2002-10-13 16:57:33 +02:00
mysql-copyright-2 - replaced Docs/LICENSE with Docs/MySQLEULA.txt 2002-10-13 16:57:33 +02:00
newest Import changeset 2000-07-31 21:29:14 +02:00