into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

Implement neccessary shared lock structure for table locks.
This is the backport of bug26241 fix.

into  magare.gmz:/home/kgeorge/mysql/autopush/B31928-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B31928-5.0-opt

into  mysql.com:/misc/mysql/31700/51-31700

tests adjusted for Windows

into  magare.gmz:/home/kgeorge/mysql/work/B31928-5.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt

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

into  magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.1-opt

storage engine system variables was not validated and
unexpected value was assigned.

The check_func_enum function used subtraction from the uint
value with the probably negative result. That result of
type uint was compared with 0 after casting to signed long
type. On architectures where long type is longer than int
type the result of comparison was unexpected.

into  mysql.com:/home/hf/work/31305/my51-31305

into  mysql.com:/home/hf/work/31305/my50-31305

into  mysql.com:/home/hf/work/31305/my50-31305

into  mysql.com:/home/hf/work/31305/my41-31305

into  mysql.com:/home/hf/work/31305/my51-31305

into  magare.gmz:/home/kgeorge/mysql/work/B31562-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.0-opt

into  moonbone.local:/work/30081-bug-5.1-opt-mysql

command and reported to a client.

The fact that a timestamp field will be set to NO on UPDATE wasn't shown 
by the SHOW COMMAND and reported to a client through connectors. This led to
problems in the ODBC connector and might lead to a user confusion.

A new filed flag called ON_UPDATE_NOW_FLAG is added. 
Constructors of the Field_timestamp set it when a field should be set to NOW
on UPDATE.

The get_schema_column_record function now reports whether a timestamp field
will be set to NOW on UPDATE.

Post pushbuild fix

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

Patch from Mattias Jonsson.

The columns in HAVING can reference the GROUP BY and 
SELECT columns. There can be "table" prefixes when
referencing these columns. And these "table" prefixes
in HAVING use the table alias if available.
This means that table aliases are subject to the same
storage rules as table names and are dependent on 
lower_case_table_names in the same way as the table 
names are.
Fixed by :
1. Treating table aliases as table names
and make them lowercase when printing out the SQL
statement for view persistence.
2. Using case insensitive comparison for table 
aliases when requested by lower_case_table_names

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