into  stella.local:/home2/mydev/mysql-5.1-bug4692

into  stella.local:/home2/mydev/mysql-5.1-bug4692

Post-pushbuild fix

Added a purecov comment and a test for coverage of parallel
enable keys.

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

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

into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines

Post pushbuild fix

Disabled test on windows due to bug#30459
(DATA/INDEX DIR for partitions not working on windows)

Patch from Mattias Jonsson.

into  stella.local:/home2/mydev/mysql-5.1-bug31210

            if running as root

Every start of a server in the test suite raised that warning.

The cause was an unconditionla add of the --user option to the
server command line. Only the "root" user (effective user id == 0)
must use that option.

Added check for effective user id == 0 before adding --user.

Thanks to Magnus Svensson for the patch.

into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main

into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-last_with_main

into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main

into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-last_with_main

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

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

  Use proper variable for test.

into  stella.local:/home2/mydev/mysql-5.1-bug31210

into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-lastfinaltopush

into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-lastfinaltopush

into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-lastfinaltopush

into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-lastfinaltopush

Buffer overflow due to wrong key length in partitioning

Changed to the correct key_length function.

Merge fix

partition_mgm did not require have_symlink.

Moved the test case to partition_symlink, which
require have_symlink, and should work on both *nix and
Windows

                partitioned table
    
Post-pushbuild fix
    
Pushbuild detected yet another need for lex initialization in
embedded server.

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

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

into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines

Adding missing drop of user created for test case.

    causes the Server to crash.

Post-pushbuild fix

Pushbuild genereted valgrind warnings.

Changed function to safer variant.

              partitioned table
  
Post-pushbuild fix
  
Pushbuild detected a new need for lex initialization in
embedded server.

Fixed test for INSERT DELAYED in partitions_hash.test so that
it works with embedded server.

Changed test case from GRANT to CREATE USER

small fix of test case (when running make test after
merge, it did not substitute MYSQLTEST_VARDIR in
the error)

            partitioned table

Post-merge fix

A new need for lex initialization arose.

Problem: there was no standard syntax error when
         creating partitions with syntax error in
         the partitioning clause.

Solution: added "Syntax error: " to the error message

into  stella.local:/home2/mydev/mysql-5.1-bug31210

Problem: the table's INDEX and DATA DIR was taken
  directly from the table's first partition.
  This allowed rename attack similar to
  bug#32111 when ALTER TABLE REMOVE PARTITIONING

Solution: Silently ignore the INDEX/DATA DIR
  for the table. (Like some other storage engines
  do). 
  Partitioned tables do not support DATA/INDEX
  DIR on the table level, only on its partitions.

The "mysql client in mysqld"(which is used by
replication and federated) should use alarms instead of setting
socket timeout value if the rest of the server uses alarm. By
always calling 'my_net_set_write_timeout'
or 'net_set_read_timeout' when changing the timeout value(s), the
selection whether to use alarms or timeouts will be handled by
ifdef's in those two functions.

This is minimal backport of patch for BUG#26664, which was pushed
to 5.0 and up.

Affects 4.1 only.

into  stella.local:/home2/mydev/mysql-5.1-bug22351