summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal:/home/bk/mysql-5.1unknown2006-12-042-88/+64
|\ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 sql/ha_ndbcluster.cc: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged
| * Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-302-88/+64
| |\ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| | * Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-281-9/+9
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| | * \ Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-282-88/+64
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 sql/ha_ndbcluster.cc: Manual merge of "fix warnings"
| | | * \ Merge bk-internal:/home/bk/mysql-5.1unknown2006-11-232-103/+78
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1
| | | | * | No need for ndb_util_thread to have two different ndb objects allocated. Use ↵unknown2006-11-211-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | the thd_ndb one and remove the other one.
| | | | * | Fix DBUG_ENTER to print the correct function name unknown2006-11-211-1/+1
| | | | | |
| | | | * | Fix printf warningsunknown2006-11-211-83/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve dbug_print_open_tables so the trace files are readable.
* | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0unknown2006-12-043-5/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1 mysql-test/r/type_varchar.result: Auto merged mysql-test/t/type_varchar.test: Auto merged sql/item_func.cc: Auto merged
| * \ \ \ \ \ Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-optunknown2006-12-043-5/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0 sql/item_func.cc: Auto merged
| | * | | | | | type_varchar.result:unknown2006-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed a valgrind problem mysql-test/r/type_varchar.result: fixed a valgrind problem
| | * | | | | | item_func.cc:unknown2006-12-042-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed a valgrind warning type_varchar.test: fixed a valgrind warning mysql-test/t/type_varchar.test: fixed a valgrind warning sql/item_func.cc: fixed a valgrind warning
* | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-0335-62/+108
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.1 mysql-test/mysql-test-run.pl: Auto merged sql/sql_cache.cc: Auto merged sql/table.cc: Auto merged
| * | | | | | | | Makefile.am:unknown2006-12-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabled abi_check, as it was before merge include/Makefile.am: Disabled abi_check, as it was before merge
| * | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-12-023-33/+48
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged
| | * | | | | | | mysql_install_db.sh:unknown2006-12-023-34/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If --srcdir and --windows is given, check if error message file is in source or build tree (bug#24557) Makefile.am: Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557) mysql_install_db.sh: Added --srcdir=DIR option, used from top Makefile.am in dist-hook target, to find "fill_help_tables.sql" in VPATH build (bug#24557) Makefile.am: Work around problem with "distcleancheck", "sql_yacc.cc" might be in both the source and build tree. Call "mysql_install_db" with new option --srcdir, to enable the script to find all that is needed, if source and build directory is not the same (bug#24557) scripts/mysql_install_db.sh: If --srcdir and --windows is given, check if error message file is in source or build tree (bug#24557) Makefile.am: Work around problem with "distcleancheck", "sql_yacc.cc" might be in both the source and build tree. Call "mysql_install_db" with new option --srcdir, to enable the script to find all that is needed, if source and build directory is not the same (bug#24557) include/Makefile.am: Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
| * | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2006-12-022-0/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| | * \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-12-022-0/+12
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| | | * | | | | | | Makefile.am:unknown2006-12-022-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "mysql_client_test.def" mysql_client_test.def: BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def netware/mysql_client_test.def: BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def netware/Makefile.am: Added "mysql_client_test.def"
| * | | | | | | | | myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def:unknown2006-12-025-6/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjusted for storage path nwbootstrap: Corrected bad merge netware/BUILD/nwbootstrap: Corrected bad merge netware/myisam_ftdump.def: Adjusted for storage path netware/myisamchk.def: Adjusted for storage path netware/myisamlog.def: Adjusted for storage path netware/myisampack.def: Adjusted for storage path
| * | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-12-020-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| | * | | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1-buildunknown2006-12-020-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.0-build
| | | * \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-12-012-1/+2
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
| * | | \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-12-0129-22/+41
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build client/mysqltest.c: Auto merged libmysql/libmysql.c: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged
| | * | | | | | | | | mysql_upgrade.def Makefile.am:unknown2006-12-0129-21/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new "mysql_upgrade.def" for Netware (bug#23504) *.def: Allocate 128K stack for all executables (bug#23504) netware/comp_err.def: Allocate 128K stack for all executables (bug#23504) netware/isamchk.def: Allocate 128K stack for all executables (bug#23504) netware/isamlog.def: Allocate 128K stack for all executables (bug#23504) netware/libmysql.def: Allocate 128K stack for all executables (bug#23504) netware/my_print_defaults.def: Allocate 128K stack for all executables (bug#23504) netware/myisam_ftdump.def: Allocate 128K stack for all executables (bug#23504) netware/myisamchk.def: Allocate 128K stack for all executables (bug#23504) netware/myisamlog.def: Allocate 128K stack for all executables (bug#23504) netware/myisampack.def: Allocate 128K stack for all executables (bug#23504) netware/mysql.def: Allocate 128K stack for all executables (bug#23504) netware/mysql_install_db.def: Allocate 128K stack for all executables (bug#23504) netware/mysql_test_run.def: Allocate 128K stack for all executables (bug#23504) netware/mysql_waitpid.def: Allocate 128K stack for all executables (bug#23504) netware/mysqladmin.def: Allocate 128K stack for all executables (bug#23504) netware/mysqlbinlog.def: Allocate 128K stack for all executables (bug#23504) netware/mysqlcheck.def: Allocate 128K stack for all executables (bug#23504) netware/mysqld.def: Allocate 128K stack for all executables (bug#23504) netware/mysqld_safe.def: Allocate 128K stack for all executables (bug#23504) netware/mysqldump.def: Allocate 128K stack for all executables (bug#23504) netware/mysqlimport.def: Allocate 128K stack for all executables (bug#23504) netware/mysqlshow.def: Allocate 128K stack for all executables (bug#23504) netware/mysqltest.def: Allocate 128K stack for all executables (bug#23504) netware/pack_isam.def: Allocate 128K stack for all executables (bug#23504) netware/perror.def: Allocate 128K stack for all executables (bug#23504) netware/replace.def: Allocate 128K stack for all executables (bug#23504) netware/resolve_stack_dump.def: Allocate 128K stack for all executables (bug#23504) netware/resolveip.def: Allocate 128K stack for all executables (bug#23504) netware/mysql_upgrade.def: BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_upgrade.def netware/Makefile.am: Added "mysql_upgrade.def"
| | * | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2006-12-0177-285/+387
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build client/mysqltest.c: Auto merged libmysql/libmysql.c: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged
| | * \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-013-2/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged
| * | | | | | | | | | | fix build failure introduced by 5.1-marvel mergeunknown2006-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/m_ctype.h: update prototype to reflect changes to my_strchr.c
* | | | | | | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1unknown2006-12-01217-677/+67283
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb configure.in: Auto merged client/mysqldump.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/log.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/table.cc: Auto merged storage/ndb/include/util/OutputStream.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged
| * \ \ \ \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-015-33/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.1 sql/ha_ndbcluster.cc: Auto merged
| * | | | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-01200-649/+66827
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build client/mysqltest.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/table.cc: Auto merged
| | * \ \ \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2006-12-014-2/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build Makefile.am: Auto merged sql-common/my_time.c: Auto merged
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-014-2/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build mysql-test/lib/mtr_process.pl: Auto merged
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2006-11-301-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build mysql-test/mysql-test-run.pl: Auto merged
| | | | | * | | | | | | | | | | late after-merge fixunknown2006-11-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/mysql-test-run.pl: late after-merge fix: re-add MTR_BUILD_THREAD=auto
| | | | * | | | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2006-11-301-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build mysql-test/lib/mtr_process.pl: Auto merged
| | | | | * | | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-11-301-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work mysql-test/lib/mtr_process.pl: Auto merged
| | | | | | * | | | | | | | | | minor fix to mtr_process.plunknown2006-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/mtr_process.pl: print extra message _once_ every 60 seconds
| | | | * | | | | | | | | | | | Merge trift2.:/MySQL/M51/push-5.1unknown2006-11-301-1/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/bug24182-5.1
| | | | | * | | | | | | | | | | | support-files/mysql.spec.sh : Call "make install" using ↵unknown2006-11-301-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "benchdir_root=%{_datadir}" (bug#24182). support-files/mysql.spec.sh: Call "make install" using "benchdir_root=%{_datadir}", because that is affecting the regression test suite as well. Fixes bug#24182.
| | | | * | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2006-11-301-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| | | | | * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-11-291-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build Makefile.am: Auto merged
| | | | | | * | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1-buildunknown2006-11-291-0/+1
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.0-build Makefile.am: SCCS merged
| | | | | | | * | | | | | | | | | Makefile.am:unknown2006-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove soft links before creating source TAR, to avoid file copies (bug#11865) Makefile.am: Remove soft links before creating source TAR, to avoid file copies (bug#11865)
| | | | | * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-11-291-1/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build Makefile.am: Auto merged
| | | | | | * | | | | | | | | | | Makefile.am:unknown2006-11-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected change to create "win" directory Makefile.am: Corrected change to create "win" directory
| | | | | * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-11-291-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build Makefile.am: Auto merged
| | | | | | * | | | | | | | | | | Makefile.am:unknown2006-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "make distcheck" fix, "win" directory Makefile.am: "make distcheck" fix, "win" directory
| | | | * | | | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2006-11-2911-39/+34
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 sql-common/my_time.c: Auto merged
| | | | * | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2006-11-291-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
View Lorry Controller Status