summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* mysql_upgrade win fixesunknown2007-04-193-10/+16
| | | | | | | | | client/mysql_upgrade.c: Windows fix scripts/CMakeLists.txt: Fix problems with CMakeList causing build to fail scripts/comp_sql.c: Improve comp_sql.c to generate output file with shorter strings
* Add CMakeLists.txt to EXTRA_DISTunknown2007-04-181-1/+2
|
* Remove the check for value_start(if any it should be *value_start)unknown2007-04-181-1/+1
|
* Use my_snprintf instead of snprintfunknown2007-04-181-3/+3
|
* Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-181-1/+1
|\ | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
| * Use my_snprintf instead of snprintfunknown2007-04-181-1/+1
| |
* | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-181-9/+19
|\ \ | |/ | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
| * Add mysql builtin $MYSQL_SERVER_VERSION and some function to makeunknown2007-04-181-9/+19
| | | | | | | | | | | | | | it easier to set a variable from string or int
* | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-181-0/+7
|\ \ | |/ | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_cases.pl: Auto merged
| * Make it possible to define how many slaves to start byunknown2007-04-181-0/+7
| | | | | | | | | | | | | | writing --slave-num=n in <testname>-master.opt file
* | Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgradeunknown2007-04-1811-611/+890
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union CMakeLists.txt: Auto merged Makefile.am: Auto merged include/my_global.h: Auto merged sql/mysql_priv.h: Auto merged
| * | Bug#25452 mysql_upgrade access deniedunknown2007-04-1813-611/+963
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve mysql_upgrade and add comments describing it's logic - Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade was started from - Don't look for mysql_fix_privilege_tables.sql randomly, compile in the mysql_fix_privilege_tables.sql file and use that to upgrade the system tables of MySQL - Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL - Fix bug#26639, bug#24248 and bug#25405 BitKeeper/etc/ignore: Added scripts/comp_sql scripts/mysql_fix_privilege_tables_sql.c to the ignore list CMakeLists.txt: Build files also in scripts/ Makefile.am: Build scripts/ a little earlier to make the scripts/mysql_fix_privilege_tables_sql.c file available when client/ is built client/mysql_upgrade.c: Updated version of mysql_upgrade with comments and logical functions include/my_global.h: Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h mysql-test/r/mysql_upgrade.result: Update result mysql-test/t/mysql_upgrade.test: Add more tests for different bugs related to mysql_upgrade scripts/Makefile.am: Build comp_sql and mysql_fix_privilege_tables_sql.c sql/mysql_priv.h: Move IF_WIN macro to my_global.h fr from sql/mysql_priv.h scripts/CMakeLists.txt: New BitKeeper file ``scripts/CMakeLists.txt'' scripts/comp_sql.c: New BitKeeper file ``scripts/comp_sql.c''
* | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-04-134-22/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * \ \ Merge pilot.blaudden:/home/msvensson/mysql/bug27783/my50-bug27783unknown2007-04-133-18/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| | * | | Bug#27783 mysql_install_db should be able to install again, preserving ↵unknown2007-04-123-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | existing files. - Allow mysql_install_db to be run a second time in the same datadir to create and fill any missing system tables scripts/mysql_install_db.sh: Remove check that dissallowed running mysql_install_db a second time in same directory scripts/mysql_system_tables.sql: Save information about if tables db and user already existed scripts/mysql_system_tables_data.sql: Fill tables db and user with initial data if tables didn't already exist.
| * | | | Add option manual-dddunknown2007-04-131-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change syntax for starting manual ddd or gdb to avoid having to change working dir
| * | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-130-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: f Use local
| | * | | Add missing option --manual-dddunknown2007-04-131-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change syntax to start manual gdb/ddd to avoid having to cd to the mysql-test directory before calling the command
* | | | | BUG#27367 mysql.server should be LSB init script compliantunknown2007-04-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved cd $basedir to live in the start section, as it only applies to the start functionality and breaks the restart task
* | | | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatusunknown2007-04-121-2/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
| * | | | | BUG#27367 mysql.server should be LSB init script compliantunknown2007-03-211-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support-files/mysql.server.sh: BUG#27367 Replaced [] with test syntax. Added test for locks on RedHat/SuSE systems
* | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatusunknown2007-04-121-7/+30
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo
| * | | | BUG#27367 mysql.server should be LSB init script compliantunknown2007-03-213-7/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support-files/mysql.server.sh: BUG#27367 Add force-reload and status options. Change usage message to reflect Replaced a shell call to cat with shell builtin read
* | | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-04-1297-300/+10827
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | | | Adding files to support building for debian.unknown2007-04-1197-300/+10827
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- Removed reference to debian svn location of debian dir. Changed verbage of comment to appease Timothy. --- Removed added manpages that aren't appropriate for our build. --- Added debian dir to list of dist targets. Added list of files needed to be distributed in debian dir. --- Added semi-colons to fix syntax error. --- BUG#27769 MySQL should include debian packaing dir Added debian/Makefile to configure.in to support make dist. BitKeeper/deleted/.del-configure.in.rej: Delete: configure.in.rej Makefile.am: Added debian dir to list of dist targets. configure.in: Added debian/Makefile to configure.in to support make dist BitKeeper/deleted/.del-comp_err.1: Adding files to support building for debian. BitKeeper/deleted/.del-msql2mysql.1: Adding files to support building for debian. BitKeeper/deleted/.del-my_print_defaults.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisam_ftdump.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisamchk.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisamlog.1: Adding files to support building for debian. BitKeeper/deleted/.del-myisampack.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_config.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_convert_table_format.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_explain_log.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_find_rows.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_fix_extensions.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_install_db.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_secure_installation.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_setpermission.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_tableinfo.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysql_waitpid.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlbinlog.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlbug.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlcheck.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqldumpslow.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlimport.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqlmanager.1: Adding files to support building for debian. BitKeeper/deleted/.del-mysqltest.1: Adding files to support building for debian. BitKeeper/deleted/.del-pack_isam.1: Adding files to support building for debian. BitKeeper/deleted/.del-resolve_stack_dump.1: Adding files to support building for debian. BitKeeper/deleted/.del-resolveip.1: Adding files to support building for debian. debian/Makefile.am: Added list of files needed to be distributed in debian dir. debian/README.Maintainer: Adding files to support building for debian. --- Removed reference to debian svn location of debian dir. Changed verbage of comment to appease Timothy. debian/changelog: Adding files to support building for debian. debian/compat: Adding files to support building for debian. debian/control.in: Adding files to support building for debian. debian/copyright.more: Adding files to support building for debian. debian/copyright: Adding files to support building for debian. debian/defs.mk: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.README.Maintainer.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.dirs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.docs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.examples.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.files.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER-dev.links.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.README.Debian.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.dirs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.docs.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.files.in: Adding files to support building for debian. debian/libmysqlclientMYSOVER.postinst.in: Adding files to support building for debian. debian/libndbclientNDBSOVER-dev.dirs.in: Adding files to support building for debian. debian/libndbclientNDBSOVER-dev.files.in: Adding files to support building for debian. debian/libndbclientNDBSOVER-dev.links.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.README.Debian.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.dirs.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.files.in: Adding files to support building for debian. debian/libndbclientNDBSOVER.postinst.in: Adding files to support building for debian. debian/mysql-client-MYVER.NEWS.in: Adding files to support building for debian. debian/mysql-client-MYVER.README.Debian.in: Adding files to support building for debian. debian/mysql-client-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-client-MYVER.docs.in: Adding files to support building for debian. debian/mysql-client-MYVER.files.in: Adding files to support building for debian. debian/mysql-client-MYVER.lintian-overrides.in: Adding files to support building for debian. debian/mysql-common.README.Debian.in: Adding files to support building for debian. debian/mysql-common.dirs.in: Adding files to support building for debian. debian/mysql-common.files.in: Adding files to support building for debian. debian/mysql-common.postrm.in: Adding files to support building for debian. debian/mysql-common.preinst.in: Adding files to support building for debian. debian/mysql-extra-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-extra-MYVER.files.in: Adding files to support building for debian. debian/mysql-management-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-management-MYVER.files.in: Adding files to support building for debian. debian/mysql-management-MYVER.mysql-management.init.in: Adding files to support building for debian. debian/mysql-server-MYOLDVER.preinst.in: Adding files to support building for debian. debian/mysql-server-MYVER.NEWS.in: Adding files to support building for debian. debian/mysql-server-MYVER.README.Debian.in: Adding files to support building for debian. debian/mysql-server-MYVER.config.in: Adding files to support building for debian. debian/mysql-server-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-server-MYVER.docs.in: Adding files to support building for debian. debian/mysql-server-MYVER.files.in: Adding files to support building for debian. debian/mysql-server-MYVER.links.in: Adding files to support building for debian. debian/mysql-server-MYVER.lintian-overrides.in: Adding files to support building for debian. debian/mysql-server-MYVER.logcheck.ignore.paranoid.in: Adding files to support building for debian. debian/mysql-server-MYVER.logcheck.ignore.server.in: Adding files to support building for debian. debian/mysql-server-MYVER.logcheck.ignore.workstation.in: Adding files to support building for debian. debian/mysql-server-MYVER.mysql-server.logrotate.in: Adding files to support building for debian. debian/mysql-server-MYVER.postinst.in: Adding files to support building for debian. debian/mysql-server-MYVER.postrm.in: Adding files to support building for debian. debian/additions/my.cnf: Adding files to support building for debian. debian/additions/mysql-server.lintian-overrides: Adding files to support building for debian. debian/additions/ndb_mgmd.cnf: Adding files to support building for debian. debian/mysql-server-MYVER.preinst.in: Adding files to support building for debian. debian/mysql-server-MYVER.prerm.in: Adding files to support building for debian. debian/mysql-server-MYVER.templates.in: Adding files to support building for debian. debian/mysql-server.preinst.in: Adding files to support building for debian. debian/mysql-storage-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-storage-MYVER.files.in: Adding files to support building for debian. debian/mysql-storage-MYVER.mysql-storage.init.in: Adding files to support building for debian. debian/mysql-test-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-test-MYVER.files.in: Adding files to support building for debian. debian/mysql-tools-MYVER.dirs.in: Adding files to support building for debian. debian/mysql-tools-MYVER.files.in: Adding files to support building for debian. debian/po/POTFILES.in.in: Adding files to support building for debian. debian/po/ca.po: Adding files to support building for debian. debian/po/cs.po: Adding files to support building for debian. debian/po/da.po: Adding files to support building for debian. debian/po/de.po: Adding files to support building for debian. debian/po/es.po: Adding files to support building for debian. debian/po/eu.po: Adding files to support building for debian. debian/po/fr.po: Adding files to support building for debian. debian/po/gl.po: Adding files to support building for debian. debian/po/it.po: Adding files to support building for debian. debian/po/ja.po: Adding files to support building for debian. debian/po/nb.po: Adding files to support building for debian. debian/po/nl.po: Adding files to support building for debian. debian/po/pt.po: Adding files to support building for debian. debian/po/pt_BR.po: Adding files to support building for debian. debian/po/ro.po: Adding files to support building for debian. debian/po/ru.po: Adding files to support building for debian. debian/po/sv.po: Adding files to support building for debian. debian/po/templates.pot: Adding files to support building for debian. debian/po/tr.po: Adding files to support building for debian. debian/rules: Adding files to support building for debian. --- Added semi-colons to fix syntax error. debian/source.lintian-overrides.in: Adding files to support building for debian. debian/watch: Adding files to support building for debian.
* | | | | Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to ↵unknown2007-04-112-0/+117
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connect - Add testcase for SSL connection from mysqldump to mysqld mysql-test/r/openssl_1.result: Add test result mysql-test/t/openssl_1.test: Add test case for mysqldump with SSL connection to mysqld
* | | | Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_importunknown2007-04-111-16/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | | | Bug#21765 Illegal Instruction crash on pre-pentium when using YASSLunknown2007-04-111-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Import patch with different method of detecting if machine has cpuid instruction extra/yassl/taocrypt/src/misc.cpp: Import patch yassl.diff
* | | | | Print warning to log when SSL setup failsunknown2007-04-111-0/+1
| | | | |
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611unknown2007-04-113-2/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint vio/viosslfactories.c: Auto merged mysql-test/r/openssl_1.result: Manual merge mysql-test/t/openssl_1.test: Manual merge
| * | | | | Bug#21611 Slave can't connect when master-ssl-cipher specifiedunknown2007-04-025-2/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change check for return value of 'SSL_CTX_set_cipher_list' in order to handle 0 as error setting cipher. - Thanks to Dan Lukes for finding the problem! mysql-test/r/openssl_1.result: Update result mysql-test/t/openssl_1.test: Add test for setting ssl-cipher to be used vio/viosslfactories.c: Change error handling of SSL_CTX_set_cipher_list to detect 0 as an error
* | | | | | Add test for connect using different ssl ciphersunknown2007-04-112-0/+28
| |/ / / / |/| | | | | | | | | | | | | | | | | | | mysql-test/r/openssl_1.result: Update result
* | | | | Add replace_result for things that are not testedunknown2007-04-112-3/+3
| | | | |
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-101-0/+15
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/r/mysqltest.result: Auto merged
| * | | | Update result(which mysterioulsy got lost)unknown2007-04-101-0/+15
| | | | |
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-101-3/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged
| * | | | Take into account wether vertical_results are in effectunknown2007-04-101-1/+1
| | | | |
| * | | | Init dying to 1 just after passing the guardunknown2007-04-101-0/+1
| | | | |
| * | | | Add OPT_LOG_DIRunknown2007-04-101-2/+2
| | | | |
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-100-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1unknown2007-04-104-0/+140
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
* | \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0unknown2007-04-1012-79/+353
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| * \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-101-4/+11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Manual merge
| | * | | | | Add --logdir option ot mysqltestunknown2007-04-101-5/+12
| | | | | | |
| * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-103-29/+149
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: SCCS merged
| | * | | | | Merge 192.168.0.4:mysql/mysql-4.1-maintunknown2007-04-103-29/+149
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint client/mysqltest.c: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged
| | | * | | | | Add "query_sorted" command to mysqltestunknown2007-04-053-29/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage: query_sorted <query>; client/mysqltest.c: Add query_sorted command to mysqltest mysql-test/r/mysqltest.result: Update result mysql-test/t/mysqltest.test: Add tests for query_sorted
| * | | | | | | Give the "sync_slave_with_master" something to dounknown2007-04-102-0/+2
| | | | | | | |
| * | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2007-04-1010-46/+191
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| | * \ \ \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintunknown2007-04-051-33/+52
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged