into  kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged

- When this bug was corrected it changed the behavior 
  for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
  test file.


mysql-test/r/myisam.result:
  moved test from myisam to symlink; new result file
mysql-test/r/symlink.result:
  moved test from myisam to symlink; new result file
mysql-test/t/myisam.test:
  moved test from myisam to symlink
mysql-test/t/symlink.test:
  moved test from myisam to symlink

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


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

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

mysql-test/Makefile.am:
  Fix merge error

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


sql/sql_class.h:
  Auto merged

 - Windows opens stdin in text mode by default. Certain characters
   such as CTRL-Z are interpeted as events and the read() method
   will stop. CTRL-Z is the EOF marker in Windows. to get past this
   you have to open stdin in binary mode. Setmode() is used to set
   stdin in binary mode. Errors on setting this mode result in
   halting the function and printing an error message to stderr.


client/mysqlbinlog.cc:
  Apply fix to 5.0 as well

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50


sql/sql_class.h:
  Auto merged
Makefile.am:
  Manual merge.

    - test* targets are identical (as much as possible) to 5.0 & 5.1 versions
    - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
    - PHONY: target includes all test targets


Makefile.am:
  - test* targets are identical (as much as possible) to 5.0 & 5.1 versions
  - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
  - PHONY: target includes all test targets

into  polly.local:/home/kaa/src/maint/mysql-5.0-maint


mysql-test/r/func_in.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
sql/opt_range.cc:
  Auto merged

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


mysql-test/t/kill.test:
  Auto merged

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.

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


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
sql/sql_class.h:
  Auto merged

 - 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.

mysql-test/Makefile.am:
  Add missing ($DESTDIR) wich cause "make discheck" to fail
scripts/make_binary_distribution.sh:
  Add std_data/*.MY* files to binary dist

forwards-incompatible change.

into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint

into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint


include/mysql.h:
  Auto merged

MYSQL_VERSION_ID is tested before it has been defined.  This leads to
a warning when compiling with -Wundef and it also will break the
internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
50000.

The fix entailed a simple re-ordering of included files in mysql.h


include/mysql.h:
  Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_com.h)
  
  MYSQL_VERSION_ID is tested before it has been defined.  This leads to
  a warning when compiling with -Wundef and it also will break the
  internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
  50000.
  
  Placed the #include for mysql_version.h above mysql_com.h to resolve conflict

Remove DBUG_ENTER in my_end


client/mysqltest.c:
  Call 'mysql_server_end' as last function in 'free_used_memory'
  Don't use DBUG_VOID_RETURN after mysql_server_end in free_used_memory
  Only call mysql_server_end if mysql_server_init has been called

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

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-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

client/mysqltest.c:
  Exclude

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

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


sql/sql_class.cc:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836


sql/sql_class.cc:
  manual merge

- Comment Cleanup.


sql/sql_class.cc:
  Removed misleading comment.

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

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  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint

disables binlog.


mysql-test/t/disabled.def:
  disabled test flush2.