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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Imported fixes from 4.1 and 5.0 to 4.0.	unknown	2005-10-25	2	-1/+5
\|
*	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2005-10-14	3	-0/+18
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into moonbone.local:/work/13855-bug-4.0-mysql
\| *	Fix bug #13855 select distinct with group by caused server crash	unknown	2005-10-14	3	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DISTINCT wasn't optimized away and caused creation of tmp table in wrong case. This result in integer overrun and running out of memory. Fix backported from 4.1. Now if optimizer founds that in result be only 1 row it removes distinct. sql/sql_select.cc: Fix bug #13855 select distinct with group by caused server crash mysql-test/r/select.result: Test case for bug#13855 select distinct with group by caused server crash mysql-test/t/select.test: Test case for bug#13855 select distinct with group by caused server crash
* \|	Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2005-10-13	1	-4/+11
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	into mysql.com:/space/my/mysql-4.0
\| *	- added a usermod call in the postinstall section of the RPM spec file	unknown	2005-10-13	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to assign a potential existing mysql user to the correct user group (BUG#12823) support-files/mysql.spec.sh: - added a usermod call to assign a potential existing mysql user to the correct user group (BUG#12823)
* \|	Merge bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2005-10-13	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/my/mysql-4.0
\| * \|	Review of new pushed code	unknown	2005-10-13	1	-2/+2
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- No need to check ref when ref is checked (Simple optimization fix) sql/item.cc: No need to check ref
* \|	Fix for bug #3874 (Group by field is not considered)	unknown	2005-10-13	3	-1/+58
\|/ \| \| \| \| \| \| \| \|	mysql-test/r/select.result: test result fixed mysql-test/t/select.test: test case added sql/sql_select.cc: do the same for nullable
*	memcpy_overlap() removed, as	unknown	2005-10-12	2	-11/+1
\| \| \| \| \| \| \| \| \| \| \| \|	1. it's wrong to use memcpy() for overlapped areas; 2. we use it only once. During merge to 4.1 will remove a memcpy_overlap() call from strings/ctype-tis620.c as well in order to fix bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64. myisam/mi_search.c: use memmove() instead, as memcpy_overlap() is removed.
*	Merge mysql.com:/space/my/mysql-4.0	unknown	2005-10-11	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/space/my/mysql-4.0-build
\| *	- added Docs/manual.chm to the windows source distribution (BUG#13899)	unknown	2005-10-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	scripts/make_win_src_distribution.sh: - added Docs/manual.chm to the windows source distribution (BUG#13899). The file is placed in there by the Bootstrap script, which pulls it from the mysqldoc repository
* \|	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2005-10-09	6	-1/+38
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	into moonbone.local:/work/7672-bug-4.0-mysql
\| *	Fix bug#7672 Unknown column error in order clause	unknown	2005-10-09	6	-1/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When fixing Item_func_plus in ORDER BY clause field c is searched in all opened tables, but because c is an alias it wasn't found there. This patch adds a flag to select_lex which allows Item_field::fix_fields() to look up in select's item_list to find aliased fields. sql/item.cc: Fix bug#7672 Unknown column error in order clause When fixing fields in ORDER BY clause allow Item_field::fix_fields() to look up items in select's item list to find aliased fields. sql/sql_lex.cc: Fix bug#7672 Unknown column error in order clause sql/sql_lex.h: Fix bug#7672 Unknown column error in order clause Added flag to select_lex allowing Item_field::fix_fields to look up items in select's item list. sql/sql_select.cc: Fix bug#7672 Unknown column error in order clause mysql-test/t/select.test: Test case for bug#7672 Unknown column error in order clause mysql-test/r/select.result: Test case for bug#7672 Unknown column error in order clause
* \|	InnoDB: Display an error message in /* */ comments	unknown	2005-10-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in SHOW CREATE TABLE if a temporary file cannot be created. (Bug #13002) sql/ha_innodb.cc: ha_innobase::get_foreign_key_create_info(): Display an error message to the user if a temporary file cannot be created.
* \|	Merge mysql.com:/home/mydev/mysql-4.0	unknown	2005-09-29	1	-1/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/mydev/mysql-4.0-4000
\| * \|	- fixed the removing of the RPM_BUILD_ROOT in the %clean section of the RPM	unknown	2005-09-29	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec file (the $RBR variable did not get expanded, thus leaving old build roots behind) support-files/mysql.spec.sh: - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the $RBR variable did not get expanded, thus leaving old build roots behind)
* \| \|	Bug#9112 - Merge table with composite index producing invalid results with ↵	unknown	2005-09-29	2	-4/+4
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some queries Second platform fix for floating point rounding.
* \|	Bug#9112 - Merge table with composite index producing invalid results with ↵	unknown	2005-09-27	2	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some queries Reduced the precision of the test numbers. Not all platforms could reproduce the exact numbers. mysql-test/r/merge.result: Bug#9112 - Merge table with composite index producing invalid results with some queries The new test result
* \|	Bug#9112 - Merge table with composite index producing invalid results with ↵	unknown	2005-09-23	7	-12/+92
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some queries The problem was an ab-use of last_rkey_length. Formerly we saved the packed key length (of the search key) in this element. But in certain cases it got replaced by the (packed) result key length. Now we use a new element of MI_INFO to save the packed key length of the search key. myisam/mi_dbug.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Fixed the recognition of NULL values in _mi_print_key(). myisam/mi_rkey.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Saved the packed key length in a new element of MI_INFO. myisam/mi_search.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Added a comment and trace prints. myisam/myisamdef.h: Bug#9112 - Merge table with composite index producing invalid results with some queries Added a new element to store the packed key length for use by the MyISAMMRG engine. myisammrg/myrg_rkey.c: Bug#9112 - Merge table with composite index producing invalid results with some queries Changed to use the new element of MI_INFO to get at the packed key length. mysql-test/r/merge.result: Bug#9112 - Merge table with composite index producing invalid results with some queries The test result. mysql-test/t/merge.test: Bug#9112 - Merge table with composite index producing invalid results with some queries The test case.
*	Fixed Bug#13275 mysqltest empty file bug	unknown	2005-09-19	1	-11/+31
\|
*	.del-which.2~463417adb2e37122:	unknown	2005-09-18	1	-54/+0
\| \| \| \| \| \| \| \|	Delete: man/which.2 BitKeeper/deleted/.del-which.2~463417adb2e37122: Delete: man/which.2
*	Turn off EOLN_NATIVE flag for all test files	unknown	2005-09-15	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignored some generated files mysql-test/t/analyze.test: Turn off EOLN_NATIVE flag mysql-test/t/ansi-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/ansi.test: Turn off EOLN_NATIVE flag mysql-test/t/backup-master.sh: Turn off EOLN_NATIVE flag mysql-test/t/bdb-alter-table-2-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/bdb-deadlock.test: Turn off EOLN_NATIVE flag mysql-test/t/bdb_cache-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/bdb_cache.test: Turn off EOLN_NATIVE flag mysql-test/t/bool.test: Turn off EOLN_NATIVE flag mysql-test/t/cast.test: Turn off EOLN_NATIVE flag mysql-test/t/constraints.test: Turn off EOLN_NATIVE flag mysql-test/t/convert.test: Turn off EOLN_NATIVE flag mysql-test/t/create_select_tmp.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_cp1251-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/ctype_cp1251.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_latin1_de-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/ctype_latin1_de.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_tis620-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/ctype_tis620.test: Turn off EOLN_NATIVE flag mysql-test/t/ctype_ujis-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/ctype_ujis.test: Turn off EOLN_NATIVE flag mysql-test/t/drop_temp_table.test: Turn off EOLN_NATIVE flag mysql-test/t/flush_block_commit.test: Turn off EOLN_NATIVE flag mysql-test/t/func_concat.test: Turn off EOLN_NATIVE flag mysql-test/t/func_encrypt-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/func_if.test: Turn off EOLN_NATIVE flag mysql-test/t/func_isnull.test: Turn off EOLN_NATIVE flag mysql-test/t/gcc296.test: Turn off EOLN_NATIVE flag mysql-test/t/grant.test: Turn off EOLN_NATIVE flag mysql-test/t/grant_cache-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/grant_cache.test: Turn off EOLN_NATIVE flag mysql-test/t/init_file-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/init_file.test: Turn off EOLN_NATIVE flag mysql-test/t/innodb-deadlock.test: Turn off EOLN_NATIVE flag mysql-test/t/innodb-lock.test: Turn off EOLN_NATIVE flag mysql-test/t/innodb_cache-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/innodb_cache.test: Turn off EOLN_NATIVE flag mysql-test/t/innodb_handler.test: Turn off EOLN_NATIVE flag mysql-test/t/isam.test: Turn off EOLN_NATIVE flag mysql-test/t/loaddata.test: Turn off EOLN_NATIVE flag mysql-test/t/lock_multi.test: Turn off EOLN_NATIVE flag mysql-test/t/lock_tables_lost_commit-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/lock_tables_lost_commit.test: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table.test: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table2.test: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table3-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/lowercase_table3.test: Turn off EOLN_NATIVE flag mysql-test/t/mix_innodb_myisam_binlog-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/mix_innodb_myisam_binlog.test: Turn off EOLN_NATIVE flag mysql-test/t/multi_update-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/myisam-blob-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/myisam-blob.test: Turn off EOLN_NATIVE flag mysql-test/t/mysqlbinlog-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/mysqlbinlog.test: Turn off EOLN_NATIVE flag mysql-test/t/mysqldump.test: Turn off EOLN_NATIVE flag mysql-test/t/packet.test: Turn off EOLN_NATIVE flag mysql-test/t/query_cache.test: Turn off EOLN_NATIVE flag mysql-test/t/query_cache_merge.test: Turn off EOLN_NATIVE flag mysql-test/t/query_cache_notembedded.test: Turn off EOLN_NATIVE flag mysql-test/t/repair.test: Turn off EOLN_NATIVE flag mysql-test/t/repair_part2-master.sh: Turn off EOLN_NATIVE flag mysql-test/t/repair_part2.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl000016-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_EE_error.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_alter.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_chain_temp_table.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_change_master.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_commit_after_flush.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_do_grant.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_drop.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_empty_master_crash.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_error_ignored_table-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_error_ignored_table.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_failsafe.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop-master.sh: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop-slave.sh: Turn off EOLN_NATIVE flag mysql-test/t/rpl_flush_log_loop.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_free_items-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_free_items.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_get_lock.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_heap.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_ignore_grant-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_ignore_grant.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_insert_id.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata_rule_m-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata_rule_m.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata_rule_s-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddata_rule_s.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_loaddatalocal.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_log-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_log-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_master_pos_wait.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_max_relay_size.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_delete-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_delete.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_delete2-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_delete2.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_update.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_update2-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_multi_update2.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_optimize.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_relayspace-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_relayspace.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_reset_slave.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_server_id1.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_server_id2-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_server_id2.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_set_charset.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_skip_error-slave.opt: Turn off EOLN_NATIVE flag mysql-test/t/rpl_skip_error.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_start_stop_slave.test: Turn off EOLN_NATIVE flag mysql-test/t/rpl_trunc_binlog.test: Turn off EOLN_NATIVE flag mysql-test/t/system_mysql_db.test: Turn off EOLN_NATIVE flag mysql-test/t/system_mysql_db_fix-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/system_mysql_db_fix.test: Turn off EOLN_NATIVE flag mysql-test/t/system_mysql_db_refs.test: Turn off EOLN_NATIVE flag mysql-test/t/timezone-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/timezone.test: Turn off EOLN_NATIVE flag mysql-test/t/timezone3-master.opt: Turn off EOLN_NATIVE flag mysql-test/t/timezone3.test: Turn off EOLN_NATIVE flag mysql-test/t/type_set.test: Turn off EOLN_NATIVE flag mysql-test/t/variables-master.opt: Turn off EOLN_NATIVE flag BitKeeper/etc/ignore: added support-files/MacOSX/preflight
*	Bug#12920 - key_read_requests counter appears to re-set	unknown	2005-09-14	5	-20/+25
\| \| \| \| \| \| \|	Enlarged the counter variables to ulonglong.
*	Bug#12845 - Stress test: Server crashes on CREATE .. SELECT statement	unknown	2005-09-13	1	-0/+7
\| \| \| \| \| \| \| \| \| \|	Solution for 4.0 and 4.1. If the caller cannot re-open table(s), it gives a NULL 'refresh' argument to open_table(). We used to ignore flushes then. Now we ignore drops too.
*	Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0	unknown	2005-09-12	1	-41/+24
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into kite-hub.kitebird.com:/tmp/merge-4.0
\| *	README:	unknown	2005-09-12	1	-41/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README (2nd try) README: Update README (2nd try)
* \|	Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2005-09-08	2	-7/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/M40/mysql-4.0 configure.in: Auto merged
\| * \	Merge mysql.com:/M40/clone-4.0 into mysql.com:/M40/upward-4.0	unknown	2005-09-08	2	-7/+15
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure.in: Auto merged include/my_global.h: Auto merged
\| \| * \|	my_global.h:	unknown	2005-09-02	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Back port of QNX work around for rint() include/my_global.h: Back port of QNX work around for rint()
\| \| * \|	configure.in:	unknown	2005-09-02	1	-7/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Back port of code to find the right 'ps' settings configure.in: Back port of code to find the right 'ps' settings
* \| \| \|	configure.in:	unknown	2005-09-08	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Flag -DHAVE_DARWIN_THREADS not needed for darwin9 configure.in: Flag -DHAVE_DARWIN_THREADS not needed for darwin9
* \| \| \|	Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2005-09-08	7	-2/+29
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/hartmut/projects/mysql/dev/4.0
\| * \| \|	Fixes a problem with patch 1.2140, that prevented libmysqld	unknown	2005-09-06	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to be built successfully. libmysqld/lib_vio.c: Added a copy of vio_was_interrupted() from viosocket.c, for successful build of libmysqld that uses own set of vio*() functions.
\| * \| \|	Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2005-09-06	6	-2/+20
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into selena.:H:/MYSQL/src/#05588-mysql-4.0
\| \| * \| \|	Fixes bug #5588. vio_was_interrupted() function was added to detect	unknown	2005-08-30	6	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	read timeout properly on win32. include/my_global.h: Added win32 specific socket timeout error code. include/violite.h: Added vio_was_interrupted function that returns true if operation was not completed due to timeout. sql/mini_client.cc: added a check that replication read was not completed due to timeout. sql/net_serv.cc: net->last_errno should be equal to ER_NET_READ_INTERRUPTED in case if read operation was not completed due to timeout. vio/vio.c: added initialization code for vio_was_interrupted() function. vio/viosocket.c: Added vio_was_interrupted function that returns true if operation was not completed due to timeout.
* \| \| \| \|	fix for BUG#12958 : mysqlimport with -L option crashing on HP-UX	unknown	2005-09-02	1	-1/+2
\|/ / / /
* \| \| \|	Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M40/mysql-4.0	unknown	2005-09-01	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Add "MYSQL_BASE_VERSION" to the list of substituted variables in the ↵	unknown	2005-09-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"scripts" subdirectory. scripts/Makefile.am: Add "MYSQL_BASE_VERSION" to the list of substituted variables, for later (possible) use in "mysql_install_db" and "mysqld_safe".
* \| \| \| \|	Clone of 4.0.26 is taken, increase version number.	unknown	2005-08-31	1	-1/+1
\| \|_\|/ / \|/\| \| \|
* \| \| \|	fulltext_var.result:	unknown	2005-08-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update test result. mysql-test/r/fulltext_var.result: Update test result.
* \| \| \|	set_var.cc:	unknown	2005-08-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorder out-of-order system variables. sql/set_var.cc: Reorder out-of-order system variables.
* \| \| \|	Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2005-08-29	1	-3/+10
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
\| * \| \|	Makefile.am:	unknown	2005-08-28	1	-3/+10
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make ports configurable from environment for test Makefile.am: Make ports configurable from environment for test
* \| \|	Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0	unknown	2005-08-27	2	-41/+41
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0 sql/mysqld.cc: Auto merged
\| * \|	mysqld.cc:	unknown	2005-08-27	1	-26/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorder out-of-order status variables. sql/mysqld.cc: Reorder out-of-order status variables.
\| * \|	set_var.cc:	unknown	2005-08-27	1	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorder out-of-order system variables. sql/set_var.cc: Reorder out-of-order system variables.
* \| \|	Several fixes for Netware.	unknown	2005-08-24	30	-18/+151
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	client/client_priv.h: Added option auto close for Netware. client/mysql.cc: Added option auto close for Netware. client/mysqladmin.c: Added option auto close for Netware. client/mysqlbinlog.cc: Added option auto close for Netware. client/mysqlcheck.c: Added option auto close for Netware. client/mysqldump.c: Added option auto close for Netware. client/mysqlimport.c: Added option auto close for Netware. client/mysqlshow.c: Added option auto close for Netware. client/mysqltest.c: Fixed help messages for Netware. extra/my_print_defaults.c: Fixed help messages for Netware. extra/perror.c: Fixed help messages for Netware. extra/resolve_stack_dump.c: Fixed help messages for Netware. include/help_end.h: Fixed help messages for Netware. include/help_start.h: Fixed help messages for Netware. isam/isamchk.c: Added auto close of window for Netware isam/pack_isam.c: Added auto close of window for Netware myisam/myisamchk.c: Added auto close of window for Netware myisam/myisamlog.c: Added help for Netware. myisam/myisampack.c: Added auto close for Netware. netware/myisamchk.def: Scrollable screen patch. netware/mysql.def: Scrollable screen patch. netware/mysql_test_run.c: Fixed strindex for Netware. netware/mysqladmin.def: Scrollable screen patch. netware/mysqlbinlog.def: Scrollable screen patch. netware/mysqlcheck.def: Scrollable screen patch. netware/mysqld_safe.c: Removed debug message for Netware. netware/mysqldump.def: Scrollable screen patch. netware/mysqlimport.def: Scrollable screen patch. netware/mysqlshow.def: Scrollable screen patch. sql/mysqld.cc: Abnormal end patch when shutting down and volume not ready.
* \|	ha_innodb.cc:	unknown	2005-08-24	1	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain sql/ha_innodb.cc: Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
* \|	Some minor fixes for Netware. These were required after we started building	unknown	2005-08-18	3	-7/+14
\|/ \| \| \| \| \| \| \| \| \| \| \|	against a later version of libc. include/config-netware.h: Changes for Netware. Needed to build against newer libc. netware/BUILD/nwbootstrap: Fix to build script. sql/mysqld.cc: Added an include.
*	Merge mysql.com:/space/my/mysql-4.0	unknown	2005-08-12	4	-7/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/space/my/mysql-4.0-merge