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

Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
inside a stored routine and MySQL is compiled with Query Cache support
(this is not in the manual).

The problem was that the condition test of "we are inside stored routine"
was reversed, thus CONCURRENT _worked only_ from stored routine.  The
solution is to use proper condition test.

No test case is provided because the test case would require a large
amount of input, and it's hard to tell is SELECT is really blocked or
just slow (subject to race).

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge

into  bodhi.local:/opt/local/work/mysql-5.1-24486

deadlock_innodb:events_grant". This was a memory leak introduced by 
the patch for Bug 22830.
Post-review fixes.

Removed warnings from mysqltest scripts

Fixed that test_thr_alarm works

Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable

into  mysql.com:/home/my/mysql-5.1

into  mysql.com:/home/my/mysql-5.1

Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel

Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
Added connect timeout to test to make im_daemon_life_cycle more predictable

into  outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime

Disabling debug printouts for valgrind builds that print unallocated memory.

Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()

Removing valgrind memory checks from code.

Patch to fix valgrind warning that uninitialized bytes were written. 
The warning was caused by set_default(), which assumes that the field pointer is pointing
into record[0], while all other functions honors the move_field_offset().

There was a memory overrun, which resulted in safemalloc
errors. Recommit with post-review fixes.

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

into  mysql.com:/home/my/mysql-5.1

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  mysql.com:/home/my/mysql-5.1

Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1

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.