mariadb/BUILD
unknown d04832d195 Merge
BitKeeper/etc/ignore:
  auto-union
BUILD/autorun.sh:
  Auto merged
BitKeeper/deleted/.del-bdb.vcproj~ed8534936e40cefb:
  Auto merged
BitKeeper/deleted/.del-heap.vcproj~70c0cc1d680a51c1:
  Auto merged
BitKeeper/deleted/.del-innobase.vcproj~71e1de81f11138bf:
  Auto merged
BitKeeper/deleted/.del-myisam.vcproj~32bb9e4a163fcb5a:
  Auto merged
BitKeeper/deleted/.del-myisammrg.vcproj~6534e59acbfbb63:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~703886a28862bb2:
  Auto merged
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysys/default.c:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/buf/buf0flu.c:
  Auto merged
storage/innobase/data/data0data.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/include/btr0btr.h:
  Auto merged
storage/innobase/include/data0type.ic:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0mem.h:
  Auto merged
storage/innobase/include/mem0mem.h:
  Auto merged
storage/innobase/include/mem0mem.ic:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/ut0mem.h:
  Auto merged
storage/innobase/mem/mem0mem.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/os/os0proc.c:
  Auto merged
storage/innobase/rem/rem0rec.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0sys.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/innobase/ut/ut0mem.c:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dbug.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_delete_all.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sp_key.c:
  Auto merged
storage/myisammrg/myrg_rkey.c:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/signaldata/ApiVersion.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/EventReport.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
  Auto merged
storage/ndb/include/mgmapi/ndb_logevent.h:
  Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Config.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Config.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbUtil.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbUtil.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/src/ndbapi/ObjectMap.hpp:
  Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
  Auto merged
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
  Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
  Auto merged
storage/ndb/test/src/NdbBackup.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
configure.in:
  merge
BUILD/SETUP.sh:
  merge
BitKeeper/deleted/.del-mysql.sln~f2120278f8a437be:
  SCCS merged
libmysqld/Makefile.am:
  merge
sql/ha_ndbcluster.cc:
  merge
sql/handler.h:
  merge
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
sql/slave.cc:
  merge
sql/slave.h:
  e
  merge
sql/sql_parse.cc:
  merge
sql/table.cc:
  merge
sql/examples/ha_tina.cc:
  merge
sql/examples/ha_tina.h:
  merge
sql/share/errmsg.txt:
  merge
storage/ndb/include/ndbapi/Ndb.hpp:
  merge
storage/ndb/src/common/debugger/EventLogger.cpp:
  merge
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
  merge
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  merge
storage/ndb/src/ndbapi/Ndbinit.cpp:
  SCCS merged
2005-10-06 10:54:07 +02:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
autorun.sh Merge 2005-10-06 10:54:07 +02:00
check-cpu Adding support for opteron optimization in build files. 2005-07-20 22:52:15 -07:00
cleanup hanged UDF interface to use clear() instead of reset() 2003-08-27 22:30:50 +03:00
compile-alpha Update to autoconf 2.52 2002-02-07 21:34:35 +02:00
compile-alpha-ccc Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-alpha-cxx merge 2005-05-18 22:26:23 +02:00
compile-alpha-debug merge 2005-05-18 22:26:23 +02:00
compile-amd64-debug-max Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do. 2005-01-19 10:24:51 -08:00
compile-amd64-max Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do. 2005-01-19 10:24:51 -08:00
compile-darwin-mwcc mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper: 2005-05-05 09:34:15 +02:00
compile-dist Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1 2005-05-09 11:45:59 +02:00
compile-hpux11-parisc2-aCC Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-ia64-debug-max merge 2005-05-18 22:26:23 +02:00
compile-irix-mips64-mipspro Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-pentium Update to autoconf 2.52 2002-02-07 21:34:35 +02:00
compile-pentium-cybozu Add missing parts for the "Cybozu" custom build, to avoid future manual patches. 2005-04-08 13:56:48 +02:00
compile-pentium-debug Fixed bug detected by sp-tests 2005-02-05 16:05:46 +02:00
compile-pentium-debug-max Fixed bug detected by sp-tests 2005-02-05 16:05:46 +02:00
compile-pentium-debug-max-no-embedded Removed dead options, fixed pentium script to no longer ask for isam (its not included in 5.0). 2005-07-15 11:15:44 -07:00
compile-pentium-debug-max-no-ndb New flags for new max-no-ndb build script to get a build that has 2005-09-29 13:45:39 -07:00
compile-pentium-debug-no-bdb Update needed for SuSE 7.3 2002-01-26 01:19:47 +02:00
compile-pentium-debug-openssl - removed duplicate my_sys.h inclusion from lib_vio.c 2003-02-21 16:37:18 +01:00
compile-pentium-debug-yassl WL#2286 Compile MySQL w/YASSL support 2005-04-28 18:23:27 +05:00
compile-pentium-gcov Merge with 4.0 tree 2003-11-18 18:54:27 +02:00
compile-pentium-gprof Update to autoconf 2.52 2002-02-07 21:34:35 +02:00
compile-pentium-icc Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc 2005-09-01 14:07:45 +02:00
compile-pentium-icc-valgrind-max Fix warnings from icc 2005-05-18 19:00:21 +03:00
compile-pentium-icc-yassl Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc 2005-09-01 14:07:45 +02:00
compile-pentium-max Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do. 2005-01-19 10:24:51 -08:00
compile-pentium-myodbc - cleaned up BUILD scripts 2000-12-18 23:24:19 +02:00
compile-pentium-mysqlfs-debug Update needed for SuSE 7.3 2002-01-26 01:19:47 +02:00
compile-pentium-pgcc merge 2005-05-18 22:26:23 +02:00
compile-pentium-valgrind-max Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do. 2005-01-19 10:24:51 -08:00
compile-pentium64-debug Only enable Innodb extra debugging when using the --debug=full configure option 2005-01-26 16:07:53 +02:00
compile-pentium64-valgrind-max Porting of "buffered read" patch to 5.0 and post-review fixes. 2005-03-06 00:10:08 +03:00
compile-ppc - fixed file permissions (need execute bits set) 2004-12-02 10:11:28 +01:00
compile-ppc-debug - fixed file permissions (need execute bits set) 2004-12-02 10:11:28 +01:00
compile-ppc-debug-max Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do. 2005-01-19 10:24:51 -08:00
compile-ppc-debug-max-no-ndb New flags for new max-no-ndb build script to get a build that has 2005-09-29 13:45:39 -07:00
compile-ppc-max Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do. 2005-01-19 10:24:51 -08:00
compile-sap new build scripts for SAP team 2005-05-18 15:28:51 +02:00
compile-sap-debug new build scripts for SAP team 2005-05-18 15:28:51 +02:00
compile-solaris-sparc Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-solaris-sparc-debug Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-solaris-sparc-forte Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
compile-solaris-sparc-purify Remove automatically generated autotools files from revision control. 2005-05-18 15:23:29 +04:00
FINISH.sh merge 2005-05-18 22:26:23 +02:00
Makefile.am added file missing from release to EXTRA_DIST list (bug# 12733) 2005-08-22 22:13:56 +02:00
SETUP.sh Merge 2005-10-06 10:54:07 +02:00
test-alpha-ccc Import changeset 2000-07-31 21:29:14 +02:00