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

disables the option explicitely.
Changed the option location in code so that --help will show it in
lexical option order.

This is for bug #26215: mysql command line client should not strip
comments from SQL statements

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

The bug is a regression introduced by the fix for bug30596. The problem
was that in cases when groups in GROUP BY correspond to only one row,
and there is ORDER BY, the GROUP BY was removed and the ORDER BY
rewritten to ORDER BY <group_by_columns> without checking if the
columns in GROUP BY and ORDER BY are compatible. This led to
incorrect ordering of the result set as it was sorted using the
GROUP BY columns. Additionaly, the code discarded ASC/DESC modifiers
from ORDER BY even if its columns were compatible with the GROUP BY
ones.

This patch fixes the regression by checking if ORDER BY columns form a
prefix of the GROUP BY ones, and rewriting ORDER BY only in that case,
preserving the ASC/DESC modifiers. That check is sufficient, since the
GROUP BY columns contain a unique index.

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/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.

- 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  polly.(none):/home/kaa/src/opt/bug28550/my51-bug28550

  
Since, as of MySQL 5.0.15, CHAR() arguments larger than 255 are converted into multiple result bytes, a single CHAR() argument can now take up to 4 bytes. This patch fixes Item_func_char::fix_length_and_dec() to take this into account.
  
This patch also fixes a regression introduced by the patch for bug21513. As now we do not always have the 'name' member of Item set for Item_hex_string and Item_bin_string, an own print() method has been added to Item_hex_string so that it could correctly be printed by Item_func::print_args().

move 'table_collation' field filling outside of if(file) condition
because this field has 'OPEN_FRM_ONLY' attribute

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

updated result files

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

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

issue an error if string has illegal characters

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/B31156-5.1-opt

  Fixed dbug macros usage errors

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

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

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

into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-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/work/B31440-5.1-opt

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

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

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

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

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

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

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

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