into  polly.(none):/home/kaa/src/opt/mysql-5.1-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.

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

There are two problems with ROUND(X, D) on an exact numeric 
(DECIMAL, NUMERIC type) field of a table:
1) The implementation of the ROUND function would change the number of decimal
places regardless of the value decided upon in fix_length_and_dec. When the
number of decimal places is not constant, this would cause an inconsistent
state where the number of digits was less than the number of decimal places,
which crashes filesort.

Fixed by not allowing the ROUND operation to add any more decimal places than
was decided in fix_length_and_dec.

2) fix_length_and_dec would allow the number of decimals to be greater than
the maximium configured value for constant values of D. This led to the same 
crash as in (1).

Fixed by not allowing the above in fix_length_and_dec.

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

The fix is a copy of Martin Friebe's suggestion.
added testing for no_appended which will be false if anything,
including the empty string is in result

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

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

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

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

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

  Error message numbers.

  Error message numbers.

  Post-merge fix.

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

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

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

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

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

  Error message numbers.

1. Memory overrun have been fixed.
2. Server failure on assertion has been fixed.