Commit graph

10 commits

Author SHA1 Message Date
unknown
14b614e164 Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
BUILD/FINISH.sh:
  Auto merged
BUILD/compile-dist:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
2005-05-09 11:45:59 +02:00
unknown
cae0d72898 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


BUILD/compile-dist:
  Auto merged
2005-05-07 01:26:10 +02:00
unknown
8ec23d0efc - typo fix in BUILD/compile-dist
BUILD/compile-dist:
  - typo fix
2005-05-07 01:25:20 +02:00
unknown
03c048b1ea Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


BUILD/compile-dist:
  Auto merged
2005-05-07 01:18:01 +02:00
unknown
bc6457fc36 - added some required CXXFLAGS to BUILD/compile-dist to allow the distribution build to pass without
unresolved symbols


BUILD/compile-dist:
  - added some required CXXFLAGS to allow the distribution build to pass
2005-05-07 00:53:36 +02:00
unknown
4f25da3d04 update of BUILD/* scripts to storage/ directory structure (they didn't work anymore)
BUILD/FINISH.sh:
  update to storage/ directory structure
BUILD/compile-alpha-cxx:
  update to storage/ directory structure
BUILD/compile-alpha-debug:
  update to storage/ directory structure
BUILD/compile-dist:
  update to storage/ directory structure
BUILD/compile-hpux11-parisc2-aCC:
  update to storage/ directory structure
BUILD/compile-ia64-debug-max:
  update to storage/ directory structure
BUILD/compile-irix-mips64-mipspro:
  update to storage/ directory structure
BUILD/compile-pentium-pgcc:
  update to storage/ directory structure
BUILD/compile-solaris-sparc-debug:
  update to storage/ directory structure
BUILD/compile-solaris-sparc-forte:
  update to storage/ directory structure
BUILD/compile-solaris-sparc:
  update to storage/ directory structure
BUILD/compile-solaris-sparc-purify:
  update to storage/ directory structure
2005-04-27 22:46:20 +02:00
unknown
f40d29a232 - Manually merged two changes from 4.0
BUILD/compile-dist:
  - manual merge
include/my_pthread.h:
  - manual merge
2005-01-06 15:32:42 +01:00
unknown
10844e41da - enable "with-extra-charsets=complex" for the "compile-dist" distribution
build (to make the test suite pass)


BUILD/compile-dist:
  - enable "with-extra-charsets=complex" for the distribution build
    (to make the test suite pass)
2005-01-06 14:35:14 +01:00
unknown
0428fcb89e - updated compile-dist to include NDB cluster
BUILD/compile-dist:
  - make sure to include NDB cluster in the distribution, too
2004-12-31 13:12:36 +01:00
unknown
54b768472c - Bootrap now uses "compile-dist" by default to create the source distribution
Build-tools/Bootstrap:
  - Use BUILD/compile-dist instead of compile-pentium-max
  - some minor cleanups
2004-12-31 12:46:18 +01:00