summaryrefslogtreecommitdiff
path: root/Build-tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 4.0unknown2004-09-011-4/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da: Auto merged BitKeeper/deleted/.del-convert.cc~437689acaffb7446: Auto merged BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796: Auto merged BitKeeper/deleted/.del-message.mc: Delete: VC++Files/sql/message.mc BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92: Auto merged BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6: Auto merged Build-tools/Bootstrap: Auto merged client/mysql.cc: Auto merged client/mysqladmin.c: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlmanager-pwgen.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged extra/resolveip.c: Auto merged include/m_string.h: Auto merged include/my_getopt.h: Auto merged isam/isamchk.c: Auto merged isam/pack_isam.c: Auto merged myisam/mi_test1.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged sql/field.cc: Auto merged sql/gen_lex_hash.cc: Auto merged strings/strto.c: Auto merged strings/strtol.c: Auto merged strings/strtoll.c: Auto merged strings/strtoull.c: Auto merged support-files/Makefile.am: Auto merged tools/mysqlmanager.c: Auto merged
| * Do-compile:unknown2004-08-311-1/+1
| | | | | | | | | | | | | | | | Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore. Build-tools/Do-compile: Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
| * - fixed brain fart in Bootrap - it never actually caught failuresunknown2004-08-261-4/+6
| | | | | | | | | | | | | | | | | | when pulling BK trees before. Build-tools/Bootstrap: - thinko fix: we need to run the "bk pull" command on its own, if we want to get its return value...
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-08-311-13/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/sql_base.cc: Auto merged sql/sql_prepare.cc: Auto merged
| * | Review of new pushed code (Indentation fixes and simple optimizations)unknown2004-08-311-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database Safety fix for mailformed MERGE files Build-tools/mysql-copyright: Print correct file name in case of errors Fixed indentation include/config-win.h: Removed unnecessary #ifdef myisammrg/myrg_open.c: Don't give a core if merge file contains INSERT_METHOD first (not legal but better safe than sorry) Don't set struct variables to zero that are already zero Indentation fixes mysql-test/r/create.result: Use 'mysqltest' as test database mysql-test/r/ndb_basic.result: Use 'mysqltest' as test database mysql-test/r/ndb_blob.result: Use 'mysqltest' as test database mysql-test/r/ndb_transaction.result: Use 'mysqltest' as test database mysql-test/r/ps_1general.result: Use 'mysqltest' as test database mysql-test/r/rpl_charset.result: Use 'mysqltest' as test database mysql-test/r/rpl_delete_all.result: Use 'mysqltest' as test database mysql-test/r/show_check.result: Use 'mysqltest' as test database mysql-test/t/create.test: Use 'mysqltest' as test database mysql-test/t/ndb_basic.test: Use 'mysqltest' as test database mysql-test/t/ndb_blob.test: Use 'mysqltest' as test database mysql-test/t/ndb_transaction.test: Use 'mysqltest' as test database mysql-test/t/ps_1general.test: Use 'mysqltest' as test database mysql-test/t/rpl_charset.test: Use 'mysqltest' as test database mysql-test/t/rpl_delete_all.test: Use 'mysqltest' as test database mysql-test/t/show_check.test: Use 'mysqltest' as test database sql/field.h: Mark functions that should be deleted as soon as we have a new prototype for store(longlong) sql/lock.cc: Indentation fix sql/sql_base.cc: Better comment. Break find_item_in_list in case of perfect match sql/sql_prepare.cc: Simple optimization sql/sql_select.cc: Portability fix
* | | Do-compile:unknown2004-08-261-1/+1
|/ / | | | | | | | | | | | | | | Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore. Build-tools/Do-compile: Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
* | manually mergedunknown2004-08-241-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union mysql-test/r/binary.result: Auto merged mysql-test/r/truncate.result: Auto merged mysql-test/t/binary.test: Auto merged mysql-test/t/truncate.test: Auto merged mysys/my_lib.c: Auto merged strings/my_vsnprintf.c: Auto merged support-files/Makefile.am: Auto merged
| * - make sure to recreate all autoconf/automake-related files afterunknown2004-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | modifying configure.in for the commercial tarballs - added my-innodb-heavy-4G.cnf to the distribution Build-tools/mysql-copyright: - make sure to recreate all autoconf/automake-related files after modifying configure.in support-files/Makefile.am: - added my-innodb-heavy-4G.cnf to the distribution
* | mysql-copyright:unknown2004-08-211-5/+26
| | | | | | | | | | | | | | | | Fixed it to work, added function to fix include/mysql_version.h LICENSE tag from GPL to Commercial Build-tools/mysql-copyright: Fixed it to work, added function to fix include/mysql_version.h LICENSE tag from GPL to Commercial
* | manually mergedunknown2004-08-182-12/+33
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/mysql-copyright: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Auto merged VC++Files/innobase/innobase.dsp: Auto merged client/mysql.cc: Auto merged include/my_global.h: Auto merged innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/mtr0log.h: Auto merged innobase/include/mtr0log.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0dbg.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/ut/ut0dbg.c: Auto merged innobase/ut/ut0mem.c: Auto merged libmysql/Makefile.am: Auto merged libmysql/Makefile.shared: Auto merged libmysql/conf_to_src.c: Auto merged libmysql/dll.c: Auto merged libmysql/errmsg.c: Auto merged libmysql/manager.c: Auto merged libmysql_r/Makefile.am: Auto merged myisam/mi_key.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/having.result: Auto merged mysql-test/r/heap.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/r/type_float.result: Auto merged mysql-test/t/having.test: Auto merged mysql-test/t/heap.test: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_float.test: Auto merged mysql-test/t/type_uint.test: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/Makefile.am: Auto merged sql/field.h: Auto merged sql/ha_heap.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/protocol.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged
| * - fixed Log file naming in Boostrapunknown2004-08-111-4/+2
| | | | | | | | | | Build-tools/Bootstrap: - fixed Log file naming
| * Bootstrap enhancements:unknown2004-08-111-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed the default log file name to Bootstrap-<repository>.log (e.g. Bootstrap-mysql-4.0.log) (thanks to Joerg for the hint) - added option "--archive-log" to automatically move the log file into the Log directory of the exported tree Build-tools/Bootstrap: - Changed the default log file name to Bootstrap-<repository>.log (e.g. Bootstrap-mysql-4.0.log) (thanks to Joerg for the hint) - added option "--archive-log" to automatically move the log file into the Log directory of the exported tree
| * - rename: EXCEPTIONS->EXCEPTIONS-CLIENTunknown2004-08-051-1/+1
| |
| * - applied the required changes to create the FOSS License exceptionunknown2004-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file "EXCEPTIONS" and include it in the source and binary distributions Build-tools/mysql-copyright: - remove COPYING and EXCEPTIONS from the commercial packages Docs/Makefile.am: - create the EXCEPTIONS file that includes the FOSS License exception scripts/make_binary_distribution.sh: - include EXCEPTIONS in the binary distribution, too. support-files/mysql.spec.sh: - add EXCEPTIONS to the server RPM
* | - added option "--bundled-zlib" to compile using the includedunknown2004-08-031-1/+3
| | | | | | | | | | | | | | compression library
* | manual merged (blame me!)unknown2004-07-201-12/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Auto merged Docs/Makefile.am: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/sync0arr.h: Auto merged innobase/include/trx0trx.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/trx/trx0trx.c: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_insert.cc: Auto merged mysql-test/r/innodb.result: to be fixed after the merge
| * - Move checking of the MD5 checksumming to the correct placeunknown2004-07-131-12/+14
| | | | | | | | | | | | | | - fix calling of my_md5sum
* | - Fixed a previous modification to the MySQL Startup Item for unknown2004-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac OS X: the name of the startup script itself must match the name of the subdirectory it's located in. Changed MySQL->MySQLCOM in the Do-pkg script and renamed the file in BK. (Thanks to Bryan McCormack for reporting this) Build-tools/Do-pkg: - renamed script from MySQL to MySQLCOM to match the name of the directory it's installed in support-files/MacOSX/MySQLCOM: - Fixed the file and directory name to match the actual location
* | Merge with 4.0 to get bug fixesunknown2004-07-094-10/+52
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged mysql-test/r/lowercase_table2.result: Auto merged mysql-test/r/system_mysql_db.result: Auto merged mysql-test/r/system_mysql_db_refs.result: Auto merged mysql-test/t/system_mysql_db_fix-master.opt: Auto merged mysql-test/t/system_mysql_db.test: Auto merged
| * Do-compile:unknown2004-07-081-2/+2
| | | | | | | | | | | | | | | | Call my_md5sum with path Build-tools/Do-compile: Call my_md5sum with path
| * Do-compile:unknown2004-07-081-1/+18
| | | | | | | | | | | | | | | | Added support for MD5 verification of file transfers Build-tools/Do-compile: Added support for MD5 verification of file transfers
| * Merge here.mwagner.org:/Volumes/BK/mysql-4.0unknown2004-07-071-1/+7
| |\ | | | | | | | | | | | | | | | | | | into here.mwagner.org:/Volumes/BK/mysql-4.0-work
| | * my_md5sum:unknown2004-07-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Exit properly Build-tools/my_md5sum: Exit properly
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-07-013-9/+28
| |\ \ | | |/ | | | | | | | | | | | | | | | into here.mwagner.org:/Volumes/BK/mysql-4.0
| | * my_md5sum:unknown2004-06-291-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Added code to use locally installed perl modules first Build-tools/my_md5sum: Added code to use locally installed perl modules first
| | * logger.pm, Bootstrap:unknown2004-06-242-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates for output enhanced Bootstrap Build-tools/Bootstrap: Updates for output enhanced Bootstrap Build-tools/logger.pm: Updates for output enhanced Bootstrap
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-07-011-1/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into here.mwagner.org:/Volumes/BK/mysql-4.1
| * \ \ Merge here.mwagner.org:/Volumes/BK/mysql-4.1unknown2004-06-301-1/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into here.mwagner.org:/Volumes/BK/mysql-4.1-work
| | * | | mysql-copyright:unknown2004-06-301-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for the condition when "the_fat" doesn't end with 'dnl\n', but ')\n'. Build-tools/mysql-copyright: Fix for the condition when "the_fat" doesn't end with 'dnl\n', but ')\n'.
* | | | | Merge with 4.0 to get the latest bug patches to 4.1unknown2004-06-252-29/+162
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: added sql/mysql_tzinfo_to_sql BitKeeper/etc/logging_ok: auto-union acinclude.m4: Auto merged extra/perror.c: Auto merged include/mysql.h: Auto merged innobase/include/mach0data.ic: Auto merged innobase/include/mtr0log.h: Auto merged innobase/include/mtr0log.ic: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/pars/lexyy.c: Auto merged BitKeeper/deleted/.del-4.0.XX-gpl.ipr~f5909a9e9bd8094: Auto merged BitKeeper/deleted/.del-Clients and Tools.fgl~bf0f776883577f02: Auto merged BitKeeper/deleted/.del-Development.fgl~6392ce285e73f5fc: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/innodb_cache.result: Auto merged mysql-test/r/lowercase_table2.result: Auto merged mysql-test/t/innodb_cache.test: Auto merged mysql-test/t/lowercase_table2.test: Auto merged sql/ha_berkeley.cc: Auto merged sql/handler.cc: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged libmysql/libmysql.c: Merge with 4.0 mysql-test/r/bdb.result: Merge with 4.0 mysql-test/r/range.result: Merge with 4.0 mysql-test/t/bdb.test: Merge with 4.0 mysys/hash.c: Merge with 4.0 scripts/mysql_install_db.sh: Merge with 4.0 sql/field.cc: Merge with 4.0 sql/field.h: Merge with 4.0 sql/mysql_priv.h: Merge with 4.0 sql/sql_handler.cc: Merge with 4.0 sql/sql_select.cc: Merge with 4.0 sql/sql_table.cc: Merge with 4.0
| * | | | Do-rpm:unknown2004-06-231-29/+38
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Small fix to handle the src rpm file correctly (contains '0', release number in spec file) Build-tools/Do-rpm: Small fix to handle the src rpm file correctly (contains '0', release number in spec file)
| * | | my_md5sum:unknown2004-06-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change behaviour to be like the md5sum in GNU coreutils Build-tools/my_md5sum: Change behaviour to be like the md5sum in GNU coreutils
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-06-181-0/+123
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into here.mwagner.org:/Volumes/BK/mysql-4.0-work BitKeeper/etc/logging_ok: auto-union
| | * | | my_md5sum:unknown2004-06-181-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file, simulates 'md5sum' as a perl script BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | | - start the ndb cluster on different TCP ports when running anotherunknown2004-06-241-1/+7
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | build thread
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-06-231-21/+40
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | into here.mwagner.org:/Volumes/BK/mysql-4.1
| * | | mysql-copyright:unknown2004-06-231-24/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed vim to expandtab's, retab'd code Fixed CWD bug in trim_the_fat() Build-tools/mysql-copyright: Fixed vim to expandtab's, retab'd code Fixed CWD bug in trim_the_fat()
| * | | mysql-copyright:unknown2004-06-231-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned-up trim_the_fat() Build-tools/mysql-copyright: Cleaned-up trim_the_fat() BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | - using "--with-libedit" is sufficient (--without-readline throwsunknown2004-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | weird compile errors) Build-tools/Do-compile: - using "--with-libedit" is sufficient
* | | | - explicitely enable libedit in Do-compile, when readline is notunknown2004-06-221-1/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | requested Build-tools/Do-compile: - explicitely enable libedit, when readline is not requested
* | | mergeunknown2004-06-212-11/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged include/my_global.h: Auto merged innobase/row/row0ins.c: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/subselect.result: Auto merged scripts/mysql_install_db.sh: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged innobase/fil/fil0fil.c: merge (Use heikki's code)
| * \ \ Merge with 4.0.21unknown2004-06-182-11/+20
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/mysql-copyright-2: Auto merged include/violite.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/fut/fut0lst.c: Auto merged innobase/ha/hash0hash.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/data0data.h: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/fsp0fsp.h: Auto merged innobase/include/hash0hash.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mem0dbg.ic: Auto merged innobase/include/mem0pool.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/sync0rw.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0roll.h: Auto merged innobase/include/trx0trx.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0rw.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/thr/thr0loc.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/usr/usr0sess.c: Auto merged innobase/ut/ut0mem.c: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_decimal.test: Auto merged mysys/mf_tempfile.c: Auto merged netware/BUILD/nwbootstrap: Auto merged netware/Makefile.am: Auto merged scripts/mysqld_safe.sh: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/t/func_if.test: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged support-files/my-innodb-heavy-4G.cnf.sh: Auto merged Build-tools/Do-compile: Merge with 4.0 Build-tools/mysql-copyright: Merge with 4.0 client/mysqltest.c: Merge with 4.0 include/my_global.h: Merge with 4.0 innobase/buf/buf0rea.c: Merge with 4.0 innobase/data/data0type.c: Merge with 4.0 innobase/ibuf/ibuf0ibuf.c: Merge with 4.0 innobase/include/buf0buf.h: Merge with 4.0 innobase/include/data0type.h: Merge with 4.0 innobase/include/mem0mem.h: Merge with 4.0 innobase/include/mem0mem.ic: Merge with 4.0 innobase/log/log0recv.c: Merge with 4.0 libmysql/libmysql.c: Merge with 4.0 libmysqld/Makefile.am: Merge with 4.0 mysql-test/r/range.result: Merge with 4.0 mysql-test/r/type_decimal.result: Merge with 4.0 mysql-test/t/range.test: Merge with 4.0 netware/BUILD/mwenv: Merge with 4.0 netware/mysql_test_run.c: Merge with 4.0 scripts/mysql_install_db.sh: Merge with 4.0 sql/field.cc: Merge with 4.0 sql/field.h: Merge with 4.0 sql/item_cmpfunc.h: Merge with 4.0 support-files/my-huge.cnf.sh: Merge with 4.0 support-files/my-large.cnf.sh: Merge with 4.0 support-files/my-medium.cnf.sh: Merge with 4.0 support-files/my-small.cnf.sh: Merge with 4.0 support-files/mysql.spec.sh: Merge with 4.0
| | * | mysql-copyright:unknown2004-06-152-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added 'local $/' to keep from undef-ing $/ (the newline setting) for the whole script * removed the target dir removal (target dir is not a temp dir!) * use split to create filelist (cleaner way than using chomp!) * removed use of chomp because it caused some file names to be mangled * print out which file is being processed if verbose mysql-copyright-2: * added cpp to list of files to be processed (for windows archives) Build-tools/mysql-copyright-2: * added cpp to list of files to be processed (for windows archives) Build-tools/mysql-copyright: * added 'local $/' to keep from undef-ing $/ (the newline setting) for the whole script * removed the target dir removal (target dir is not a temp dir!) * use split to create filelist (cleaner way than using chomp!) * removed use of chomp because it caused some file names to be mangled * print out which file is being processed if verbose
| | * | mysql-copyright -> more fixes to deal with problems in removing temporary ↵unknown2004-06-151-20/+35
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tar directory. Had to use `cd $WD` vs chdir($WD). Servers.fgl -> made sure all charset files were accounted for (cp 1256 was missing) Build-tools/mysql-copyright: more fixes to deal with problems in removing temporary tar directory. Had to use `cd $WD` vs chdir($WD). VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl: made sure all charset files were accounted for (cp 1256 was missing) VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl: made sure all charset files were accounted for (cp 1256 was missing) VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl: made sure all charset files were accounted for (cp 1256 was missing)
| | * mysql-copyright:unknown2004-06-111-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Small fixes to handle packaging of windows src (commercial) file Build-tools/mysql-copyright: Small fixes to handle packaging of windows src (commercial) file
| | * see notes for mysql-copyright scriptsunknown2004-06-082-19/+45
| | | | | | | | | | | | | | | | | | | | | Build-tools/mysql-copyright-2: small fix Build-tools/mysql-copyright: deals with windows src file now
| | * Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-06-081-10/+27
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into krsna.patg.net:/home/patg/mysql-4.0 Build-tools/Do-compile: Auto merged
| | * | see notes for Do-compileunknown2004-05-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Added two options that: 1. Clear logs on each host prior to build 2. Turn off ndbcluster BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | - Modified Do-compile to build, package and test NDB cluster, whenunknown2004-06-161-7/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled Build-tools/Do-compile: - removed redundant option "--without-ndbcluster" (we already have "--with-cluster" for that) - make sure to add the cluster files in the binary distribution - make sure to run mysql-test-run with NDB tests enabled
* | | mysql-copyright:unknown2004-06-111-16/+43
| | | | | | | | | | | | | | | | | | | | | | | | Fixed various issues to deal with untarring of gpl tar file, clearing configure.in, changed calls to use system vs. backticks Build-tools/mysql-copyright: Fixed various issues to deal with untarring of gpl tar file, clearing configure.in, changed calls to use system vs. backticks
View Lorry Controller Status