into  booka.:/home/alik/MySQL/devel/5.1-rt-im

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21635

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21635

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635

expression cols.

The problem was that MYSQL_FIELD::org_name was set for MIN() and MAX()
functions (COUNT() is also mentioned in the bug report but was already
fixed).

After this patch for expressions MYSQL_FIELD::name is set to either
expression itself or its alias, and other data origin fields of
MYSQL_FILED (db, org_table, table, org_name) are empty strings.

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23159

  - change some return types from int to bool;
  - add [ERROR] tag to log_error() output;
  - add [INFO] tag to log_info() output;
  - change log messages to be more consistent.

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23159

1) add support for joinable threads to Thread class;
2) move checking of thread model to Manager from mysqlmanager.cc,
because it is needed only for IM-main process.

Use mutex when reading prepared_stmt_count global status variable.

Update test case for bug 16365 and bug 23159: add test for
prepared_stmt_count being decreased when some connection that had
prepared statements is closed.

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23159

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159

Make Prepared_stmt_count a global status variable, accessible via
SHOW STATUS LIKE 'Prepared_stmt_count';.  Documentation should be
updated.

into  bodhi.local:/opt/local/work/m51lamp

Alik's patch for BUG#22306: STOP INSTANCE can not be applied for 
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.

into  bodhi.local:/opt/local/work/m51lamp

spawned threads with a reusable class Thread.

This is the second idea implemented in the Alik's patch for
BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned.
Commiting separately to ease review process. 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23383

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23383

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383

mysql_stmt_affected_rows()

The problem was that affected_rows for prepared statement wasn't updated
in the client library on the error.  The solution is to always update
affected_rows, which will be equal to -1 on the error.

BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22684

Before this change, the functions BENCHMARK, ENCODE, DECODE and FORMAT could
only accept a constant for some parameters.

After this change, this restriction has been removed. An implication is that
these functions can also be used in prepared statements.

The change consist of changing the following classes:
- Item_func_benchmark
- Item_func_encode
- Item_func_decode
- Item_func_format
to:
- only accept Item* in the constructor,
- and evaluate arguments during calls to val_xxx()
which fits the general design of all the other functions.

The 'TODO' items identified in item_create.cc during the work done for
Bug 21114 are addressed by this fix, as a natural consequence of aligning
the design.

In the 'func_str' test, a single very long test line involving an explain
extended select with many functions has been rewritten into multiple
separate tests, to improve maintainability.
The result of explain extended select decode(encode(...)) has changed,
since the encode and decode functions now print all their parameters.

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug17047

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17047

The problem was that some functions (namely IN() starting with 4.1, and
CHAR() starting with 5.0) were returning NULL in certain conditions,
while they didn't set their maybe_null flag.  Because of that there could
be some problems with 'IS NULL' check, and statements that depend on the
function value domain, like CREATE TABLE t1 SELECT 1 IN (2, NULL);.

The fix is to set maybe_null correctly.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-18239