into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


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

 - Give some more protection against "too long socket name by setting the max
   length when to use a tmpdir for sockets to 70


mysql-test/mysql-test-run.pl:
  Give some more protection against "too long socket name by setting the max
  ength when to use a tmpdir for sockets to 70

mysqldump generated output that set OLD_SQL_MODE twice, to different values
(for triggers), or not at all (for routines) in some cases.
---
Merge blasphemy.mysql.com:/home/tnurnberg/28223/50-28223
into  blasphemy.mysql.com:/home/tnurnberg/28223/51-28223


client/mysqldump.c:
  Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it
  
  Only save SQL_MODE in dump_triggers if in --compact mode. Otherwise,
  it's already been saved in write_header(). Likewise for dumpe_routines,
  where it was never saved.
mysql-test/r/mysqldump.result:
  Bug#28223: mysqldump --compact --routines restores from @OLD_SQL_MODE w/o ever setting it
  
  mysqldump output has subtly changed. Adjust test-results. This also shows
  OLD_SQL_MODE is always set exactly once now.
  ---
  manual merge

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

into  polly.local:/home/kaa/src/maint/bug28240/my51-bug24240


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


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

- Give some more protection against "too long socket name by setting the max
length when to use a tmpdir for sockets to 70 


mysql-test/mysql-test-run.pl:
  Give some more protection against "too long socket name by setting the max
  length when to use a tmpdir for sockets to 70

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/bug28193/my51-bug28193

- Change testcase to use remove_file


mysql-test/t/outfile.test:
  Change "exec rm" to "remove_file"

into  pilot.blaudden:/home/msvensson/mysql/bug28193/my50-bug28193


mysql-test/t/outfile.test:
  Use local

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

 - Change "exec rm" to "remove_file"


mysql-test/t/outfile.test:
  Change "exec rm" to "remove_file"

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

Since isinf() portability across various platforms and compilers is a complicated question, we should not use it directly. Instead, the my_isinf() macro should be used, which is defined as an alias to the system-defined isinf() if it is safe to use, or a workaround implementation otherwise.


configure.in:
  Added a check to define HAVE_ISINF only if it can be used in C++ code as well.
include/my_global.h:
  Define my_isinf() as an alias to isinf(), if it is available in both C and C++ code. Otherwise, define it to a workaround implementation.
sql/item_func.cc:
  Replaced isinf() with my_isinf().
strings/strtod.c:
  Replaced isinf() with my_isinf().

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


configure.in:
  Auto merged

	DragonflyBSD misc patches

Add the original intended test, since our current test for sched_yield
is insufficient to copy.


configure.in:
  We can't check for sched_yield, as that is in libc on FBSD.
  
  Re-add the check for sem_init in librt.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


configure.in:
  SCCS merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my51-bug27976


mysql-test/r/repair.result:
  Auto merged

mysql-test/r/repair.result:
  New error listing in v5.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

- Fix use of uninitialized variable in config/ac-macros/ssl.m4


config/ac-macros/ssl.m4:
  Use of uninitialized variable caused $openssl_includes to be set to -I
  when configuring mysql to compile with openSSL

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my51-bug27976


mysql-test/r/repair.result:
  Auto merged
storage/myisam/sort.c:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my50-bug27976


mysql-test/r/repair.result:
  Auto merged
myisam/sort.c:
  Manual merge.

The message is gramatically wrong, and factually wrong.

Change it to refer to the myisam_sort_buffer_size variable and change
"to" to "too".


myisam/sort.c:
  Change error messages to be gramatically correct and to refer to the
  correct variable.
mysql-test/r/repair.result:
  Refer to the correct variable.  Message changed.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27173/my51-bug27173


storage/myisam/ha_myisam.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27173/my50-bug27173


sql/ha_myisam.cc:
  SCCS merged

Warnings may show up in the error log that complain about a table, yet
don't tell us which table.

Add the database and table names to the message.


sql/ha_myisam.cc:
  Add the database and table names to the warning message.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


configure.in:
  Auto merged

into  recycle.(none):/src/winfix/my51-winfix


scripts/CMakeLists.txt:
  Auto merged

scripts/CMakeLists.txt:
  Fix broken bk native builds.