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

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

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

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

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

- 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

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

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

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

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

	DragonflyBSD misc patches

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-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  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27976/my51-bug27976

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

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

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

The message is gramatically wrong, and factually wrong.

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

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

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

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.

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

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

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

 - Expose the already existing counter for number of stored procedure calls