35898 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
unknown	4fff310ecf	mysql_upgrade win fixes ... 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	2007-04-19 17:00:29 +02:00
unknown	b4573eb4ca	Add CMakeLists.txt to EXTRA_DIST	2007-04-18 19:34:33 +02:00
unknown	1f949e082d	Remove the check for value_start(if any it should be *value_start)	2007-04-18 19:00:42 +02:00
unknown	87a05adf40	Use my_snprintf instead of snprintf	2007-04-18 18:40:22 +02:00
unknown	29b6119198	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged	2007-04-18 18:38:20 +02:00
unknown	aa043d73bf	Use my_snprintf instead of snprintf	2007-04-18 18:38:03 +02:00
unknown	1196531a46	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged	2007-04-18 16:56:32 +02:00
unknown	4dc441d3c7	Add mysql builtin $MYSQL_SERVER_VERSION and some function to make ... it easier to set a variable from string or int	2007-04-18 16:56:17 +02:00
unknown	1c6ed4bc74	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/lib/mtr_cases.pl: Auto merged	2007-04-18 16:49:10 +02:00
unknown	5c91177542	Make it possible to define how many slaves to start by ... writing --slave-num=n in <testname>-master.opt file	2007-04-18 13:50:54 +02:00
unknown	5eab19d7a3	Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade ... 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	2007-04-18 13:22:32 +02:00
unknown	1d24597ff9	Bug#25452 mysql_upgrade access denied ... - 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''	2007-04-18 13:21:39 +02:00
unknown	2276ca1aef	Merge bk-internal:/home/bk/mysql-5.0-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	2007-04-13 16:14:43 +02:00
unknown	0ab74abc63	Merge pilot.blaudden:/home/msvensson/mysql/bug27783/my50-bug27783 ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	2007-04-13 15:06:52 +02:00
unknown	59c4bf4217	Add option manual-ddd ... Change syntax for starting manual ddd or gdb to avoid having to change working dir	2007-04-13 15:06:05 +02:00
unknown	80e53fb139	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: f Use local	2007-04-13 15:02:10 +02:00
unknown	e3a24797fd	Add missing option --manual-ddd ... Change syntax to start manual gdb/ddd to avoid having to cd to the mysql-test directory before calling the command	2007-04-13 14:40:52 +02:00
unknown	44c001234d	BUG#27367 mysql.server should be LSB init script compliant ... Moved cd $basedir to live in the start section, as it only applies to the start functionality and breaks the restart task	2007-04-12 11:16:07 -07:00
unknown	49e9743d1a	Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus ... into qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo	2007-04-12 11:01:32 -07:00
unknown	1aee966523	Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-initstatus ... into qualinost.(none):/home/mtaylor/src/mysql/mysql-firsttwo	2007-04-12 11:00:54 -07:00
unknown	87a99ed780	Bug#27783 mysql_install_db should be able to install again, preserving 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.	2007-04-12 17:48:28 +02:00
unknown	f4c619baf0	Merge bk-internal:/home/bk/mysql-5.0-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	2007-04-12 14:56:52 +02:00
unknown	359594ccd2	Adding files to support building for debian. ... --- 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.	2007-04-11 16:13:09 -07:00
unknown	35c10cca21	Bug#27669 mysqldump: Got error: 2026: SSL connection error when trying to 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	2007-04-11 23:42:53 +02:00
unknown	15050080f1	Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	2007-04-11 22:08:19 +02:00
unknown	c6b0cff186	Bug#21765 Illegal Instruction crash on pre-pentium when using YASSL ... - Import patch with different method of detecting if machine has cpuid instruction extra/yassl/taocrypt/src/misc.cpp: Import patch yassl.diff	2007-04-11 22:07:24 +02:00
unknown	d25a540dca	Print warning to log when SSL setup fails	2007-04-11 21:38:43 +02:00
unknown	2b6cd45734	Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 ... 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	2007-04-11 21:03:29 +02:00
unknown	d032b0e56c	Add test for connect using different ssl ciphers ... mysql-test/r/openssl_1.result: Update result	2007-04-11 21:01:10 +02:00
unknown	561cd328a3	Add replace_result for things that are not tested	2007-04-11 09:06:27 +02:00
unknown	bfe25fb20c	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint mysql-test/r/mysqltest.result: Auto merged	2007-04-10 17:33:21 +02:00
unknown	247c3a81a1	Update result(which mysterioulsy got lost)	2007-04-10 17:33:04 +02:00
unknown	30606c38ca	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Auto merged	2007-04-10 17:17:08 +02:00
unknown	da43360e1f	Take into account wether vertical_results are in effect	2007-04-10 17:09:35 +02:00
unknown	3120134a0a	Init dying to 1 just after passing the guard	2007-04-10 17:06:36 +02:00
unknown	3f96702b06	Add OPT_LOG_DIR	2007-04-10 17:05:22 +02:00
unknown	4d324e0379	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	2007-04-10 15:03:22 +02:00
unknown	d76e2592a0	Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	2007-04-10 14:59:16 +02:00
unknown	76f5c73bc2	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1 ... into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint	2007-04-10 14:58:55 +02:00
unknown	06ed2ddce2	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint client/mysqltest.c: Manual merge	2007-04-10 14:46:57 +02:00
unknown	5565d32936	Add --logdir option ot mysqltest	2007-04-10 14:45:13 +02:00
unknown	4788e6dfe3	Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint ... 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	2007-04-10 14:29:22 +02:00
unknown	8163d5ec6e	Merge 192.168.0.4:mysql/mysql-4.1-maint ... 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	2007-04-10 13:51:32 +02:00
unknown	9f5e640d30	Give the "sync_slave_with_master" something to do	2007-04-10 12:19:00 +02:00
unknown	ca33c6673f	Merge bk-internal:/home/bk/mysql-5.0-maint ... into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint	2007-04-10 12:13:47 +02:00
unknown	d2667d1a6e	Merge bk@192.168.21.1:mysql-5.0-opt ... into mysql.com:/d2/hf/mrg/mysql-5.0-opt	2007-04-09 11:45:14 +05:00
unknown	6d9a796944	Merge bk@192.168.21.1:mysql-5.0 ... into mysql.com:/d2/hf/mrg/mysql-5.0-opt sql/sql_table.cc: Auto merged	2007-04-09 11:06:28 +05:00
unknown	ddaeead8fc	Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 ... into mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines sql/item_func.cc: Auto merged sql/sql_table.cc: Auto merged	2007-04-08 20:46:40 +02:00
unknown	1f8dbdaf3a	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt ... into moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql sql/sql_load.cc: Auto merged	2007-04-07 23:09:09 +04:00
unknown	a978d84cbc	Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt ... into mysql.com:/d2/hf/mrg/mysql-5.0-opt	2007-04-07 11:37:09 +05:00