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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools	unknown	2006-10-04	1	-58/+167
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools client/mysqltest.c: Auto merged
\| *	Add possibility to send warnings about suspicious commands in .test file to ↵	unknown	2006-10-04	1	-58/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	<result_file_name>.warnings file Move detection of "parsing enabled" to after command has been read. Cleanup parsing enabled/disabled
* \|	Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools	unknown	2006-10-03	1	-1/+6
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools client/mysqltest.c: Auto merged
\| *	Fix problem when both option SSL and COMPRESS specified	unknown	2006-10-03	1	-1/+6
\| \|
* \|	Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools	unknown	2006-10-03	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools client/mysqltest.c: Auto merged
\| *	Fix typo	unknown	2006-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Change con_host to ds_connection_name.str client/mysqltest.c: Change con_host to ds_connection_name.str
* \|	Add mysys/my_copy.c as sources for mysqltest	unknown	2006-10-03	1	-1/+3
\| \|
* \|	Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools	unknown	2006-10-03	31	-2480/+3853
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools mysql-test/include/ps_query.inc: Auto merged mysql-test/r/check.result: Auto merged mysql-test/r/connect.result: Auto merged mysql-test/r/flush.result: Auto merged mysql-test/r/flush_block_commit.result: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/r/lock_multi.result: Auto merged mysql-test/r/mix_innodb_myisam_binlog.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/rename.result: Auto merged mysql-test/r/rpl000001.result: Auto merged mysql-test/r/rpl_error_ignored_table.result: Auto merged mysql-test/r/rpl_master_pos_wait.result: Auto merged BitKeeper/deleted/.del-rpl000018.test: Auto merged BitKeeper/deleted/.del-rpl_heap.test: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/synchronization.result: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/ps_grant.test: Auto merged mysql-test/t/rpl_flush_tables.test: Auto merged mysql-test/t/rpl_trunc_temp.test: Auto merged mysql-test/t/subselect.test: Auto merged BitKeeper/deleted/.del-show_msg80.inc: Delete: mysql-test/include/show_msg80.inc BitKeeper/deleted/.del-init_file.result: Delete: mysql-test/r/init_file.result BitKeeper/deleted/.del-mysql_client_test.result: Delete: mysql-test/r/mysql_client_test.result BitKeeper/deleted/.del-show_msg.inc: Delete: mysql-test/include/show_msg.inc client/Makefile.am: Use local file client/mysqltest.c: Use backported version of mysqltest mysql-test/r/mysqltest.result: Use backported file mysql-test/t/mysqltest.test: Use backported version mysql-test/r/type_blob.result: Manual merge mysql-test/t/connect.test: Used local version mysql-test/t/init_file.test: Manual merge mysql-test/t/mysql_client_test.test: Manual merge mysql-test/t/type_blob.test: Manual merge
\| *	Add two new result files	unknown	2006-10-03	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/r/init_file.result: Add new file init_file.result mysql-test/r/mysql_client_test.result: Add new file mysql_client_test.result
\| *	Update mysqltest to latest version	unknown	2006-10-03	50	-3084/+5770
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- ie. backport from 5.1 - also update testcase error dected by new version mysql-test/include/show_msg.inc: BitKeeper file /home/msvensson/mysql/same_tools/my41-same_tools/mysql-test/include/show_msg.inc mysql-test/include/show_msg80.inc: BitKeeper file /home/msvensson/mysql/same_tools/my41-same_tools/mysql-test/include/show_msg80.inc BitKeeper/deleted/.del-rpl_chain_temp_table.test: Delete: mysql-test/t/rpl_chain_temp_table.test BitKeeper/deleted/.del-rpl_chain_temp_table.result: Delete: mysql-test/r/rpl_chain_temp_table.result BitKeeper/deleted/.del-rpl_failsafe.result: Delete: mysql-test/r/rpl_failsafe.result BitKeeper/deleted/.del-rpl_failsafe.test: Delete: mysql-test/t/rpl_failsafe.test BitKeeper/deleted/.del-rpl_heap.test: Delete: mysql-test/t/rpl_heap.test BitKeeper/deleted/.del-rpl_heap.result: Delete: mysql-test/r/rpl_heap.result BitKeeper/deleted/.del-rpl000018.result: Delete: mysql-test/r/rpl000018.result BitKeeper/deleted/.del-rpl000018.test: Delete: mysql-test/t/rpl000018.test client/Makefile.am: Link mysqltest with mysys/my_copy.c client/mysqltest.c: Update mysqltest to latest version mysql-test/include/have_multi_ndb.inc: Remove old syntax "@filename" in favor of "--require filename" mysql-test/include/master-slave.inc: Remove old syntax "@filename" in favor of "--require filename" mysql-test/include/ps_query.inc: Remove the comment about no output now when it does. mysql-test/r/check.result: Update output from --send mysql-test/r/connect.result: Update result file for connect test after backport form 5.1 mysql-test/r/flush.result: Update output from --send mysql-test/r/flush_block_commit.result: Update output from --send mysql-test/r/func_misc.result: Update output from --send mysql-test/r/grant2.result: Update output from --send mysql-test/r/handler.result: Update output from --send mysql-test/r/kill.result: Update output from --send mysql-test/r/lock_multi.result: Update output from --send mysql-test/r/mix_innodb_myisam_binlog.result: Update output from --send mysql-test/r/mysqltest.result: Update mysqltest.result after backport mysql-test/r/ps_2myisam.result: Update result as the output from query is now printed mysql-test/r/ps_3innodb.result: Update result as the output from query is now printed mysql-test/r/ps_4heap.result: Update result as the output from query is now printed mysql-test/r/ps_5merge.result: Update result as the output from query is now printed mysql-test/r/ps_6bdb.result: Update result as the output from query is now printed mysql-test/r/ps_7ndb.result: Update result as the output from query is now printed mysql-test/r/rename.result: Update output from --send mysql-test/r/rpl000001.result: Update output from --send mysql-test/r/rpl_error_ignored_table.result: Update output from --send mysql-test/r/rpl_master_pos_wait.result: Update output from --send mysql-test/r/subselect.result: Update result file after adding missing ; mysql-test/r/synchronization.result: Update output from --send mysql-test/r/type_blob.result: Update result file after adding missing ; mysql-test/t/connect.test: Backport test from 5.1 mysql-test/t/init_file.test: Update test so something is printed mysql-test/t/mysql_client_test.test: Update test so result is sent to file and something is printed mysql-test/t/mysqltest.test: Backport latest mysqltest.test file mysql-test/t/ps.test: Move the --replace_column statement to just before the statetement it should replace mysql-test/t/ps_1general.test: Move the --replace_column statement to just before the statetement it should replace mysql-test/t/ps_grant.test: Remove the $DB, no other test uses it mysql-test/t/rpl_flush_tables.test: Fetch $SERVER_VERSION from the db server mysql-test/t/rpl_trunc_temp.test: Remove the selection of connection master after it's been disconnected already mysql-test/t/subselect.test: Add missing ; mysql-test/t/type_blob.test: Add missing ;
* \|	Delete files now moved into mysqltest.test	unknown	2006-10-03	3	-139/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/deleted/.del-sourced.inc: Delete: mysql-test/include/sourced.inc BitKeeper/deleted/.del-mysqltest_while.inc: Delete: mysql-test/include/mysqltest_while.inc BitKeeper/deleted/.del-sourced1.inc: Delete: mysql-test/include/sourced1.inc
* \|	Temporary fix for bug#22268 (official patch will come soon)	unknown	2006-09-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't cap threads at 1000 on Windows any more.
* \|	Merge shellback.(none):/home/msvensson/mysql/work/my50-work	unknown	2006-09-15	1	-0/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
\| * \|	Add definition of SHUT_RDWR for compiling on windows	unknown	2006-09-15	1	-0/+8
\| \| \|
* \| \|	Merge bk-internal:/home/bk/mysql-5.0-maint	unknown	2006-09-15	4	-13/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
\| * \ \	Merge shellback.(none):/home/msvensson/mysql/work/my50-work	unknown	2006-09-15	2	-5/+1
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
\| \| * \|	Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602	unknown	2006-09-15	1	-1/+1
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/work/my50-work configure.in: Auto merged
\| \| \| * \|	Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c	unknown	2006-09-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away. configure.in: Use the value returned from isinf so it's not optimized away by the compiler(i.e gcc 4.1)
\| \| * \| \|	Merge msvensson.mysql.internal:mysql/my50-m-bug16574	unknown	2006-09-15	1	-4/+0
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/work/my50-work
\| \| \| * \| \|	Bug#16574 Patch to compile on GNU/Hurd (PATH_MAX limit not existing)	unknown	2006-07-26	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Define MAX_PATH if not already defined by system header files. - Thanks to Christian for the report and patch! ndb/include/ndb_global.h.in: PATH_MAX is defined in ndb_global.h for "sco", remove the conditional define for sco so it thakes effect as soon as MAX_PATH is not available
\| * \| \| \| \|	Merge shellback.(none):/home/msvensson/mysql/work/my50-work	unknown	2006-09-15	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
\| \| * \| \| \|	Merge msvensson.mysql.internal:mysql/my50-m-bug16576	unknown	2006-09-15	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/work/my50-work configure.in: Auto merged
\| \| \| * \| \| \|	Bug#16576 Patch to compile on GNU/Hurd (ps check in configure)	unknown	2006-07-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Thanks to Christian Hammers for the patch configure.in: The configure check on how to run ps to get mysqld's $PID does not work on the Hurd, as the PPID is prepended with a - for login shells, thus making grep look for -bash, which it complains as an invalid argument. Filtering out '-' from the ps output makes this work fine.
\| * \| \| \| \| \|	Merge shellback.(none):/home/msvensson/mysql/work/my50-work	unknown	2006-09-15	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
\| \| * \| \| \| \|	Merge msvensson.mysql.internal:mysql/my50-m-bug21222	unknown	2006-09-15	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/work/my50-work
\| \| \| * \| \| \| \|	Bug#21222 Patch to support GNU/kFreeBSD build	unknown	2006-07-26	1	-1/+1
\| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Thanks to Christian Hammers for the patch! include/my_global.h: Define __GNU_SOURCE to 1 also when __GLIBC__ is defined
\| * \| \| \| \| \|	Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139	unknown	2006-09-15	1	-6/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint tests/Makefile.am: Auto merged
\| \| * \| \| \| \| \|	Bug#22139 undefined reference to `my_memmem' when compiling ↵	unknown	2006-09-12	1	-6/+3
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests/mysql_client_test - Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c tests/Makefile.am: Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c
* \| \| \| \| \| \|	Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint	unknown	2006-09-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
\| * \| \| \| \| \|	Add SSL specific linker flags to --libmysqld-libs (Bug #21239)	unknown	2006-09-15	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge bk-internal:/home/bk/mysql-5.0-maint	unknown	2006-09-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
\| * \ \ \ \ \ \	Merge shellback.(none):/home/msvensson/mysql/work/my50-work	unknown	2006-09-15	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
\| \| * \| \| \| \| \|	Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t	unknown	2006-09-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	extra/yassl/testsuite/test.hpp: Remove define for __MACH__ http://bugs.debian.org/387369
* \| \| \| \| \| \| \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2006-09-15	5	-3/+51
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
\| * \| \| \| \| \| \|	Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm	unknown	2006-09-13	5	-3/+51
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into lamia.home:/home/timka/mysql/src/5.0-dbg sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged
\| \| * \| \| \| \| \| \|	Fix for BUG#21774: Column count doesn't match value count at row x	unknown	2006-09-12	5	-3/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The cause of the bug was an incomplete fix for bug 18080. The problem was that setup_tables() unconditionally reset the name resolution context to its 'tables' argument, which pointed to the first table of an SQL statement. The bug fix limits resetting of the name resolution context in setup_tables() only in the cases when the context was not set by earlier parser/optimizer phases. mysql-test/r/insert_select.result: Test for BUG#21774. mysql-test/t/insert_select.test: Test for BUG#21774. sql/sql_base.cc: Do not reset the name resolution contect unconditionally. Instead set the context to 'tables' only if it was not set before calling setup_tables(). sql/sql_insert.cc: Added asserts to make sure that in the case of INSERT ... VALUES ... statements it is not necessary to reset the name resolution context to the first table, because there is only one table in the list of tables anyway. The actual code is not removed in order not to confuse it with the actual bug fix. sql/sql_parse.cc: Removed unnecessary reset of the name resolution context. The context is anyway unconditionally reset in mysql_insert() and mysql_prepare_insert().
* \| \| \| \| \| \| \| \|	Merge msvensson.mysql.internal:mysql/mysql-5.0-maint	unknown	2006-09-15	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
\| * \ \ \ \ \ \ \ \	Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr	unknown	2006-09-14	1	-4/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged
\| \| * \| \| \| \| \| \| \| \|	Removed unused variable "glob_cygwin_shell"	unknown	2006-09-06	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge shellback.(none):/home/msvensson/mysql/work/my50-work	unknown	2006-09-15	2	-9/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint vio/viosocket.c: Auto merged
\| * \| \| \| \| \| \| \| \| \|	Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown	unknown	2006-09-15	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge bk-internal:/home/bk/mysql-5.0-maint	unknown	2006-09-15	19	-40/+233
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
\| * \| \| \| \| \| \| \| \| \|	Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint	unknown	2006-09-15	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
\| \| * \| \| \| \| \| \| \| \|	Bug#21011 The [client] group header was overwritten by "password" option in ↵	unknown	2006-09-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option client/mysql_upgrade.c: The "password" option should be issued after group header to upgrade_defaults file whenever it is used
\| * \| \| \| \| \| \| \| \| \|	Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424	unknown	2006-09-14	3	-5/+66
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
\| \| * \| \| \| \| \| \| \| \|	Bug#21424 mysqldump failing to export/import views. ↵	unknown	2006-09-14	3	-5/+66
\| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored. Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database. client/mysqldump.c: When the flush-privileges command line option is specified, make sure to FLUSH PRIVILEGES after only the mysql database's tables' data is restored so that grant tables are current. mysql-test/r/mysqldump.result: Added Results. mysql-test/t/mysqldump.test: Expanded existing test case for bug 21527 to also test for bug 21424. Exercises new --flush-priviliges command line option. Test ignores log tables.
\| * \| \| \| \| \| \| \| \|	Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix	unknown	2006-09-14	1	-3/+9
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
\| \| * \| \| \| \| \| \| \| \|	/usr/sbin not always in PATH environment variable.	unknown	2006-09-14	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	BitKeeper/triggers/post-commit: Attempt to default to /usr/sbin/sendmail if it exists, otherwise use sendmail.
\| * \| \| \| \| \| \| \| \| \|	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618	unknown	2006-09-14	3	-5/+25
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint client/mysql.cc: Auto merged mysql-test/r/mysql.result: Manual merge. mysql-test/t/mysql.test: Manual merge.
\| \| * \| \| \| \| \| \| \| \|	Bug #21618: NULL shown as empty string in client	unknown	2006-09-13	3	-5/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The column's NOT NULL flag doesn't affect what we should print. Remove the wrong logic that does check it. Also, verify that this and the previous two tests print the same data as other output formats. client/mysql.cc: Don't check the column's NOT NULL flag when determining whether to print "NULL" or not. mysql-test/r/mysql.result: Add results and confirm that the other output forms give the same results for other similar tests. mysql-test/t/mysql.test: Add regression tests for this bug and two similar bugs.