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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge mysql.com:/home/jimw/my/mysql-4.1-12723	unknown	2005-09-15	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-4.1-clean vio/viosocket.c: Auto merged
\| *	Fix shared memory connection handling on Windows. (Bug #12723)	unknown	2005-08-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	vio/viosocket.c: Don't pay attention to changes of nonblocking flag for shared memory connections.
* \|	Turn off EOLN_NATIVE flag of some test files	unknown	2005-09-15	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/analyze.result: Turn off EOLN_NATIVE flag mysql-test/r/create_select_tmp.result: Turn off EOLN_NATIVE flag mysql-test/r/flush_block_commit.result: Turn off EOLN_NATIVE flag mysql-test/r/flush_table.result: Turn off EOLN_NATIVE flag mysql-test/r/have_moscow_leap_timezone.require: Turn off EOLN_NATIVE flag mysql-test/r/have_outfile.require: Turn off EOLN_NATIVE flag mysql-test/r/innodb-lock.result: Turn off EOLN_NATIVE flag mysql-test/r/lock_multi.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_commit_after_flush.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_drop.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_free_items.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_multi_delete2.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_multi_update.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_multi_update2.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_server_id1.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_server_id2.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_set_charset.result: Turn off EOLN_NATIVE flag mysql-test/r/rpl_start_stop_slave.result: Turn off EOLN_NATIVE flag mysql-test/r/timezone3.result: Turn off EOLN_NATIVE flag
* \|	Merge mysql.com:/home/my/mysql-4.0	unknown	2005-09-15	1	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/my/mysql-4.1 BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106: Auto merged BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14: Auto merged BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838: Auto merged BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72: Auto merged BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2: Auto merged BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585: Auto merged BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001: Auto merged BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9: Auto merged BitKeeper/deleted/.del-query_cache_notembedded.test: Auto merged BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87: Auto merged mysql-test/t/analyze.test: Auto merged mysql-test/t/ansi.test: Auto merged mysql-test/t/backup-master.sh: Auto merged mysql-test/t/bdb-alter-table-2-master.opt: Auto merged mysql-test/t/bdb-deadlock.test: Auto merged mysql-test/t/bdb_cache-master.opt: Auto merged mysql-test/t/bdb_cache.test: Auto merged mysql-test/t/bool.test: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/constraints.test: Auto merged mysql-test/t/create_select_tmp.test: Auto merged mysql-test/t/ctype_cp1251.test: Auto merged mysql-test/t/ctype_latin1_de-master.opt: Auto merged mysql-test/t/ctype_latin1_de.test: Auto merged mysql-test/t/ctype_tis620.test: Auto merged mysql-test/t/ctype_ujis.test: Auto merged mysql-test/t/drop_temp_table.test: Auto merged mysql-test/t/func_concat.test: Auto merged mysql-test/t/func_encrypt-master.opt: Auto merged mysql-test/t/flush_block_commit.test: Auto merged mysql-test/t/func_if.test: Auto merged mysql-test/t/func_isnull.test: Auto merged mysql-test/t/gcc296.test: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/grant_cache.test: Auto merged mysql-test/t/init_file-master.opt: Auto merged mysql-test/t/init_file.test: Auto merged mysql-test/t/innodb-deadlock.test: Auto merged mysql-test/t/innodb-lock.test: Auto merged mysql-test/t/innodb_cache-master.opt: Auto merged mysql-test/t/innodb_cache.test: Auto merged mysql-test/t/innodb_handler.test: Auto merged mysql-test/t/isam.test: Auto merged mysql-test/t/loaddata.test: Auto merged mysql-test/t/lock_tables_lost_commit-master.opt: Auto merged mysql-test/t/lock_tables_lost_commit.test: Auto merged mysql-test/t/lowercase_table-master.opt: Auto merged mysql-test/t/lowercase_table.test: Auto merged mysql-test/t/lowercase_table2.test: Auto merged mysql-test/t/lowercase_table3-master.opt: Auto merged mysql-test/t/lowercase_table3.test: Auto merged mysql-test/t/mix_innodb_myisam_binlog.test: Auto merged mysql-test/t/multi_update-master.opt: Auto merged mysql-test/t/lock_multi.test: Auto merged mysql-test/t/myisam-blob-master.opt: Auto merged mysql-test/t/myisam-blob.test: Auto merged mysql-test/t/mysqlbinlog-master.opt: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/packet.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/query_cache_merge.test: Auto merged mysql-test/t/repair.test: Auto merged mysql-test/t/rpl_EE_error.test: Auto merged mysql-test/t/rpl_alter.test: Auto merged mysql-test/t/rpl_chain_temp_table.test: Auto merged mysql-test/t/rpl_change_master.test: Auto merged mysql-test/t/rpl_do_grant.test: Auto merged mysql-test/t/rpl_empty_master_crash.test: Auto merged mysql-test/t/rpl_error_ignored_table-slave.opt: Auto merged mysql-test/t/rpl_commit_after_flush.test: Auto merged mysql-test/t/rpl_drop.test: Auto merged mysql-test/t/rpl_error_ignored_table.test: Auto merged mysql-test/t/rpl_failsafe.test: Auto merged mysql-test/t/rpl_flush_log_loop-master.opt: Auto merged mysql-test/t/rpl_flush_log_loop-master.sh: Auto merged mysql-test/t/rpl_flush_log_loop-slave.opt: Auto merged mysql-test/t/rpl_flush_log_loop-slave.sh: Auto merged mysql-test/t/rpl_flush_log_loop.test: Auto merged mysql-test/t/rpl_get_lock.test: Auto merged mysql-test/t/rpl_heap.test: Auto merged mysql-test/t/rpl_ignore_grant-slave.opt: Auto merged mysql-test/t/rpl_ignore_grant.test: Auto merged mysql-test/t/rpl_insert_id.test: Auto merged mysql-test/t/rpl_free_items.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_loaddata_rule_m-master.opt: Auto merged mysql-test/t/rpl_loaddata_rule_m.test: Auto merged mysql-test/t/rpl_loaddata_rule_s-slave.opt: Auto merged mysql-test/t/rpl_loaddata_rule_s.test: Auto merged mysql-test/t/rpl_loaddatalocal.test: Auto merged mysql-test/t/rpl_log-master.opt: Auto merged mysql-test/t/rpl_log-slave.opt: Auto merged mysql-test/t/rpl_master_pos_wait.test: Auto merged mysql-test/t/rpl_max_relay_size.test: Auto merged mysql-test/t/rpl_multi_delete-slave.opt: Auto merged mysql-test/t/rpl_multi_delete.test: Auto merged mysql-test/t/rpl_multi_delete2.test: Auto merged mysql-test/t/rpl_optimize.test: Auto merged mysql-test/t/rpl_relayspace-slave.opt: Auto merged mysql-test/t/rpl_relayspace.test: Auto merged mysql-test/t/rpl_reset_slave.test: Auto merged mysql-test/t/rpl_skip_error-slave.opt: Auto merged mysql-test/t/rpl_skip_error.test: Auto merged mysql-test/t/rpl_multi_update.test: Auto merged mysql-test/t/rpl_multi_update2.test: Auto merged mysql-test/t/rpl_server_id1.test: Auto merged mysql-test/t/rpl_server_id2.test: Auto merged mysql-test/t/rpl_set_charset.test: Auto merged mysql-test/t/rpl_start_stop_slave.test: Auto merged mysql-test/t/rpl_trunc_binlog.test: Auto merged mysql-test/t/system_mysql_db.test: Auto merged mysql-test/t/system_mysql_db_fix.test: Auto merged mysql-test/t/system_mysql_db_refs.test: Auto merged mysql-test/t/system_mysql_db_fix-master.opt: Auto merged mysql-test/t/timezone-master.opt: Auto merged mysql-test/t/timezone.test: Auto merged mysql-test/t/type_set.test: Auto merged mysql-test/t/variables-master.opt: Auto merged mysql-test/t/timezone3.test: Auto merged
\| * \|	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
* \| \|	ndb - bug#9994 backpatch fixes from 5.0	unknown	2005-09-15	5	-158/+338
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IGNORE on merge 4.1->5.0 ndb/src/kernel/blocks/ERROR_codes.txt: bug#9994 backpatch fixes from 5.0 ndb/src/kernel/blocks/dbdict/Dbdict.cpp: bug#9994 backpatch fixes from 5.0 ndb/src/kernel/blocks/dbdict/Dbdict.hpp: bug#9994 backpatch fixes from 5.0 ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: bug#9994 backpatch fixes from 5.0 ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: bug#9994 backpatch fixes from 5.0
* \| \|	Merge mysql.com:/home/mydev/mysql-4.1	unknown	2005-09-14	2	-8/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/mydev/mysql-4.1-4100
\| * \| \|	Improve error / process handling in the Perl script to run the test suite ↵	unknown	2005-09-14	2	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(patch supplied by Kent). mysql-test/lib/mtr_process.pl: Handle errors in child processes separate from the parent process (patch supplied by Kent). mysql-test/lib/mtr_report.pl: New function to handle errors in child processes separate from the parent process (patch supplied by Kent). Expected to avoid HUP signals.
\| * \| \|	Minor output format change of the Perl test suite script (align with the ↵	unknown	2005-09-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	shell script). mysql-test/lib/mtr_report.pl: Make the Perl test script output identical to that of the (old) shell script, so that reported differences compare as equal strings (for automatic analysis).
* \| \| \|	Bug#12920 - key_read_requests counter appears to re-set	unknown	2005-09-14	8	-28/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After merge fix. include/keycache.h: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Status variables moved into KEY_CACHE in 4.1. Enlarging them there. include/my_sys.h: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Status variables moved into KEY_CACHE in 4.1. Removed unused global variables. myisam/mi_test2.c: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Status variables moved into KEY_CACHE in 4.1. Changed to print default key cache status. mysys/mf_keycache.c: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Status variables moved into KEY_CACHE in 4.1. Changed their debug printout. sql/mysqld.cc: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Changed to print full value. sql/sql_show.cc: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Added a branch for long long values. sql/sql_test.cc: Bug#12920 - key_read_requests counter appears to re-set After merge fix. changed to print full values. sql/structs.h: Bug#12920 - key_read_requests counter appears to re-set After merge fix. Added a branch for long long keycache values.
* \| \| \|	Merge mysql.com:/home/mydev/mysql-4.0-4000	unknown	2005-09-14	2	-6/+6
\|\ \ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/mydev/mysql-4.1-4100 include/my_sys.h: Bug#12920 - key_read_requests counter appears to re-set Manual merge requiring after merge fix. myisam/mi_test2.c: Bug#12920 - key_read_requests counter appears to re-set Manual merge requiring after merge fix. mysys/mf_keycache.c: Bug#12920 - key_read_requests counter appears to re-set Manual merge requiring after merge fix. sql/mysqld.cc: Bug#12920 - key_read_requests counter appears to re-set Manual merge requiring after merge fix. sql/sql_test.cc: Bug#12920 - key_read_requests counter appears to re-set Manual merge requiring after merge fix.
\| * \| \|	Bug#12920 - key_read_requests counter appears to re-set	unknown	2005-09-14	5	-20/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enlarged the counter variables to ulonglong.
* \| \| \|	Merge mysql.com:/home/mydev/mysql-4.0-4000	unknown	2005-09-13	1	-0/+7
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/mydev/mysql-4.1-4100 configure.in: Auto merged include/my_global.h: Auto merged sql/sql_base.cc: Auto merged
\| * \|	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
\| * \ \	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
* \| \| \| \| \|	Merged code. Removed unneccessary repeating.	unknown	2005-09-13	1	-10/+8
\| \| \| \| \| \|
* \| \| \| \| \|	minor compile error fix	unknown	2005-09-13	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge bk-internal:/home/bk/mysql-4.1	unknown	2005-09-12	1	-0/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged
\| * \ \ \ \ \	Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0	unknown	2005-09-13	1	-0/+9
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/Users/kent/mysql/bk/mysql-4.1 configure.in: Auto merged
\| \| * \| \| \| \|	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
* \| \| \| \| \| \|	Merge bk-internal:/home/bk/mysql-4.1	unknown	2005-09-12	11	-48/+67
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-4.1-clean
\| * \| \| \| \| \|	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	2	-5/+10
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
\| \| * \| \| \| \| \|	Corrected construct of faked Node fail signals in ndb SignalSender	unknown	2005-09-12	2	-5/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	8	-2/+33
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into selena.:H:/MYSQL/src/#05588-mysql-4.1 include/my_global.h: Auto merged
\| \| * \| \| \| \| \| \|	Fixes bug #5588. Additions after merge from 4.0.	unknown	2005-09-07	5	-4/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sql-common/client.c: Fixes bug #5588. checks if operation was timed out. vio/vio.c: Added vio_was_interrupted() function references to detect timed out operation properly on win32. vio/vio_priv.h: Added vio_ssl_was_interrupted() function that detects timed out operation properly on win32. vio/viosocket.c: Minor changes to follow up the coding standard. vio/viossl.c: Added vio_ssl_was_interrupted() function that detects timed out operation properly on win32.
\| \| * \| \| \| \| \| \|	Merge selena.:H:/MYSQL/src/#05588-mysql-4.0	unknown	2005-09-07	5	-1/+19
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into selena.:H:/MYSQL/src/#05588-mysql-4.1 BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220: Auto merged BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: Auto merged include/violite.h: Auto merged sql/net_serv.cc: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged include/my_global.h: SCCS merged
\| \| \| * \| \| \| \| \|	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.
\| * \| \| \| \| \| \| \| \|	Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	1	-41/+24
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kite-hub.kitebird.com:/tmp/merge-4.1
\| \| * \ \ \ \ \ \ \ \	Merge kite-hub.kitebird.com:/tmp/merge-4.0	unknown	2005-09-12	1	-41/+24
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kite-hub.kitebird.com:/tmp/merge-4.1 README: Auto merged
\| \| \| * \| \| \| \| \| \| \|	README:	unknown	2005-09-12	1	-41/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README (2nd try) README: Update README (2nd try)
* \| \| \| \| \| \| \| \| \| \|	Update test result	unknown	2005-09-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/ndb_autodiscover.result: Update results
* \| \| \| \| \| \| \| \| \| \|	Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco	unknown	2005-09-12	3	-75/+22
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/jimw/my/mysql-4.1-clean configure.in: Auto merged include/my_pthread.h: Auto merged sql/examples/ha_archive.cc: Auto merged
\| * \| \| \| \| \| \| \| \| \|	When first creating the ARZ file for an archive table, use "wb" as the mode for	unknown	2005-09-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gzdopen() because the file itself was only opened for writing (and truncated), and some libc implementations (like SCO) don't like to do a fdopen(..., "a") on a fd that was not opened using O_APPEND. sql/examples/ha_archive.cc: Use "wb" instead of "ab" since we just opened this file for writing
\| * \| \| \| \| \| \| \| \| \|	Port to SCO OpenServer 6. May require running ./configure with	unknown	2005-09-07	2	-74/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	--build=i686-unknown-sysv5SCO_SV6.0.0 include/my_pthread.h: Remove unnecessary define -- configure should define HAVE_NONPOSIX_SIGWAIT configure.in: Update checks for SCO threading libraries to handle OpenServer 6 Remove redundant OpenUNIX 8 checks Pass --build option through to bdb's configure
* \| \| \| \| \| \| \| \| \| \|	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	6	-15/+39
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
\| * \| \| \| \| \| \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	6	-15/+39
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mishka.mysql.com:/home/my/mysql-4.1
\| \| * \| \| \| \| \| \| \| \|	Review fixes since last pull	unknown	2005-09-12	6	-15/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for bug #13025; Server crash in filesort because wrong call to handler::position() client/mysqltest.c: Code cleanup during review mysql-test/r/innodb.result: Added test case for bug #13025; Server crash in filesort because wrong call to handler::position() mysql-test/t/innodb.test: Added test case for bug #13025; Server crash in filesort because wrong call to handler::position() sql/filesort.cc: Don't call handler::position() if row was not found sql/item_cmpfunc.cc: Indentation changes sql/sql_select.cc: Moved variable to outer level
* \| \| \| \| \| \| \| \| \| \|	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	6	-14/+67
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
\| * \| \| \| \| \| \| \| \| \|	Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	6	-14/+67
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
\| \| * \| \| \| \| \| \| \| \| \|	Fix for bug #6008: MySQL does not create warnings when creating database and ↵	unknown	2005-09-12	6	-14/+67
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using IF NOT EXISTS produce warning for 'create database if not exists' if database exists do not update database options in this case produce warning for 'create table if not exists' if table exists mysql-test/r/create.result: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS updated test case result mysql-test/r/temp_table.result: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS updated test case result mysql-test/r/warnings.result: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS updated test case result mysql-test/t/create.test: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS test case sql/sql_db.cc: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS produce warning for 'create database if not exists' if database exists do not update database options in this case sql/sql_table.cc: Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS produce warning for 'create table if not exists' if table exists
* \| \| \| \| \| \| \| \| \| \|	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	9	-88/+378
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eel.(none):/home/jonas/src/mysql-4.1-push
\| * \| \| \| \| \| \| \| \| \|	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	2	-6/+6
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eel.(none):/home/jonas/src/mysql-4.1-push
\| * \| \| \| \| \| \| \| \| \|	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-12	9	-88/+378
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eel.(none):/home/jonas/src/mysql-4.1-push
\| \| * \ \ \ \ \ \ \ \ \	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-11	1	-3/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eel.(none):/home/jonas/src/mysql-4.1-push
\| \| * \ \ \ \ \ \ \ \ \ \	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-10	2	-0/+20
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into eel.(none):/home/jonas/src/mysql-4.1-push