into mysql.com:/M51/merge-5.1

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

into lmy004.:/work/mysql-5.1-bug17494-real

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

into  mysql.com:/home/hartmut/projects/mysql/dev/5.1

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

 skip charset aggregation for order columns

 move test case for bug 14290 to ctype_ucs test

This also should fix 17493 and 17346, and probably 16397 (not tested).
WL#1034 (Internal CRON)
(post-review commit)

into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new

argument can be either "pedantic" or "old" (actually, or anything
else). In case of "pedantic" mode, use -ansi -pedantic compilation
flags. Fix the build to compile in pedantic mode. (Version 3 of
the patch, with after-review fixes)

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

into  mysql.com:/home/greenman/workspace-mysql/mysql/bug-5.0-16240

into  mysql.com:/home/psergey/mysql-5.0-bug18237-review

into mysql.com:/home/psergey/mysql-5.1-bug18558-pnd

* Produce right results for conditions that were transformed to "(partitioning_range) AND
  (list_of_subpartitioning_ranges)": make each partition id set iterator auto-reset itself
  after it has returned all partition ids in the sequence 
* Fix "Range mapping" and "Range mapping" partitioning interval analysis functions to 
  correctly deal with NULL values. 

force pkglibdir to be in "mysql" package, template files:
AUTHORS, ChangeLog, NEWS, README, configure.in

Don't use the same param in recursive call.
Also, the fix makes it safe for a plugin to replace param->mysql_add_word

into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.1-new

into  mysql.com:/usr/home/bar/mysql-5.1-new

into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0

counter".

When TRUNCATE TABLE was called within an stored procedure the
auto_increment counter was not reset to 0 even if straight
TRUNCATE for this table did this.

This fix makes TRUNCATE in stored procedures to be handled exactly
in the same way as straight TRUNCATE. We achieve this by rolling
back the fix for bug 8850, which is no longer needed since stored
procedures don't require prelocked mode anymore (and TRUNCATE is
not allowed in stored functions or triggers).

into  shellback.(none):/home/msvensson/mysql/mysql-5.1