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

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged

into  example.com:/work/mysql-5.1-runtime-wl3337

This is a post-review patch.

Fixes the typelib implementation, available only in 5.1.11.

--event-scheduler cmdline : DISABLED | ON | OFF | 0 | 1
DISABLED - makes the scheduler unavailable during the server run
(ON|1)-  When the server is started the scheduler will be started. It can
         be stopped and restarted by setting appropriate values to
         GLOBAL event_scheduler
(OFF|0)- When the server is started, the scheduler won't be started. It
         can be started and again stopped by setting appropriate values to
         GLOBAL event_scheduler. _DEFAULT_ value

The GLOBAL variable event_scheduler can have the following values:
OFF | ON | 0 | 1
DISABLED is not possible and every attempt will end with an error that
it's not a valid value for the variable.
OFF | 0 - This is the pre-5.1.11 behavior - The scheduler stops, if not
          already stopped, and can be started again  by setting
          the value of the variable to ON|1.
ON | 1  - This is the pre-5.1.11 behavior - The scheduler starts, if not
          already started, and can be stopped again by setting the value
          of the variable to OFF|0.

into  moonbone.local:/work/tmp_merge-5.1-mysql

into  dator5.(none):/home/pappa/push_clone

into  dator5.(none):/home/pappa/push_clone

into  fifo.vaih.whnetz:/work/mysql-5.1-wl3337-tree2

This patch makes the relationship between Event_scheduler and Event_queue
unidirectional from the former to the latter.




The change is that the conditional on which the scheduler sleeped has been
moved to the Event_queue and the latter does not call anymore
Event_scheduler::queue_changed(), which in turn has be removed.

The problem was in dummy grep on AIX and HPUX.

The fix is to use more portable patterns.

The patch is only for test suite
(i.e. does not touch server codebase).

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1

into  dator5.(none):/home/pappa/push_clone

into  dator5.(none):/home/pappa/push_clone

fixed error message

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1

into  dator5.(none):/home/pappa/bug21388

into  dator5.(none):/home/pappa/bug21388

Review fixes

into  moonbone.local:/work/tmp_merge-5.1-opt-mysql

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

  After merge changes

CMake versions > 2.4 allow linking to STATIC or SHARED libraries only.

skip engine handling if engine is disabled

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

doesn't find the column"

When a user was using 4.1 tables with VARCHAR column and 5.0 server
and a query that used a temporary table to resolve itself, the
table metadata for the varchar column sent to client was incorrect:
MYSQL_FIELD::table member was empty.

The bug was caused by implicit "upgrade" from old VARCHAR to new
VARCHAR hard-coded in Field::new_field, which did not preserve
the information about the original table. Thus, the field metadata
of the "upgraded" field pointed to an auxiliary temporary table
created for query execution.

The fix is to copy the pointer to the original table to the new field.

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

into  moonbone.local:/work/tmp_merge-5.1-opt-mysql

into  lamia.home:/home/timka/mysql/src/5.1-bug-21456

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