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

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

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

Marko after applying latest snapshot).

into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.0

  - THD::tmp_table_used removed, THD::thread_specific_used used instead.

into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.1

restores from mysqlbinlog out

Problem: using "mysqlbinlog | mysql" for recoveries the connection_id() 
result may differ from what was used when issuing the statement.

Fix: if there is a connection_id() in a statement, write to binlog
SET pseudo_thread_id= XXX; before it and use the value later on.

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1-maint

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint

which does not work.  Removing these attempted privileges makes
this identical to option 5 so remove it completely.  The spirit
of the program appears to be aimed at database privileges, so do
not add another option for granting global privileges as it may
be unexpected.  Fixes bug#14618 (same as previous patch, this
time applied to -maint tree).

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

into  sin.intern.azundris.com:/home/tnurnberg/10776/51-10776

into  sin.intern.azundris.com:/home/tnurnberg/10776/50-10776

5.1 specific fixes so cluster will build on AIX (with IBM compiler)

into  sin.intern.azundris.com:/home/tnurnberg/10776/51-10776

mysqld hasn't been built on AIX with ndb-everything in quite a while.
this allowed a variety of changes to be added that broke the AIX build
for both the GNU and IBM compilers (but the IBM suite in particular).
Changeset lets build to complete on AIX 5.2 for users of the GNU and
the IBM suite both. Tudo bem?

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

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

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

  
Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4 GB.
  
The test case for this bug is a part of the test suite for bug #5731.

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

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

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

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

  Post-review fix, if 'logger' can't be found, and --syslog is requested, exit with error message instead of fall back to logging to error file.

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1

existing table->no_replicate code is used instead

- Removed unused variable.

- Removed unused variable.