into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

into  polly.(none):/home/kaa/src/opt/bug32103/my51-bug26215

into  polly.(none):/home/kaa/src/opt/bug32103/my50-bug26215

variable in where clause.

Problem: the new_item() method of Item_uint used an incorrect
constructor. "new Item_uint(name, max_length)" calls
Item_uint::Item_uint(const char *str_arg, uint length) which assumes the
first argument to be the string representation of the value, not the
item's name. This could result in either a server crash or incorrect
results depending on usage scenarios.

Fixed by using the correct constructor in new_item():
Item_uint::Item_uint(const char *str_arg, longlong i, uint length).

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

Calculating the estimated number of records for a range scan may take a
significant time, and it was impossible for a user to interrupt that
process by killing the connection or the query.

Fixed by checking the thread's 'killed' status in check_quick_keys() and
interrupting the calculation process if it is set to a non-zero value.

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

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

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

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

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

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt

into  polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215

the length of the remaining input string.

This is to fix mysqldump test failure in PB introduced by the patch
for bug #26215.

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt

- Added trigger tests back.
- Fixed test cases to match the extended output format of SHOW CREATE ...
- Replaced 'gptr' with 'uchar *'.

into  polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215

  bug #26215: mysql command line client should not strip comments
              from SQL statements
and
  bug #11230: Keeping comments when storing stored procedures

With the introduction of multiline comments support in the command line
client (mysql) in MySQL 4.1, it became impossible to preserve
client-side comments within single SQL statements or stored routines.
This feature was useful for monitoring tools and maintenance.

The patch adds a new option to the command line client
('--enable-comments', '-c') which allows to preserve SQL comments and
send them to the server for single SQL statements, and to keep comments
in the code for stored procedures / functions / triggers.

The patch is a modification of the contributed patch from bug #11230
with the following changes:
- code style changes to conform to the coding guidelines
- changed is_prefix() to my_strnncoll() to detect the DELIMITER
command, since the first one is case-sensitive and not charset-aware
- renamed t/comments-51.* to t/mysql_comments.*
- removed tests for comments in triggers since 5.0 does not have SHOW
CREATE TRIGGER (those tests will be added back in 5.1).

The test cases are only for bug #11230. No automated test case for bug
#26215 is possible due to the test suite deficiencies (though the cases
from the bug report were tested manually).

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

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

added 'in_rows' column value for 'describe extended' for the case 
when 'describe' handles I_S table

db name should be quoted. this code does communication with the server.
it's always ok to quote names in this case.

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

The HAVING clause is subject to the same rules as the SELECT list
about using aggregated and non-aggregated columns.
But this was not enforced when processing implicit grouping from
using aggregate functions.
Fixed by performing the same checks for HAVING as for SELECT.

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

SHOW CREATE TRIGGER was not checking for detected errors 
opening/reading the trigger file. 
Fixed to return the already generated error.

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

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

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

Item_in_subselect's only externally callable method is val_bool().
However the nullability in the wrapper class (Item_in_optimizer) is 
established by calling the "forbidden" method val_int().

Fixed to use the correct method (val_bool() ) to establish nullability 
of Item_in_subselect in Item_in_optimizer.

Item_func_inet_ntoa and Item_func_conv inherit 'maybe_null' flag from an
argument, which is wrong.
Both can be NULL with notnull arguments, so that's fixed.