mariadb/BUILD
unknown f4afcec393 Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into  hynda.mysql.fi:/home/my/mysql-maria


BitKeeper/etc/ignore:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
  Auto merged
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/Makefile.am:
  Auto merged
include/keycache.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_sys.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_events.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_insert.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_insert_delayed.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_insert.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_symlink2.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/udf_example.c:
  Auto merged
sql/uniques.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ft_nlq_search.c:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/myisam/ft_stopwords.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/ha_myisam.h:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_extra.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/mi_log.c:
  Auto merged
storage/myisam/mi_packrec.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_test2.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/myisamlog.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisam/sp_test.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
support-files/compiler_warnings.supp:
  Auto merged
client/mysqltest.c:
  Manual merge between mysql-5.1 and mysql-maria
include/my_base.h:
  Manual merge between mysql-5.1 and mysql-maria
include/my_global.h:
  Manual merge between mysql-5.1 and mysql-maria
include/myisam.h:
  Manual merge between mysql-5.1 and mysql-maria
libmysql/Makefile.shared:
  Manual merge between mysql-5.1 and mysql-maria
mysql-test/r/events_logs_tests.result:
  Manual merge between mysql-5.1 and mysql-maria
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result:
  Manual merge between mysql-5.1 and mysql-maria
mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test:
  Manual merge between mysql-5.1 and mysql-maria
mysql-test/t/disabled.def:
  Manual merge between mysql-5.1 and mysql-maria
mysql-test/t/events_logs_tests.test:
  Manual merge between mysql-5.1 and mysql-maria
mysys/my_compress.c:
  Manual merge between mysql-5.1 and mysql-maria
mysys/my_getsystime.c:
  Manual merge between mysql-5.1 and mysql-maria
mysys/my_open.c:
  Manual merge between mysql-5.1 and mysql-maria
sql/handler.cc:
  Manual merge between mysql-5.1 and mysql-maria
sql/set_var.h:
  Manual merge between mysql-5.1 and mysql-maria
sql/sql_class.h:
  Manual merge between mysql-5.1 and mysql-maria
sql/sql_show.cc:
  Manual merge between mysql-5.1 and mysql-maria
sql/sql_sort.h:
  Manual merge between mysql-5.1 and mysql-maria
sql/sql_yacc.yy:
  Manual merge between mysql-5.1 and mysql-maria
sql/table.cc:
  Manual merge between mysql-5.1 and mysql-maria
storage/csv/ha_tina.cc:
  Manual merge between mysql-5.1 and mysql-maria
storage/myisam/mi_open.c:
  Manual merge between mysql-5.1 and mysql-maria
storage/myisam/myisamdef.h:
  Manual merge between mysql-5.1 and mysql-maria
unittest/mysys/my_atomic-t.c:
  Manual merge between mysql-5.1 and mysql-maria
2007-09-27 17:05:07 +03:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
autorun.sh This patch removes need for a innodb to have its own configure. 2006-08-23 13:59:16 -07:00
check-cpu Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-17707 2007-05-29 12:38:04 +02: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 BUILD scripts: s/(dist)?clean/maintainer-clean/ 2007-01-28 21:09:54 +01:00
compile-alpha-cxx BUILD scripts: s/(dist)?clean/maintainer-clean/ 2007-01-28 21:09:54 +01:00
compile-alpha-debug BUILD scripts: s/(dist)?clean/maintainer-clean/ 2007-01-28 21:09:54 +01:00
compile-amd64-debug-max Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-amd64-debug-max-no-ndb Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-amd64-gcov Bug#23062 (GCOV build: helper scripts missing in the BUILD directory) 2007-08-15 18:10:16 -06:00
compile-amd64-gprof Bug#23062 (GCOV build: helper scripts missing in the BUILD directory) 2007-08-15 18:10:16 -06:00
compile-amd64-max Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04:00
compile-amd64-max-sci New SCI Transporter Build scripts 2007-05-07 15:33:27 +02:00
compile-amd64-valgrind-max Bug#25396 2007-01-23 05:09:14 -08:00
compile-darwin-mwcc Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-dist include maria in pushbuild's 'make dist' 2007-09-10 20:19:27 +02:00
compile-hpux11-parisc2-aCC BUILD scripts: s/(dist)?clean/maintainer-clean/ 2007-01-28 21:09:54 +01:00
compile-ia64-debug-max BUILD scripts: s/(dist)?clean/maintainer-clean/ 2007-01-28 21:09:54 +01:00
compile-irix-mips64-mipspro BUILD scripts: s/(dist)?clean/maintainer-clean/ 2007-01-28 21:09:54 +01:00
compile-ndb-autotest ndb - 2006-08-02 09:08:21 +02:00
compile-pentium BUG#27701 don't pass arguments to sourced script if they're not modified as this is either a no-op (if done correctly), a different no-op with some shells (if done the bash way, but with correct quoting) or breaks arguments with whitespace for some shells (if done the bash way, without quotes). 2007-04-11 14:12:00 +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 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701 2007-04-11 14:06:03 +02:00
compile-pentium-debug-max Added applying of undo for updates 2007-09-09 19:15:10 +03:00
compile-pentium-debug-max-no-embedded Implement --warning-mode in SETUP.sh. The value of the 2006-04-07 02:25:59 +04:00
compile-pentium-debug-max-no-ndb Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701 2007-04-11 14:06:03 +02:00
compile-pentium-debug-openssl BUG#18818 configure: No longer finds OpenSSL on Mac OS X 2006-05-17 13:59:37 +02:00
compile-pentium-debug-yassl BUG#18818 configure: No longer finds OpenSSL on Mac OS X 2006-05-17 13:59:37 +02:00
compile-pentium-gcov Manual merge 2007-08-22 12:02:23 -06:00
compile-pentium-gprof Bug#23062 (GCOV build: helper scripts missing in the BUILD directory) 2007-08-15 18:10:16 -06: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 Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04: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 Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04:00
compile-pentium-myodbc - cleaned up BUILD scripts 2000-12-18 23:24:19 +02:00
compile-pentium-mysqlfs-debug Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-pentium-pgcc BUILD scripts: s/(dist)?clean/maintainer-clean/ 2007-01-28 21:09:54 +01:00
compile-pentium-valgrind-max BUG#27701 don't pass arguments to sourced script if they're not modified as this is either a no-op (if done correctly), a different no-op with some shells (if done the bash way, but with correct quoting) or breaks arguments with whitespace for some shells (if done the bash way, without quotes). 2007-04-11 14:12:00 +02:00
compile-pentium64 BUG#27701 don't pass arguments to sourced script if they're not modified as this is either a no-op (if done correctly), a different no-op with some shells (if done the bash way, but with correct quoting) or breaks arguments with whitespace for some shells (if done the bash way, without quotes). 2007-04-11 14:12:00 +02:00
compile-pentium64-debug Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701 2007-04-11 14:06:03 +02:00
compile-pentium64-debug-max Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701 2007-04-11 14:06:03 +02:00
compile-pentium64-gcov Bug#23062 (GCOV build: helper scripts missing in the BUILD directory) 2007-08-15 18:10:16 -06:00
compile-pentium64-gprof Bug#23062 (GCOV build: helper scripts missing in the BUILD directory) 2007-08-15 18:10:16 -06:00
compile-pentium64-max BUG#27701 don't pass arguments to sourced script if they're not modified as this is either a no-op (if done correctly), a different no-op with some shells (if done the bash way, but with correct quoting) or breaks arguments with whitespace for some shells (if done the bash way, without quotes). 2007-04-11 14:12:00 +02:00
compile-pentium64-max-sci New SCI Transporter Build scripts 2007-05-07 15:33:27 +02:00
compile-pentium64-valgrind-max Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-ppc - fixed file permissions (need execute bits set) 2004-12-02 10:11:28 +01:00
compile-ppc-debug Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-ppc-debug-max Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-ppc-debug-max-no-ndb Remove dead code from BUILD/ scripts: $debug_extra_warnings is 2006-04-05 17:50:33 +04:00
compile-ppc-max Remove dead code from BUILD/ scripts. 2006-04-05 16:50:12 +04:00
compile-solaris-amd64 Adding build file for Solaris on AMD64 2007-04-12 13:20:38 +02:00
compile-solaris-sparc Fixed compiler warnings 2007-02-23 13:13:55 +02:00
compile-solaris-sparc-debug Fixes Bug#30127: --debug-info no longer prints memory usage in mysql 2007-08-01 22:59:05 +03:00
compile-solaris-sparc-forte Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
compile-solaris-sparc-purify Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-02-26 16:12:40 +01:00
FINISH.sh BUILD scripts: s/(dist)?clean/maintainer-clean/ 2007-01-28 21:09:54 +01:00
Makefile.am Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb 2007-05-07 15:39:36 +02:00
SETUP.sh Merge hynda.mysql.fi:/home/my/mysql-5.1-main 2007-09-27 17:05:07 +03:00