mysql-test/mysql-test-run.pl:
  Pass "--no-defaults" to embedded server as "--server-arg=--no-defaults"

mysql-test/t/kill.test:
  Move the connect of second connection to just before the query to be killed are sent.
  This introduces less variance since the connect time is not included in the delay
  we want between send of query and kill.

 - Use "mysql_field_count" to determine if there is a need to
   call "mysql_store_result"


client/mysqltest.c:
  Only call 'mysql_store_result' if 'mysql_field_count' is greater than 0
  indicating that this query has a result set.  This change is mainly since
  if mysql_store_result fails the value returned by mysql_field_count will be reset.

 - Thanks to Vasil Dimov for the patch!


client/mysqltest.c:
  Use my_snprintf to protect against exceeding size of buff
  Since variable name and valu might not be null terminated it's necessary to
  provide the length of the format specifiers.

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint

- Comment Cleanup.


sql/sql_class.cc:
  Removed misleading comment.

mysql-test/mysql-test-run.pl:
  delete $default_vardir if the 4.1 vardir trick is to be used to re-enable more than one test run in sequence

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint


sql/sql_class.h:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

 - Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
   attempt in mysqltest


client/mysqltest.c:
  Add CR_CONN_HOST_ERROR to errorcodes that trigger a reconnect

into  example.com:/work/bug24395-v2/my41


myisam/mi_open.c:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build

mysql-test/lib/mtr_process.pl:
  print extra message _once_ every 60 seconds

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

into  bodhi.local:/opt/local/work/mysql-4.1-runtime

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

  Remove soft links before creating source TAR, to avoid file copies (bug#11865)


Makefile.am:
  Remove soft links before creating source TAR, to avoid file copies (bug#11865)

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere

the problem is that client tools are compiled with UNDEF_THREADS_HACK
flag, and my thread-related additions to the mysqltest.c can't be compiled.
Easy solution is to disable these in not-embedded case completely.


client/mysqltest.c:
  it's used in embedded server only

into  bodhi.local:/opt/local/work/mysql-4.1-runtime


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged

This error is displayed anytime the SELECT statement needs a temp table to
return correct results because the object (select_dumpvar) that represents
variables named in the INTO clause stored the results before the temp
table was considered.  The problem was fixed by creating the necessary
Item_func_set_user_var objects once the correct data is ready.


mysql-test/r/distinct.result:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Added results
mysql-test/t/distinct.test:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Added various Selects that use the INTO statement and a temp table.
  - Added Select Into Outfile variant tests also.
sql/sql_class.cc:
  Bug#20836 Selecting into variables results in wrong results being returned
  - The select_dumpvar variable created a Item_func_set_user_var too early
  and once set, it was not possible to change.  The Item_func_set_user_var
  is now created once the final results are available.
sql/sql_class.h:
  Bug#20836 Selecting into variables results in wrong results being returned
  - Removed unnecessary object members.

where we know how to creat the vardir 
Remove unused variable

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

 - Avoid use of mtr_run when executing "mysqld --verbose --help" to find
   version and supported features


mysql-test/mysql-test-run.pl:
  Don't use mtr_run when executing "mysqld --verbose --help" to find
  version and supported features.

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged