into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime

into  station.:/mnt/raid/alik/MySQL/5.1-rt-build

into  adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074

statement.

c++config.h now has the following code:
// For example, <windows.h> is known to #define min and max as macros...
#undef min
#undef max

So, our defines in my_global.h are undefined when <new> header
is included.

Move definitions of min()/max() to the end of my_global.h.

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime

into  adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074

Invaldating a subset of a sufficiently large query cache can take a long time.
During this time the server is efficiently frozen and no other operation can
be executed. This patch addresses this problem by setting a time limit on
how long time a dictionary access request can take before giving up on the 
attempt. This patch does not work for query cache invalidations issued by
DROP, ALTER or RENAME TABLE operations.

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-30712

into  ibm.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-bug25843

of statement breaks binlog.

There were two problems discovered by this bug:

  1. Default (current) database is not fixed at the creation time.
     That leads to wrong output of DATABASE() function.

  2. Database attributes (@@collation_database) are not fixed at
     the creation time. That leads to wrong resultset.

Binlog breakage and Query Cache wrong output happened because of
the first problem.

The fix is to remember the current database at the PREPARE-time and
set it each time at EXECUTE.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-cleanup

into  bodhi.(none):/opt/local/work/mysql-5.1-12713-new

API instead.
This is a pre-requisite of the fix for Bug 12713, which changes the
data type of thd->ha_data from void * to struct Ha_data.

Fix name of function in warning message.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge

into  moksha.local:/Users/davi/mysql/push/bugs/28587-5.1

The problem is that a SELECT on one thread is blocked by INSERT ... ON
DUPLICATE KEY UPDATE on another thread even when low_priority_updates is
activated.

The solution is to possibly downgrade the lock type to the setting of
low_priority_updates if the INSERT cannot be concurrent.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge

comments)

This change set is for 5.1 (manually merged)

Before this fix, the server would accept queries that contained comments,
even when the comments were not properly closed with a '*' '/' marker.

For example,
  select 1 /* + 2 <EOF>
would be accepted as
  select 1 /* + 2 */ <EOF>
and executed as
  select 1

With this fix, the server now rejects queries with unclosed comments
as syntax errors.
Both regular comments ('/' '*') and special comments ('/' '*' '!') must be
closed with '*' '/' to be parsed correctly.

generated so many warnings that the mode was unusable.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge