summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* manually mergedunknown2004-08-183-4/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge bk-internal:/home/bk/mysql-4.0/unknown2004-08-101-0/+2
| |\ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | * disable safe-updates for mysql_fix_privilege_tablesunknown2004-08-101-0/+2
| | |
| * | - rename: EXCEPTIONS->EXCEPTIONS-CLIENTunknown2004-08-052-2/+2
| | |
| * | - More changes to include the FLOSS License Exception in theunknown2004-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | various distributions Docs/Makefile.am: - Honoured node name change in manual.texi FOSS->FLOSS Makefile.am: - actually add EXCEPTIONS to the source distribution scripts/make_win_src_distribution.sh: - add EXCEPTIONS to the Windows source distribution, too
| * | - applied the required changes to create the FOSS License exceptionunknown2004-08-051-1/+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
| * language fixunknown2004-07-291-1/+1
| |
| * - match shared library file name suffixes on Mac OS X (.dylib)unknown2004-07-231-2/+4
| | | | | | | | | | | | | | | | | | and HP-UX (.sl) for creating "mysql-shared" packages there scripts/make_sharedlib_distribution.sh: - match shared library file name suffixes on Mac OS X (.dylib) and HP-UX (.sl)
* | Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes ↵unknown2004-08-101-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server". Instead of trying to open time zone tables during calculation of CONVERT_TZ() function or setting of @@time_zone variable we should open and lock them with the rest of statement's table (so we should add them to global table list) and after that use such pre-opened tables for loading info about time zones. mysql-test/r/timezone2.result: Added test for bug #4508 mysql-test/t/timezone2.test: Added test for bug #4508 scripts/mysql_create_system_tables.sh: Added one more test time zone to time zone tables which is needed for test for bug #4508. sql/item_create.cc: CONVERT_TZ() now is treated as special function. sql/item_create.h: CONVERT_TZ() now is treated as special function. sql/item_timefunc.cc: Item_func_convert_tz now uses list of pre-opened time zone tables instead of trying to open them ad-hoc. Also it avoid calling of current_thd. sql/item_timefunc.h: Added comment describing special nature of CONVERT_TZ() function. Optimization: Added own fix_fields() method and tz_tables member for caching pointer to list of open time zone tables to Item_func_convert_tz class. sql/lex.h: CONVERT_TZ() now is treated as special function. sql/mysql_priv.h: Removed function which is no longer used. sql/set_var.cc: Now my_tz_find() accepts list of pre-opened time zone tables as last argument and no longer needs pointer to current THD. sql/set_var.h: Exported sys_time_zone, which is now used in sql_yacc.yy for quick finding out if we are setting @@time_zone variable. sql/sql_base.cc: Moved propagation of pointers to open tables from global list to local select lists to open_and_lock_tables(), also added implicit usage of time zone tables as condition for such propagation. sql/sql_lex.cc: Added fake_time_zone_tables_list which is used to indicate that time zone tables are implicitly used in statement. st_select_lex_unit::create_total_list(): if time zone tables are implicitly used in statement add them to global tables list. sql/sql_lex.h: Added LEX::time_zone_tables_used member which is used to indicate that time zone tables are implicitly used in this statement (by pointing to fake_time_zone_table_list) and for holding pointer to those tables after they've been opened. sql/sql_parse.cc: We should also create global table list if statement uses time zone tables implicitly. Added initialization of LEX::time_zone_tables_used to mysql_query_init(). sql/sql_prepare.cc: We should also create global table list if statement uses time zone tables implicitly. sql/sql_select.cc: Removed functions which are no longer used. sql/sql_yacc.yy: CONVERT_TZ() and @@time_zone variable are handled in special way since they implicitly use time zone tables. sql/tztime.cc: Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server". If statement uses CONVERT_TZ() function or @@time_zone variable is set then it implicitly uses time zone tables. We need to open and lock such tables with all other tables of such statement. All code responsible for opening table was removed from tz_load_from_db() and function was renamed to tz_load_from_open_tables() (which uses list of pre-opened tables). We also have new functions for construction and initialization of table list of time zone tables. my_tz_find() now always require list of pre-opened time zone tables and no longer needs current THD. So we have to pre-open them in my_tz_init(). Also now we try to open time zone tables only if they were found during startup. sql/tztime.h: New function for construction of table list of time zone tables my_tz_get_table_list(). Now my_tz_find() requires list of pre-pened time zone tables instead of current thread.
* | Merge mysql.com:/space/my/mysql-4.1unknown2004-07-151-0/+1
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build
| * | - Avoid the error message "Can't read index header from..."unknown2004-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when copying a small index file because the value returned for $length is < 1024. This can happen if the filehandle was open()ed as an UTF-8 encoded file with Unicode characters (In this case read() returns characters not bytes) (Thanks to Mike Bethune) for this hint)
* | | mysql_fix_privilege_tables.sh:unknown2004-07-141-2/+2
|/ / | | | | | | | | | | | | | | Language fixups. scripts/mysql_fix_privilege_tables.sh: Language fixups.
* | Mergeunknown2004-07-111-8/+8
|\ \ | |/ | | | | | | | | | | sql/sql_show.cc: Auto merged sql/mysql_priv.h: SCCS merged
| * mysqlhotcopy:unknown2004-07-091-8/+8
| | | | | | | | | | | | | | | | | | | | fix MYI copying with scp safer tempfile creation scripts/mysqlhotcopy.sh: fix MYI copying with scp safer tempfile creation
| * Fix to be able to cross-compile for modestounknown2004-06-271-0/+0
| | | | | | | | | | scripts/make_win_src_distribution.sh: Change mode to -rw-rw-r--
* | mysql_fix_privilege_tables.sh:unknown2004-07-061-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | various fixes (for mysql-test-run at least): * accept --no-defaults * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --) ps_3innodb.test: only run ps_3innodb.test if innodb is present mysql-test-run.sh: it's --verbose, not --verbose=1 mysql-test/mysql-test-run.sh: it's --verbose, not --verbose=1 mysql-test/t/ps_3innodb.test: only run ps_3innodb.test if innodb is present scripts/mysql_fix_privilege_tables.sh: various fixes (for mysql-test-run at least): * accept --no-defaults * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
* | Message/comment touchup.unknown2004-06-282-2/+2
| | | | | | | | | | | | | | scripts/mysql_fix_privilege_tables.sh: Message touchup. scripts/mysql_fix_privilege_tables.sql: Comment touchup.
* | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-06-281-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-874 scripts/mysql_fix_privilege_tables.sh: Auto merged
| * | Fix for BUG#4240 "mysql_fix_privilege_tables Does not use --password properly"unknown2004-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Pass password if it is NOT empty. Typo fixed. scripts/mysql_fix_privilege_tables.sh: Pass password if it is NOT empty. Typo fixed.
* | | Cleanup for creating windows source distributionunknown2004-06-262-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: added sql/mysql_tzinfo_to_sql.cc scripts/make_win_src_distribution.sh: Don't copy InstallShield files if we are in a normal bk tree scripts/mysql_create_system_tables.sh: Remove duplicate entry
* | | make_win_src_distribution.sh:unknown2004-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 4.1 tree must use installshield project files due to new tables scripts/make_win_src_distribution.sh: 4.1 tree must use installshield project files due to new tables
* | | mysql_create_system_tables.sh:unknown2004-06-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | fix to user table during make_win_src_distribution scripts/mysql_create_system_tables.sh: fix to user table during make_win_src_distribution
* | | Merge with 4.0 to get the latest bug patches to 4.1unknown2004-06-252-1/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add missing .cnf files to windows installation (Bug #4216)unknown2004-06-252-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | scripts/make_win_binary_distribution.sh: Add missing .cnf files (Bug #4216) scripts/make_win_src_distribution.sh: Add missing .cnf files (Bug #4216) Align code with MySQL 4.1
| * | lower_case_table_names=2 (Keep case for table names) was not honoredunknown2004-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109) Make net_buffer_length visible for mysql clients (Bug #4206) include/mysql.h: Make net_buffer_length visible for mysql clients libmysql/libmysql.c: Make net_buffer_length visible for mysql clients mysql-test/mysql-test-run.sh: Don't give warning for some common 'safe' warnings mysql-test/r/lowercase_table2.result: Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109) mysql-test/t/lowercase_table2.test: Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109) scripts/mysql_install_db.sh: Removed not used variable sql/sql_table.cc: lower_case_table_names=2 (Keep case for table names) was not honored with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
* | | Added missing root user to mysql.user on windows. (Bug #4242)unknown2004-06-254-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938) Don't use default arguments for ha_rnd_init() Simple code cleanups since last pull scripts/fill_func_tables.sh: Change mode to -rw-rw-r-- scripts/make_win_src_distribution.sh: Safer remove of SCCS directories scripts/mysql_create_system_tables.sh: Added missing root user to mysql.user on windows. (Bug #4242) scripts/mysql_install_db.sh: Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938) sql/filesort.cc: Don't use default arguments for ha_rnd_init() sql/ha_berkeley.cc: Better to use #ifdef than // to disable code Removed not needed setting of active_index (It's set in index_end) sql/ha_berkeley.h: Don't use default arguments for ha_rnd_init() sql/ha_heap.h: Don't use default arguments for ha_rnd_init() sql/ha_innodb.h: Don't use default arguments for ha_rnd_init() sql/ha_isam.h: Don't use default arguments for ha_rnd_init() sql/ha_isammrg.h: Don't use default arguments for ha_rnd_init() sql/ha_myisam.cc: Fixed wrong previous patch (New code used 'and' between two conditions when it should be 'or' as in original code) sql/ha_myisam.h: Don't use default arguments for ha_rnd_init() sql/ha_myisammrg.h: Don't use default arguments for ha_rnd_init() sql/ha_ndbcluster.h: Don't use default arguments for ha_rnd_init() sql/handler.cc: Code cleanup sql/handler.h: Keep bool variables together (better alignment) sql/records.cc: Don't use default arguments for ha_rnd_init() sql/sql_select.cc: Don't use default arguments for ha_rnd_init()
* | | Changed a comment.unknown2004-06-251-1/+1
| | |
* | | a fix (bug #4241: system_mysql_db_fix.test fails)unknown2004-06-251-0/+1
| | |
* | | - added mysql_tzinfo_to_sql to binary distributionsunknown2004-06-241-1/+1
| |/ |/| | | | | | | | | | | | | scripts/make_binary_distribution.sh: - added mysql_tzinfo_to_sql to binary distribution support-files/mysql.spec.sh: - added mysql_tzinfo_to_sql to the server subpackage - run "make clean" instead of "make distclean"
* | mergeunknown2004-06-212-8/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-8/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * ke it possible to use mysys functions in netware/mysql_test_run.cunknown2004-06-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't pass --user to mysqld if --user is not used netware/Makefile.am: Make it possible to use mysys functions in mysql_test_run.c netware/mysql_test_run.c: Make it possible to use mysys functions in mysql_test_run.c scripts/mysql_install_db.sh: Don't pass --user to mysqld if --user is not used
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-06-101-7/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.0
| | | * Merge bk-internal:/home/bk/mysql-4.0/unknown2004-06-101-7/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | | * warn about multiple mysqld --user parameters only if their arguments differunknown2004-06-101-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/mysqld_safe.sh: don't protect mysqld from multiple --user commands - mysqld can take care of itself sql/mysqld.cc: warn about multiple --user parameters only if their arguments differ
| | * | | After merge fixunknown2004-06-101-4/+5
| | |/ / | | | | | | | | | | | | | | | | scripts/mysql_install_db.sh: Cleanup
| | * | Fix for BUG#4038 "rpm postinstall script leaves files as owned by root":unknown2004-06-091-1/+5
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the rpm postinstall script must call mysql_install_db with --user=mysql, and mysql_install_db must then pass this to mysqld. Otherwise, mysqld runs as root, and if you have --log-bin=somewhere_out_of_var_lib_mysql it creates binlog files owned by root in this dir, and this dir is not fixed by the 'chmod mysql', so files remain owned by root, and later mysqld (running as 'mysql') can't read them. I'm hardcoding 'mysql' in the postinstall script, but it's already hardcoded there in many places (see the useradd and chown) so it's ok. scripts/mysql_install_db.sh: Pass --user to mysqld support-files/mysql.spec.sh: in postinstall, call mysql_install_db with --user=mysql, so that mysqld (which installs the grant tables) is started with --user=mysql.
* | | WL#1264 "Per-thread time zone support infrastructure".unknown2004-06-182-0/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added basic per-thread time zone functionality (based on public domain elsie-code). Now user can select current time zone (from the list of time zones described in system tables). All NOW-like functions honor this time zone, values of TIMESTAMP type are interpreted as values in this time zone, so now our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH LOCAL TIME ZONE (or proper PostgresSQL type). WL#1266 "CONVERT_TZ() - basic time with time zone conversion function". Fixed problems described in Bug #2336 (Different number of warnings when inserting bad datetime as string or as number). This required reworking of datetime realted warning hadling (they now generated at Field object level not in conversion functions). Optimization: Now Field class descendants use table->in_use member instead of current_thd macro. include/my_global.h: Added macro for reading of 32-bit ints stored in network order from unaligned memory location. include/mysqld_error.h: Added error-code for invalid timestamp warning and error-code for wrong or unknown time zone specification. libmysqld/Makefile.am: Added main per-thread time zone support file to libmysqld libmysqld/lib_sql.cc: Added initialization of time zones infrastructure to embedded server. mysql-test/r/connect.result: Updated test result since now mysql database contains more system tables. mysql-test/r/date_formats.result: Now when truncation occurs during conversion to datetime value we are producing Warnings instead of Notes. Also we are giving more clear warnings about this in some cases. mysql-test/r/func_sapdb.result: New warnings about truncation occured during conversion to datetime value added due their better handling. mysql-test/r/func_time.result: New warnings about truncation occured during conversion to datetime value added due their better handling. mysql-test/r/select.result: New warnings about truncation occured during conversion to datetime value added due their better handling. Also tweaked test a bit to made it less ambigious for reader. mysql-test/r/system_mysql_db.result: Updated test result because new system tables holding time zone descriptions were added. mysql-test/r/timezone.result: Updated timezone.test to use new system variable which shows system time zone. Added test of warning which is produced if someone tries to store non-existing (due falling into spring time-gap) datetime value into TIMESTAMP field. mysql-test/r/type_datetime.result: Separated and extended test of values and warnings produced for bad values stored in DATETTIME fields. mysql-test/r/type_time.result: Now we are producing more consistent warning when we are truncating datetime value while storing it in TIME field. mysql-test/r/type_timestamp.result: Separated and extended test of values and warnings produced for bad values stored in TIMESTAMP fields. mysql-test/t/select.test: Updated test to make it less ambigous for reader. mysql-test/t/timezone.test: Updated timezone.test to use new system variable which shows system time zone. Added test of warning which is produced if someone tries to store non-existing (due falling into spring time-gap) datetime value into TIMESTAMP field. mysql-test/t/type_datetime.test: Separated and extended test of values and warnings produced for bad values stored in DATETTIME fields. mysql-test/t/type_timestamp.test: Separated and extended test of values and warnings produced for bad values stored in TIMESTAMP fields. scripts/mysql_create_system_tables.sh: Added creation of tables with time zone descriptions. Also added descriptions of time zones used in tests. scripts/mysql_fix_privilege_tables.sql: Added mysql.time_zone* tables family. sql/Makefile.am: Added files implementing time zone support to server, also added rules for building of mysql_tzinfo_to_sql converter and test_time test. sql/field.cc: Now we are using per-thread time zone for TIMESTAMP <-> whatever conversion. Fixed generation of warnings for datetime types (DATETIME/TIMESTAMP/DATE/...) and any other Field to datetime conversion (now we are generating warnings no in lower level functions like in str_to_TIME() but in Field methods. This allows generate better and more consistent warnings and to reuse code of str_to_TIME() outside of server). Added 3rd parameter to set_warning() method to be able to not increment cut fields but still produce a warning. Also added set_datetime_warning() family of auxiliary methods which allow easier generate datetime related warnings. Also replaced occurences of current_thd with table->in_use member, added asserts for catching all places there we need to set table->in_use accordingly. Renamed fix_datetime() function to number_to_TIME() and moved it to sql/time.cc there it fits better. sql/field.h: Added comment about places where we can use table->in_use member instead of current_thd. Added 3rd parameter to Field::set_warning() method and set_datetime_warning() family of methods. sql/field_conv.cc: Field::set_warning() method with 2 arguments was replaced with more generic set_warning() method with 3 arguments. sql/ha_berkeley.cc: Now we set table->in_use for temporary tables so we have to use table->tmp_table for checking if table is temporary. sql/item.cc: Replaced calls to str_to_time() and str_to_TIME() funcs with their warning generating analogs. sql/item_create.cc: Added creation of CONVERT_TZ function as FUNC_ARG3. sql/item_create.h: Added creation of CONVERT_TZ function as FUNC_ARG3. sql/item_timefunc.cc: Added support of per-thread time zone to NOW-like and FROM_UNIXTIME, UNIX_TIMESTAMP functions. Added support for CONVERT_TZ function. Removed call to str_to_timestamp function which caused non-optimal behavior in certain cases. Replaced calls to str_to_time() function with its warning generating analog. sql/item_timefunc.h: Added support of per-thread time zone to NOW-like and FROM_UNIXTIME, UNIX_TIMESTAMP functions. Added support of CONVERT_TZ function. sql/lex.h: Added support of CONVERT_TZ function. sql/log.cc: Added support for replication of statements depending on time zone. sql/mysql_priv.h: Now including headers with per-thread time zone support functions and classes. Added portable replacement of time_t - my_time_t type. Added time zone as one of query distinguishing parameters for query cache. Fixed declarations of str_to_TIME, str_to_time and my_system_gmt_sec (former my_gmt_sec) since now they have one more out parameter which informs about wrong datetime value or data truncation during conversion. Added warning generating version of str_to_TIME() and str_to_time() functions. Thrown away str_to_datetime/timestamp functions since they are not needed any longer. Added number_to_TIME function. sql/mysqld.cc: Added per-thread time zone support initialization. Added new startup parameter --default-time-zone. sql/set_var.cc: Added support for per-thread time_zone variable. Renamed old timezone variable to system_time_zone. sql/set_var.h: Added support for per-thread time_zone variable. sql/share/czech/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/danish/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/dutch/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/english/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/estonian/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/french/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/german/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/greek/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/hungarian/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/italian/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/japanese/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/korean/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/norwegian-ny/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/norwegian/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/polish/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/portuguese/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/romanian/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/russian/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/serbian/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/slovak/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/spanish/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/swedish/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/share/ukrainian/errmsg.txt: Added error message for barking when incorrect time zone name or specifiaction is provided and for warning about invalid TIMESTAMP values (e.g. falling into the spring time-gap). sql/slave.cc: In order to support replication of statements using time zones in 4.1 we should ensure that both master and slave have same default time zone. sql/sql_base.cc: Now we are setting TABLE::in_use member for all tables (which assume calls to Field::store or val_ methods). sql/sql_cache.cc: Added time zone as one more query distinguishing parameter for query cache. sql/sql_class.cc: Added THD::time_zone_used variable indicating that this query uses per thread time zone. sql/sql_class.h: Added per-thread time zone variable. Added THD::time_zone_used variable indicating that this query uses per thread time zone so if this is updating query the time zone should be logged to binlog. sql/sql_insert.cc: We should set TABLE::in_use member pointing to thread which is called INSERT DELAYED and not to worker thread. sql/sql_load.cc: Field::set_warning() now has one more argument now. sql/sql_parse.cc: Resetting THD::time_zone_used variable in the end of query processing. sql/sql_select.cc: Now we are setting TABLE::in_use member for all tables (which assume calls to Field::store or val_ methods). sql/sql_show.cc: Now using per thread time zone for extended show tables. sql/time.cc: Added support for per-thread time zones for TIMESTAMP type and reworked generation of warnings for TIMESTAMP and DATETIME types. (Introduced new TIME_to_timestamp() function. Removed hours normalisation from former my_gmt_sec() since it was not working and not used anywhere now, but breaks parameter constness, added to this function generation of warning if we are falling in spring time-gap. Removed str_to_timestamp and str_to_datetime functions which are no longer used. Moved fix_datetime function from sql/field.cc to this file as number_to_TIME() function. Added out parameter for str_to_TIME and str_to_time functions which indicates if value was truncated during conversion, removed direct generation of warnings from this functions.) sql/unireg.cc: Now we are setting TABLE::in_use member for all tables (which assume calls to Field::store or val_ methods). BitKeeper/etc/ignore: Added sql/test_time sql/mysql_tzinfo_to_sql libmysqld/tztime.cc to the ignore list
* | | mysql_install_db.sh:unknown2004-06-041-1/+1
|/ / | | | | | | | | | | | | | | Correct a grammar error. scripts/mysql_install_db.sh: Correct a grammar error.
* | Fix skipp -> skip once and for all.unknown2004-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Note: This affects only comments, not variable names.) extra/perror.c: Fix skipp -> skip once and for all. heap/hp_hash.c: Fix skipp -> skip once and for all. isam/_dynrec.c: Fix skipp -> skip once and for all. isam/isamchk.c: Fix skipp -> skip once and for all. isam/isamlog.c: Fix skipp -> skip once and for all. isam/pack_isam.c: Fix skipp -> skip once and for all. isam/test1.c: Fix skipp -> skip once and for all. merge/mrg_open.c: Fix skipp -> skip once and for all. myisam/mi_check.c: Fix skipp -> skip once and for all. myisam/mi_delete.c: Fix skipp -> skip once and for all. myisam/mi_key.c: Fix skipp -> skip once and for all. myisam/mi_search.c: Fix skipp -> skip once and for all. myisam/myisamlog.c: Fix skipp -> skip once and for all. mysys/ChangeLog: Fix skipp -> skip once and for all. mysys/default.c: Fix skipp -> skip once and for all. mysys/mf_iocache.c: Fix skipp -> skip once and for all. mysys/mf_iocache2.c: Fix skipp -> skip once and for all. mysys/mf_pack.c: Fix skipp -> skip once and for all. mysys/mf_soundex.c: Fix skipp -> skip once and for all. mysys/mf_wfile.c: Fix skipp -> skip once and for all. mysys/my_error.c: Fix skipp -> skip once and for all. mysys/my_getwd.c: Fix skipp -> skip once and for all. scripts/mysql_find_rows.sh: Fix skipp -> skip once and for all. sql/sql_yacc.yy: Fix skipp -> skip once and for all. sql/time.cc: Fix skipp -> skip once and for all. strings/ctype-big5.c: Fix skipp -> skip once and for all. strings/ctype-gbk.c: Fix skipp -> skip once and for all. strings/ctype-tis620.c: Fix skipp -> skip once and for all.
* | several ndb make changes, see respective fileunknown2004-06-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/Main.cpp: Rename: ndb/src/kernel/ndb-main/Main.cpp -> ndb/src/kernel/Main.cpp ndb/src/kernel/SimBlockList.cpp: Rename: ndb/src/kernel/ndb-main/SimBlockList.cpp -> ndb/src/kernel/SimBlockList.cpp BitKeeper/deleted/.del-Makefile.am~dbb6038d7163a54d: Delete: ndb/src/kernel/ndb-main/Makefile.am BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0: Delete: ndb/src/kernel/ndb-main/Makefile_old ndb/old_files/BinDist.sh: Rename: ndb/BinDist.sh -> ndb/old_files/BinDist.sh ndb/old_files/Defs.mk: Rename: ndb/Defs.mk -> ndb/old_files/Defs.mk ndb/old_files/Makefile: Rename: ndb/Makefile_old -> ndb/old_files/Makefile ndb/old_files/SrcDist.sh: Rename: ndb/SrcDist.sh -> ndb/old_files/SrcDist.sh ndb/old_files/configure: Rename: ndb/configure_old -> ndb/old_files/configure ndb/old_files/Epilogue.mk: Rename: ndb/Epilogue.mk_old -> ndb/old_files/Epilogue.mk ndb/config/old_files/Defs.DEBUG.mk: Rename: ndb/config/Defs.DEBUG.mk -> ndb/config/old_files/Defs.DEBUG.mk ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk: Rename: ndb/config/Defs.HPUX.HPPA.GCC.mk -> ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk: Rename: ndb/config/Defs.IBMAIX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk ndb/config/old_files/Defs.LINUX.x86.GCC.mk: Rename: ndb/config/Defs.LINUX.x86.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86.GCC.mk ndb/config/old_files/Defs.LINUX.x86.ICC.mk: Rename: ndb/config/Defs.LINUX.x86.ICC.mk -> ndb/config/old_files/Defs.LINUX.x86.ICC.mk ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk: Rename: ndb/config/Defs.LINUX.x86_64.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk: Rename: ndb/config/Defs.MACOSX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk: Rename: ndb/config/Defs.OSE.PPC750.DIAB.mk -> ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk ndb/config/old_files/Defs.RELEASE.mk: Rename: ndb/config/Defs.RELEASE.mk -> ndb/config/old_files/Defs.RELEASE.mk ndb/config/old_files/Defs.RELEASE_TRACE.mk: Rename: ndb/config/Defs.RELEASE_TRACE.mk -> ndb/config/old_files/Defs.RELEASE_TRACE.mk ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk: Rename: ndb/config/Defs.SIMCELLO.SOFTOSE.GCC.mk -> ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk: Rename: ndb/config/Defs.SOFTOSE.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk: Rename: ndb/config/Defs.SOLARIS.SPARC.FORTE6.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk: Rename: ndb/config/Defs.SOLARIS.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk: Rename: ndb/config/Defs.SOLARIS.SPARC_64.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk: Rename: ndb/config/Defs.SOLARIS6.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk: Rename: ndb/config/Defs.TRU64X.ALPHA.GCC.mk -> ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk ndb/config/old_files/Defs.WIN32.x86.VC7.mk: Rename: ndb/config/Defs.WIN32.x86.VC7.mk -> ndb/config/old_files/Defs.WIN32.x86.VC7.mk ndb/config/old_files/acinclude.m4: Rename: ndb/config/acinclude.m4 -> ndb/config/old_files/acinclude.m4 ndb/config/old_files/Makefile.am: Rename: ndb/config/Makefile.am_old -> ndb/config/old_files/Makefile.am ndb/config/old_files/GuessConfig.sh: Rename: ndb/config/GuessConfig.sh_old -> ndb/config/old_files/GuessConfig.sh ndb/config/old_files/configure.in: Rename: ndb/config/configure.in -> ndb/config/old_files/configure.in ndb/config/old_files/config.h.in: Rename: ndb/config/config.h.in -> ndb/config/old_files/config.h.in ndb/old_files/README: Rename: ndb/README -> ndb/old_files/README ndb/old_files/mysqlclusterenv.sh: Rename: ndb/mysqlclusterenv.sh -> ndb/old_files/mysqlclusterenv.sh ndb/old_files/env.sh: Rename: ndb/env.sh -> ndb/old_files/env.sh BitKeeper/deleted/.del-Makefile~650473b0dabb331b: Delete: ndb/src/scripts/Makefile ndb/src/old_files/ndbbaseclient/Makefile: mvdir ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp: mvdir ndb/src/old_files/ndbclient/Makefile: mvdir ndb/src/old_files/ndbclient/ndbclient_dummy.cpp: mvdir ndb/src/old_files/Makefile: Rename: ndb/src/Makefile_old -> ndb/src/old_files/Makefile acinclude.m4: added ndb configure options configure.in: moved lots of stuff for ndb over to Makefile.ams and added some config opt for ndb mysql-test/ndb/install_ndbcluster.sh: adopt to new ndb install mysql-test/ndb/stop_ndbcluster.sh: adopt to new ndb install ndb/Makefile.am: moved some things to include/Makefile.am ndb/config/common.mk.am: moved some things from configure.in ndb/config/type_kernel.mk.am: moved some things from configure.in ndb/config/type_mgmapiclient.mk.am: moved some things from configure.in ndb/config/type_ndbapi.mk.am: moved some things from configure.in ndb/config/type_ndbapiclient.mk.am: moved some things from configure.in ndb/config/type_ndbapitest.mk.am: moved some things from configure.in ndb/config/type_ndbapitools.mk.am: moved some things from configure.in ndb/config/type_util.mk.am: moved some things from configure.in ndb/src/Makefile.am: . ndb/src/common/portlib/Makefile.am: fix for make distdir ndb/src/cw/cpcd/Makefile.am: added configurable ldflags ndb/src/kernel/Makefile.am: moved up ndb-main one level ndb/src/kernel/blocks/backup/restore/Makefile.am: added configurable ldflags ndb/src/kernel/blocks/suma/Makefile.am: fixed error ndb/src/kernel/error/Makefile.am: fix error ndb/src/kernel/vm/Makefile.am: fix error ndb/src/mgmapi/Makefile.am: removed libMGM_API ndb/src/mgmclient/Makefile.am: added configurable ldflags ndb/src/mgmsrv/Makefile.am: added configurable ldflags ndb/src/ndbapi/Makefile.am: removed libNDB_API ndb/test/Makefile.am: added optional build of ndbapi tests ndb/tools/Makefile.am: added configurable ldflags ndb/include/Makefile.am: fixed missing .h files in make distdir scripts/make_binary_distribution.sh: updated for ndb and new make
* | Remove some code from sql_yacc.cc that doesn't do anything except produce ↵unknown2004-05-281-2/+4
| | | | | | | | | | | | | | warnings on VC++ mysql-test/t/fulltext.test: After merge fix
* | Changed prototype of killed_ptr() to make it more portableunknown2004-05-261-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
* | merge with 4.0 to get Netware patches and fixes for libmysqld.dllunknown2004-05-252-26/+71
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged Build-tools/Do-compile: Auto merged client/mysql.cc: Auto merged client/mysqladmin.c: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/thr_alarm.h: Auto merged innobase/include/trx0roll.h: Auto merged innobase/include/trx0trx.h: Auto merged innobase/que/que0que.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/usr/usr0sess.c: Auto merged isam/isamchk.c: Auto merged myisam/myisam_ftdump.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged mysys/default.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_init.c: Auto merged mysys/my_pthread.c: Auto merged netware/Makefile.am: Auto merged netware/init_db.sql: Auto merged scripts/make_binary_distribution.sh: Auto merged tools/mysqlmanager.c: Auto merged VC++Files/dbug/dbug.dsp: Auto merged VC++Files/heap/heap.dsp: Auto merged VC++Files/isam/isam.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/myisam/myisam.dsp: Auto merged VC++Files/myisammrg/myisammrg.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/libmysqld/libmysqld.dsp: merge client/mysqlbinlog.cc: merge extra/perror.c: merge include/mysql_com.h: merge libmysqld/Makefile.am: merge netware/BUILD/mwenv: merge sql/mysqld.cc: merge
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-05-252-26/+71
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/tmp/skr99/mysql-4.0 client/mysqltest.c: Auto merged configure.in: Auto merged include/my_global.h: Auto merged myisam/myisam_ftdump.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/mysqld.cc: Auto merged
| | * Added patches from Novellunknown2004-05-252-26/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Fixed indentation configure.in: Added patches from Novell Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS extra/perror.c: Fixed error number reporting to not report 'Unknown error' include/my_global.h: Defines to make NETWARE patches cleaner include/thr_alarm.h: Fixed wrong macro netware/mysql_install_db.c: Indentation fix
* | | Merge with 4.0, mainly to get changes to windows project filesunknown2004-05-201-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/dbug/dbug.dsp: Auto merged VC++Files/heap/heap.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/isam/isam.dsp: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/mysql.dsw: Auto merged BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39: Auto merged VC++Files/libmysqltest/myTest.dsp: Auto merged VC++Files/merge/merge.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisam/myisam.dsp: Auto merged VC++Files/myisam_ftdump/myisam_ftdump.dsp: Auto merged VC++Files/myisammrg/myisammrg.dsp: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/mysqlshutdown/mysqlshutdown.dsp: Auto merged VC++Files/mysqlwatch/mysqlwatch.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/regex/regex.dsp: Auto merged VC++Files/replace/replace.dsp: Auto merged VC++Files/test1/test1.dsp: Auto merged VC++Files/thr_test/thr_test.dsp: Auto merged VC++Files/vio/vio.dsp: Auto merged VC++Files/zlib/zlib.dsp: Auto merged extra/my_print_defaults.c: Auto merged include/m_string.h: Auto merged include/mysql_embed.h: Auto merged include/mysql_version.h.in: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/trx/trx0sys.c: Auto merged myisam/myisam_ftdump.c: Auto merged VC++Files/bdb/bdb.dsp: Merge with 4.0 VC++Files/client/mysql.dsp: Merge with 4.0 VC++Files/client/mysqlclient.dsp: Merge with 4.0 VC++Files/comp_err/comp_err.dsp: Merge with 4.0 VC++Files/libmysqld/examples/test_libmysqld.dsp: Merge with 4.0 VC++Files/libmysqld/libmysqld.dsp: Merge with 4.0 VC++Files/myisamchk/myisamchk.dsp: Merge with 4.0 VC++Files/myisamlog/myisamlog.dsp: Merge with 4.0 VC++Files/myisampack/myisampack.dsp: Merge with 4.0 VC++Files/mysqldemb/mysqldemb.dsp: Merge with 4.0 VC++Files/mysqlserver/mysqlserver.dsp: Merge with 4.0 VC++Files/sql/mysqld.dsp: Merge with 4.0 VC++Files/strings/strings.dsp: Merge with 4.0 libmysqld/lib_sql.cc: Merge with 4.0 libmysqld/libmysqld.def: Merge with 4.0 mysql-test/r/func_str.result: Merge with 4.0 mysql-test/r/handler.result: auto mysql-test/r/variables.result: Merge with 4.0 mysql-test/t/func_str.test: auto mysql-test/t/handler.test: auto mysql-test/t/variables.test: Merge with 4.0 scripts/make_win_src_distribution.sh: auto scripts/mysql_install_db.sh: Use original file sql/Makefile.am: Merge with 4.0 sql/ha_innodb.cc: auto sql/item_strfunc.cc: Merge with 4.0 sql/mysql_priv.h: auto sql/mysqld.cc: Merge with 4.0 sql/set_var.cc: Merge with 4.0 sql/slave.cc: auto sql/sql_class.h: auto sql/sql_handler.cc: Merge with 4.0 strings/ctype-tis620.c: Merge with 4.0
| * | Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'unknown2004-05-192-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensured that all projects compile Removed compiler warnings Better setting of server_version variable. Fix that make_win_src_distribution creates the privilege tables. VC++Files/bdb/bdb.dsp: Small, automatic changes VC++Files/client/mysql.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqladmin.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlclient.dsp: Removed files that should only be used with mysql command line client VC++Files/client/mysqldump.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlimport.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlshow.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/comp_err/comp_err.dsp: Automatic changes VC++Files/dbug/dbug.dsp: Automatic changes VC++Files/heap/heap.dsp: automatic changes VC++Files/innobase/innobase.dsp: Automatic changes VC++Files/isam/isam.dsp: Automatic changes VC++Files/isamchk/isamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysql/libmysql.dsp: Automatic changes VC++Files/libmysqld/examples/test_libmysqld.dsp: Add missing files VC++Files/libmysqld/libmysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysqltest/myTest.dsp: Automatic changes VC++Files/merge/merge.dsp: Automatic changes VC++Files/my_print_defaults/my_print_defaults.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisam/myisam.dsp: automatic changes VC++Files/myisam_ftdump/myisam_ftdump.dsp: automatic changes VC++Files/myisamchk/myisamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisamlog/myisamlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisammrg/myisammrg.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisampack/myisampack.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysql.dsw: Automatic changes VC++Files/mysqlbinlog/mysqlbinlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlcheck/mysqlcheck.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqldemb/mysqldemb.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlserver/mysqlserver.dsp: Automatic changes VC++Files/mysqlshutdown/mysqlshutdown.dsp: Automatic changes VC++Files/mysqlwatch/mysqlwatch.dsp: Automatic changes VC++Files/mysys/mysys.dsp: Automatic changes VC++Files/pack_isam/pack_isam.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/perror/perror.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/regex/regex.dsp: Automatic changes VC++Files/replace/replace.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/sql/mysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/strings/strings.dsp: Removed duplicate code for strnlen VC++Files/test1/test1.dsp: Automatic changes VC++Files/thr_test/thr_test.dsp: Automatic changes VC++Files/vio/vio.dsp: Automatic changes VC++Files/zlib/contrib/asm386/zlibvc.dsp: Automatic changes VC++Files/zlib/zlib.dsp: Automatic changes extra/my_print_defaults.c: Fixed bug in --verbose include/m_string.h: Portability fix include/mysql_embed.h: Better setting of server_version variable include/mysql_version.h.in: Better license text handling innobase/pars/pars0lex.l: Remove compiler warnings innobase/trx/trx0sys.c: Remove compiler warnings libmysqld/lib_sql.cc: Better setting of server_version variable libmysqld/libmysqld.def: Add functions needed for mysql command line client myisam/myisam_ftdump.c: Remove compiler warnings mysys/sha1.c: Remove compiler warnings scripts/make_win_src_distribution.sh: Safety fix scripts/mysql_install_db.sh: Backport from 4.1 to allow make_win_src_distribution create the privilege tables sql/Makefile.am: Add new file mysqld_suffix.h Remove not used file sql_olap.h sql/ha_innodb.cc: Remove not used variable sql/mysqld.cc: Better setting of server_version variable sql/set_var.cc: Fixed bug when showing lower_case_file_system strings/ctype-tis620.c: Remove compiler warnings
* | | Merge with 4.0.20unknown2004-05-171-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union client/mysql.cc: Auto merged client/mysqltest.c: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/eval/eval0eval.c: Auto merged innobase/ibuf/ibuf0ibuf.c: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/row/row0umod.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0dbg.c: Auto merged innobase/ut/ut0mem.c: Auto merged myisam/mi_dynrec.c: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/t/fulltext.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_innodb.cc: Auto merged sql/item_func.cc: Auto merged sql/slave.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_show.cc: Auto merged innobase/os/os0file.c: Merge with 4.0.20 Ensure that we call F_UNLCK for files on which we call F_WRLCK. This is to ensure that this code will be portable accross most platforms. myisam/ft_boolean_search.c: Merge with 4.0.20 (keep original file) myisam/ft_parser.c: Merge with 4.0.20 (keep original file) myisam/ftdefs.h: Merge with 4.0.20 (keep original file)
| * | - make sure the binaries are executable before calling them duringunknown2004-05-131-0/+1
| |/ | | | | | | | | | | | | | | make_binary_distribution (bug#2857) scripts/make_binary_distribution.sh: - make sure the binaries are executable before calling them (bug#2857)
View Lorry Controller Status