into quadxeon.mysql.com:/users/vtkachenko/bk/mysql-5.0-tmp

into  xiphis.org:/usr/home/antony/work2/merge-5.0

sql_print_warning() and sql_print_error() instead of fprintf to stderr.
Above functions are tuned for different platforms so that the behavior
is consistent around platforms. Using fprintf() different behavior can
be expected at least on Windows and Unix.

  Added innodb_commit_concurrency variable

into  xiphis.org:/usr/home/antony/work2/merge-5.0

  postmerge fix

into  mysql.com:/home/dlenev/src/mysql-5.0-bg11973-2

into  xiphis.org:/usr/home/antony/work2/p2-bug10109.4

into mysql.com:/home/psergey/mysql-5.0-bug12228-r5

cursors (+ commit)" and Bug#11832 "Server crash with InnoDB + Cursors"
See comments to the changed files.

into  mysql.com:/home/kostja/mysql/mysql-5.0-12243

into  linux.site:/home/reggie/bk/mysql-5.0-new

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

subqry order by server crash": failing DBUG_ASSERT(curr_join == this)
when opening a cursor.
Ensure that for top-level join curr_join == join (always), 
and thus fix the failing assert.
curr_join is a hack to ensure that uncacheable subqueries can be
re-evaluated safely, and should be never different from main join
in case of top-level join.

into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/home/dlenev/src/mysql-5.0-bg12280

We should not allow FLUSH statement to be executed inside both triggers
and stored functions.

cause crash on update".

Let us update "thd" pointer in LEX, all its units and in LEX::result before
executing statement in trigger body, since triggers are associated with TABLE
object and because of this can be used in different threads.

into moonbone.local:/work/mysql-5.0-bug-12340

into  monster.:D:/Work/mysql/mysql-5.0

str_alloc had been added but was not added to mysqlclient and strings
libmysql should have had strings as a dependent.

When PRIMARY KEY is present ha_innobase::cmp_ref() uses it to compare refs.
After comparing part of key it moves pointers to compare next part.
For varchar parts pointers were moved only by length of parts, not including
bytes containig part length itself. This results in wrong comparision and
wrong number of deleted records.

into  xiphis.org:/usr/home/antony/work2/p2-bug10109.3