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  sin.intern.azundris.com:/home/tnurnberg/10776/51-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.

  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  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

into  mysql.com:/home/ram/work/b29980/b29980.5.1

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

Don't use syslog by default; user will have to request it explicitly with the --syslog option.

Use "sed -u" to get unbuffered output from sed, if it's supported.

Otherwise, don't use sed at all - don't strip the timestamp from mysqld messages.

Also, add new --syslog-tag=FOO option, which adds "-FOO" to the tag used when logging messages to syslog (i.e., mysqld-FOO or mysqld_safe-FOO)

Also, explicitly mention where log messages are going, so user can more easily find them.

Also, check if 'logger' is in the PATH, and log to the error log file if it can't be found.

into  alf.(none):/src/bug30103/my50-bug30103

into  alf.(none):/src/bug30103/my51-bug30103

- Add CMake rule to remove files.
- Manual merge.

into  alf.(none):/src/bug30103/my51-bug30103

into  damien-katzs-computer.local:/Users/dkatz/mysql51

into  mysql.com:/home/ram/work/b29980/b29980.5.1

- Add CMake rule to remove files.

into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines

INSERT/DELETE/UPDATE followed by ALTER TABLE within LOCK TABLES
may cause table corruption on Windows.

That happens because ALTER TABLE writes outdated shared state
info into index file.

Fixed by removing obsolete workaround.

Affects MyISAM tables on Windows only.

Added libCsup as a mysql library dependency on hpux11.

This means any projects statically linking to our libraries using the HPUX11 compiler will need to add the -lCSup option to their build link options. If they use the mysql_config tool this will happen automatically.

Projects that dynamically link to libmysqlclient will continue to work without any modifications.

Library libCsup is a C++ runtime library needed for yassl support when built with the hpux11 C/C++ compiler. The first attempts to fix this bug were to remove the yassl dependencies on libCsup. We tried removing all pure virtual functions and other hacks, but the dependency remained. The only other options left involve extensive restructuring of the yassl library.
    

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

into  xiphis.org:/anubis/antony/work/mysql-5.1-engines.merge

into  xiphis.org:/anubis/antony/work/mysql-5.1-engines.merge

into  xiphis.org:/anubis/antony/work/mysql-5.0-engines.merge

Problem: trying to repair an old (e.g. with "old" varstring fields) corrupted 
table with use_frm option we don't actually repair the table, just altering it
which may couse data loss.

Fix: if use_frm repair option is set, do repair instead of altering even 
if the table needs upgrade.

into  pcg5ppc.xiphis.org:/Users/antony/Work/p1-bug29522.1

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  xiphis.org:/anubis/antony/work/p2-bug25679.3.merge-5.1

into  gleb.loc:/home/uchum/work/bk/5.1-opt

  Post-merge fix.

  Post-merge fix.