delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge rurik.mysql.com:/home/igor/tmp_merge	unknown	2006-05-31	2	-2/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211: Auto merged BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019: Auto merged mysql-test/r/explain.result: Auto merged mysql-test/r/key_cache.result: Auto merged mysql-test/r/preload.result: Auto merged mysql-test/t/explain.test: Auto merged mysql-test/t/select.test: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/sql_base.cc: Auto merged BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16: Manual merge BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72: Manual merge BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72: Manual merge BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9: Manual merge BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1: Manual merge BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e: Manual merge BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89: Manual merge BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c: Manual merge BitKeeper/deleted/.del-errmsg.txt~898865062c970766: Manual merge BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4: Manual merge BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d: Manual merge BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1: Manual merge BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0: Manual merge BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06: Manual merge BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a: Manual merge BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795: Manual merge BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c: Manual merge BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23: Manual merge BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7: Manual merge BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84: Manual merge BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964: Manual merge BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e: Manual merge BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150: Manual merge BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7: Manual merge
\| *	make_win_src_distribution.sh:	unknown	2006-05-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert to DOS EOL if dsp/dsw is in package scripts/make_win_src_distribution.sh: Convert to DOS EOL if dsp/dsw is in package
\| *	make_sharedlib_distribution.sh:	unknown	2006-05-23	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Solaris sh don't like {..} in file matching scripts/make_sharedlib_distribution.sh: Solaris sh don't like {..} in file matching
* \|	Merge	unknown	2006-04-03	1	-1/+2
\|\ \ \| \|/ \| \| \| \| \| \|	scripts/mysql_install_db.sh: Auto merged
\| *	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0	unknown	2006-04-03	1	-1/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new scripts/mysql_install_db.sh: Auto merged
\| \| *	mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:	unknown	2006-04-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed web address order.mysql.com to shop.mysql.com netware/mysql_install_db.c: Changed web address order.mysql.com to shop.mysql.com Docs/MySQLEULA.txt: Changed web address order.mysql.com to shop.mysql.com scripts/mysql_install_db.sh: Changed web address order.mysql.com to shop.mysql.com
\| * \|	mysqld_safe.sh:	unknown	2006-03-29	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added --help option, bug#16392 acinclude.m4: Use "$shrext_cmds" when testing if shared library exists, bug#16332 acinclude.m4: Use "$shrext_cmds" when testing if shared library exists, bug#16332 scripts/mysqld_safe.sh: Added --help option, bug#16392
* \| \|	Merge	unknown	2006-03-29	1	-1/+6
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \|	sql/field.cc: Auto merged
\| * \|	mysql_config.sh:	unknown	2006-03-29	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If installed, search built in lib path first, bug#13158 scripts/mysql_config.sh: If installed, search built in lib path first, bug#13158
* \| \|	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new	unknown	2006-03-27	1	-1/+1
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
\| * \|	mysql_config.sh:	unknown	2006-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Solaris -xc99=none C option as C++ compiler can't handle it scripts/mysql_config.sh: Remove Solaris -xc99=none C option as C++ compiler can't handle it
* \| \|	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new	unknown	2006-03-27	1	-8/+19
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
\| * \|	mysql_config.sh:	unknown	2006-03-27	1	-8/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322 scripts/mysql_config.sh: We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
\| * \|	Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1	unknown	2006-03-02	1	-1/+1
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \|	scripts/make_binary_distribution.sh: Auto merged
* \| \|	Fixes to embedded server to be able to run tests with it	unknown	2006-02-24	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Needed for "list of pushes" web page and autopush) include/mysql.h: Fix to embedded server to be able to run tests on it libmysql/libmysql.c: Fix to embedded server to be able to run tests on it libmysqld/emb_qcache.cc: Fix to embedded server to be able to run tests on it libmysqld/embedded_priv.h: Fix to embedded server to be able to run tests on it libmysqld/lib_sql.cc: Fix to embedded server to be able to run tests on it libmysqld/libmysqld.c: Fix to embedded server to be able to run tests on it mysql-test/mysql-test-run.sh: Fix to embedded server to be able to run tests on it mysql-test/r/binlog.result: Updated test for embedded server mysql-test/r/ctype_cp932.result: Updated test for embedded server mysql-test/r/innodb.result: Updated test for embedded server mysql-test/r/mysqltest.result: Updated test for embedded server mysql-test/r/query_cache.result: Updated test for embedded server mysql-test/r/query_cache_notembedded.result: Updated test for embedded server mysql-test/r/sp-error.result: Updated test for embedded server mysql-test/r/sp.result: Updated test for embedded server mysql-test/r/subselect.result: Updated test for embedded server mysql-test/r/view.result: Updated test for embedded server mysql-test/r/view_grant.result: Updated test for embedded server mysql-test/t/backup.test: Updated test for embedded server mysql-test/t/binlog.test: Updated test for embedded server mysql-test/t/blackhole.test: Updated test for embedded server mysql-test/t/compress.test: Updated test for embedded server mysql-test/t/ctype_cp932.test: Updated test for embedded server mysql-test/t/delayed.test: Updated test for embedded server mysql-test/t/handler.test: Updated test for embedded server mysql-test/t/innodb.test: Updated test for embedded server mysql-test/t/mysql.test: Updated test for embedded server mysql-test/t/mysql_client_test.test: Updated test for embedded server mysql-test/t/mysqltest.test: Updated test for embedded server mysql-test/t/query_cache.test: Updated test for embedded server mysql-test/t/query_cache_notembedded.test: Updated test for embedded server mysql-test/t/read_only.test: Updated test for embedded server mysql-test/t/skip_grants.test: Updated test for embedded server mysql-test/t/sp-destruct.test: Updated test for embedded server mysql-test/t/sp-error.test: Updated test for embedded server mysql-test/t/sp-threads.test: Updated test for embedded server mysql-test/t/sp.test: Updated test for embedded server mysql-test/t/subselect.test: Updated test for embedded server mysql-test/t/temp_table.test: Updated test for embedded server mysql-test/t/view.test: Updated test for embedded server mysql-test/t/view_grant.test: Updated test for embedded server mysql-test/t/wait_timeout.test: Updated test for embedded server mysys/mf_dirname.c: Review fix: Don't access data outside of array mysys/my_bitmap.c: Remove compiler warnings scripts/mysql_fix_privilege_tables.sql: Add flush privileges to .sql script so that one doesn't have to reboot mysqld when one runs the mysql_fix_privilege_script sql-common/client.c: Updated test for embedded server sql/item.cc: Remove DBUG_PRINT statement that can cause crashes when running with --debug sql/mysqld.cc: Fix to embedded server to be able to run tests on it sql/protocol.cc: Fix to embedded server to be able to run tests on it (Trivial reconstruction of code) sql/protocol.h: Fix to embedded server to be able to run tests on it sql/sql_base.cc: Better comment sql/sql_class.cc: Fix to embedded server to be able to run tests on it sql/sql_class.h: Fix to embedded server to be able to run tests on it sql/sql_cursor.cc: Fix to embedded server to be able to run tests on it sql/sql_parse.cc: Fix to embedded server to be able to run tests on it Don't crash for disabled commands when using embedded server sql/sql_prepare.cc: Fix to embedded server to be able to run tests on it mysql-test/r/ctype_cp932_notembedded.result: New BitKeeper file ``mysql-test/r/ctype_cp932_notembedded.result'' mysql-test/r/innodb_notembedded.result: New BitKeeper file ``mysql-test/r/innodb_notembedded.result'' mysql-test/r/sp.result.orig: New BitKeeper file ``mysql-test/r/sp.result.orig'' mysql-test/r/sp_notembedded.result: New BitKeeper file ``mysql-test/r/sp_notembedded.result'' mysql-test/r/subselect_notembedded.result: New BitKeeper file ``mysql-test/r/subselect_notembedded.result'' mysql-test/t/ctype_cp932_notembedded.test: New BitKeeper file ``mysql-test/t/ctype_cp932_notembedded.test'' mysql-test/t/innodb_notembedded.test: New BitKeeper file ``mysql-test/t/innodb_notembedded.test'' mysql-test/t/sp.test.orig: New BitKeeper file ``mysql-test/t/sp.test.orig'' mysql-test/t/sp_notembedded.test: New BitKeeper file ``mysql-test/t/sp_notembedded.test'' mysql-test/t/subselect_notembedded.test: New BitKeeper file ``mysql-test/t/subselect_notembedded.test''
* \| \|	Messgges corrected in mysql_upgrade script	unknown	2006-02-20	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scripts/mysql_upgrade.sh: messages corrected
* \| \|	--help option added to mysql_upgrade script	unknown	2006-02-18	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scripts/mysql_upgrade.sh: --help option implemented
* \| \|	WL#2645 (CHECK TABLE FOR UPGRADE)	unknown	2006-02-17	2	-0/+188
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	necessary implementation in the server mysql_upgrade script added client/mysqlcheck.c: --check-upgrade option added include/my_base.h: errcode added include/myisam.h: option added scripts/Makefile.am: mysql_upgrade script added sql/handler.cc: checks for old types/bugs added sql/handler.h: declarations regarding checks for upgrade sql/lex.h: sym added sql/share/errmsg.txt: error message added sql/slave.cc: now ha_repair is for public use sql/sql_table.cc: upgrade in ha_repair implemented sql/sql_yacc.yy: CHECK ... FOR UPGRADE added to syntax
* \| \|	Merge	unknown	2006-02-12	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/spatial.cc: Auto merged
\| * \ \	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0	unknown	2006-02-12	1	-1/+1
\| \|\ \ \ \| \| \|/ / \| \|/\| / \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-4.1 scripts/make_binary_distribution.sh: Auto merged
\| \| *	make_binary_distribution.sh:	unknown	2006-02-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	print => echo in shell script scripts/make_binary_distribution.sh: print => echo in shell script
* \| \|	Manual merge of the fix for bug#16106.	unknown	2006-01-16	1	-3/+0
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently failing tests (for me) in non-debug build: blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi scripts/mysqld_multi.sh: Auto merged extra/comp_err.c: Manual merge: From 4.1 to 5.0, the license line was moved to a different place.
\| * \|	Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1	unknown	2006-01-13	1	-3/+0
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	extra/comp_err.c: Auto merged scripts/mysqld_multi.sh: Auto merged
\| \| *	extra/comp_err.c + scripts/mysqld_multi.sh :	unknown	2006-01-13	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copyright string fixes (bug#16106) extra/comp_err.c: Ensure that the license spelling is as expected by the "mysql_copyright" tool. (bug#16106) scripts/mysqld_multi.sh: The "mysql_copyright" tool will not change non-C files, so do not mention the license. (bug#16106)
\| * \|	Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-12-15	1	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-4.1
* \| \ \	Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release	unknown	2005-12-14	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-5.0 mysql-test/r/skip_name_resolve.result: Auto merged mysql-test/t/skip_name_resolve.test: Auto merged sql/sp_head.cc: Auto merged
\| * \ \ \	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1	unknown	2005-12-11	1	-2/+2
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release scripts/make_win_src_distribution.sh: Auto merged
\| \| * \| \|	make_win_src_distribution.sh:	unknown	2005-12-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed Visual Studio 6 project files, as they are not maintained scripts/make_win_src_distribution.sh: Removed Visual Studio 6 project files, as they are not maintained
* \| \| \| \|	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1	unknown	2005-12-13	1	-0/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| / / \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 netware/libmysql.def: Auto merged netware/myisamlog.def: Auto merged netware/myisampack.def: Auto merged netware/mysql.def: Auto merged netware/mysql_install_db.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqld_safe.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/perror.def: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/tztime.cc: Auto merged netware/BUILD/compile-linux-tools: Merged from 4.1 netware/my_print_defaults.def: Merged from 4.1 netware/mysqladmin.def: Merged from 4.1
\| * \| \|	Minor Netware specific changes.	unknown	2005-12-13	1	-0/+4
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	netware/BUILD/compile-linux-tools: Fixed compilation problem with Linux tools. scripts/make_binary_distribution.sh: Netware specific changes. Discard platform specific files and added a couple of missing files. sql/tztime.cc: Code not ported to Netware yet.
\| * \|	Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-11-19	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck configure.in: Auto merged
* \| \ \	Merge mysql.com:/home/jimw/my/mysql-5.0-14610	unknown	2005-11-30	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean
\| * \| \| \|	Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610)	unknown	2005-11-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scripts/mysqlhotcopy.sh: Skip INFORMATION_SCHEMA when matching database names against regex.
* \| \| \| \|	Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-11-19	1	-1/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck configure.in: Auto merged
\| * \| \| \|	Merge	unknown	2005-11-04	1	-1/+2
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makefile.am: Auto merged client/Makefile.am: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged support-files/Makefile.am: Auto merged
\| \| * \| \|	Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-11-04	1	-2/+3
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck Makefile.am: Auto merged configure.in: Auto merged mysql-test/Makefile.am: Auto merged
\| \| \| * \| \|	Makefile.am, configure.in:	unknown	2005-09-24	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable "make distcheck" to work configure.in: Enable "make distcheck" to work Docs/Makefile.am: Enable "make distcheck" to work Makefile.am: Enable "make distcheck" to work client/Makefile.am: Enable "make distcheck" to work cmd-line-utils/libedit/Makefile.am: Enable "make distcheck" to work include/Makefile.am: Enable "make distcheck" to work libmysql/Makefile.am: Enable "make distcheck" to work libmysql_r/Makefile.am: Enable "make distcheck" to work libmysqld/Makefile.am: Enable "make distcheck" to work libmysqld/examples/Makefile.am: Enable "make distcheck" to work mysql-test/Makefile.am: Enable "make distcheck" to work ndb/docs/Makefile.am: Enable "make distcheck" to work netware/Makefile.am: Enable "make distcheck" to work pstack/Makefile.am: Enable "make distcheck" to work scripts/Makefile.am: Enable "make distcheck" to work sql-bench/Makefile.am: Enable "make distcheck" to work sql/Makefile.am: Enable "make distcheck" to work sql/share/Makefile.am: Enable "make distcheck" to work support-files/Makefile.am: Enable "make distcheck" to work
* \| \| \| \| \|	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	unknown	2005-11-10	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| / / \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean scripts/mysql_fix_privilege_tables.sql: Auto merged
\| * \| \| \|	Merge mysql.com:/home/jimw/my/mysql-4.1-14469	unknown	2005-11-10	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-4.1-clean
\| \| * \| \|	Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469)	unknown	2005-10-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scripts/mysql_fix_privilege_tables.sql: Remove extra leading - in comment
* \| \| \| \|	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	unknown	2005-11-01	1	-8/+11
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-5.0-clean scripts/mysqld_safe.sh: Auto merged
\| * \| \| \|	Handle decision to use mysqld-max over mysqld within mysqld_safe	unknown	2005-10-31	1	-8/+11
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	even when --ledir option is specified. (Bug #13774) scripts/mysqld_safe.sh: Figure out whether to use mysqld or mysqld-max after we have handled the command-line options and .cnf files.
* \| \| \|	thread_registry.h, thread_registry.cc:	unknown	2005-10-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add explicit Thread_info::Thread_info() and move both initializers out of class definition, to solve link problem on QNX Makefile.am: Preserve executable mode on scripts make_binary_distribution.sh: Copy .imtest files scripts/make_binary_distribution.sh: Copy .imtest files mysql-test/Makefile.am: Preserve executable mode on scripts server-tools/instance-manager/thread_registry.cc: Add explicit Thread_info::Thread_info() and move both initializers out of class definition, to solve link problem on QNX server-tools/instance-manager/thread_registry.h: Add explicit Thread_info::Thread_info() and move both initializers out of class definition, to solve link problem on QNX
* \| \| \|	Small fixes for Netware.	unknown	2005-10-14	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	netware/mysql_test_run.c: Fixed typo. netware/pack_isam.def: Added screenname. scripts/make_binary_distribution.sh: Fixed mistake in merge.
* \| \| \|	Merge abarkov@bk-internal:/home/bk/mysql-5.0	unknown	2005-10-13	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/home/bar/mysql-5.0.b9278 mysql-test/t/cast.test: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-tis620.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/select.result: Auto merged
\| * \ \ \	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp	unknown	2005-10-13	1	-0/+4
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 configure.in: Auto merged include/config-win.h: Auto merged include/m_string.h: Auto merged include/my_pthread.h: Auto merged myisam/mi_search.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/select.test: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged netware/pack_isam.def: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-tis620.c: Auto merged strings/xml.c: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged mysql-test/r/select.result: Merged from 4.1. netware/BUILD/mwenv: Merged from 4.1. scripts/make_binary_distribution.sh: Merged from 4.1. sql/mysqld.cc: Merged from 4.1. sql/sql_show.cc: Merged from 4.1. strings/my_strtoll10.c: Merged from 4.1.
\| \| * \| \|	Some Netware related fixes and fixes for Metrowerks compiler.	unknown	2005-10-13	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	netware/BUILD/mwenv: Removed -O3 for Metrowerks compiler. netware/pack_isam.def: NetWare specific change, Added SCRENNAME for pack_isam. scripts/make_binary_distribution.sh: Netware specific change for creating help tables. strings/my_strtoll10.c: Fix for Metrowerks compiler.
* \| \| \| \|	Merge abarkov@bk-internal:/home/bk/mysql-5.0	unknown	2005-10-13	2	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/usr/home/bar/mysql-5.0.b9278 mysql-test/r/alter_table.result: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/federated.test: Auto merged
\| * \| \| \|	type_binary.result, type_binary.test:	unknown	2005-10-13	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	new file mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. Many files: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. Adding true BINARY/VARBINARY: new pad_char structure member. ctype-bin.c: Adding true BINARY/VARBINARY: new pad_char structure member. New strnxfrm, with two trailing length bytes. field.cc: Adding true BINARY/VARBINARY. sql/field.cc: Adding true BINARY/VARBINARY. strings/ctype-big5.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-bin.c: Adding true BINARY/VARBINARY: new pad_char structure member. New strnxfrm, with two trailing length bytes. strings/ctype-cp932.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-czech.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-euc_kr.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-eucjpms.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-extra.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-gb2312.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-gbk.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-latin1.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-simple.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-sjis.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-tis620.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-uca.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-ucs2.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-ujis.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-utf8.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-win1250ch.c: Adding true BINARY/VARBINARY: new pad_char structure member. include/m_ctype.h: Adding true BINARY/VARBINARY: new pad_char structure member. mysql-test/t/alter_table.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/binary.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/cast.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ctype_cp1251.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ctype_many.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/federated.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/func_in.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ndb_condition_pushdown.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ndb_types.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/sp.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/type_blob.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/alter_table.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/binary.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/cast.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ctype_cp1251.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ctype_many.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/federated.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/func_in.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ndb_condition_pushdown.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ndb_types.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/sp.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/system_mysql_db.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/type_blob.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. scripts/mysql_create_system_tables.sh: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. scripts/mysql_fix_privilege_tables.sql: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
* \| \| \| \|	make_binary_distribution.sh:	unknown	2005-10-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copy .cnf files in mysql-test/std_data/ Makefile.am: Added std_data/.cnf to copy ndb config mysql-test/Makefile.am: Added std_data/.cnf to copy ndb config scripts/make_binary_distribution.sh: Copy .cnf files in mysql-test/std_data/