assigning "mysql" variable from return value of mysql_real_connect.


client/mysqlslap.c:
  hild segfault when tring to call "mysql_error(NULL)", fiexed by not
  assigning "mysql" variable from return value of mysql_real_connect.

  Disabled 'rpl_deadlock_innodb', randomly failing


mysql-test/t/disabled.def:
  Disabled 'rpl_deadlock_innodb', randomly failing

  To somplify merge later, make files more similar in format


mysql-test/t/disabled.def:
  To somplify merge later, make files more similar in format

  Disabled randomly failing tests


mysql-test/t/disabled.def:
  Disabled randomly failing tests

  Added --ndbcluster_port for backward compatibility
make_win_src_distribution.sh:
  Updated to reflect 5.1 changes


scripts/make_win_src_distribution.sh:
  Updated to reflect 5.1 changes
mysql-test/mysql-test-run.pl:
  Added --ndbcluster_port for backward compatibility

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release


libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged

mysql-test/mysql-test-run.sh:
  Auto merged

mysql-test/mysql-test-run.sh:
  Provide info about the options used for this run to any evaluation tool.

sql/log.cc:
  Auto merged

into mysql.com:/M51/merge-5.1

mysql-test/lib/mtr_process.pl:
  Auto merged

mysql-test/mysql-test-run.pl:
  Manual merge (no idea why automatic merge failed ...).

mysql-test/mysql-test-run.pl:
  Add option "with-ndbcluster-only" (ignored) for compatibility with newer "Do-compile".

mysql-test/lib/mtr_process.pl:
  Auto merged

mysql-test/lib/mtr_process.pl:
  Change from "mtr_error()" to "mtr_warning()" on some problems,
  because "error" makes the whole suite abort which then makes "Do-compile" terminate,
  so none of the following steps (including other etst suites) will be done.

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

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


sql/item_timefunc.cc:
  Auto merged

mysql-test/mysql-test-run.sh:
  Manual merge from 4.0 (which was a 5.1 backport):
  "--with-ndbcluster" is already present,
  "--with-ndbcluster-only" is really usable here.

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

mysql-test/r/events.result:
  update result
mysql-test/t/events.test:
  update test (bk mangles cp1251 during merge)
mysql-test/t/events_scheduling.test:
  fix test

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


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged

mysql-test/r/func_time.result:
  expected test results for bug #18100 added
mysql-test/t/func_time.test:
  test case for bug #18100 added
sql/item_timefunc.cc:
  wrong formula for EXTRACT QUARTER, now uses the same calculus as the QUARTER()
  function

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

mysql-test/r/events.result:
  Auto merged
sql/event.cc:
  Auto merged
sql/event_timed.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

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


mysql-test/r/events.result:
  update result
mysql-test/t/events.test:
  update test
sql/event.cc:
  seems we get a crash if we compile it this way. better let the worker thread do it,
  this increases the stability.
sql/event_executor.cc:
  kick in more often
sql/event_timed.cc:
  - don't NULLify last_executed
  - implement (fix) better get_next_time() which does not use last_executed as basis
    but STARTS. STARTS is used as basis and the next point of time which is before ENDS,
    if set, is being found. The point > now and (point-starts) % interval_expression == 0.
sql/item_timefunc.cc:
  move calc_time_diff to time.cc as it can be reused in other parts of the 
  server code (see event_timed.cc)
sql/mysql_priv.h:
  export calc_time_diff() moved to time.cc from item_timefunc.cc
sql/sql_show.cc:
  - fix presenting of LAST_EXECUTED
  - cleanup a bit
sql/time.cc:
  - move calc_time_diff() from item_timefunc.cc to here

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)


BUILD/SETUP.sh:
  Implement --warning-mode in SETUP.sh. The value of the
  argument can be either "pedantic" or "old" (actually, or anything
  else). In case of "pedantic" mode, use -ansi -pedantic compilation
  flags.
BUILD/compile-pentium-debug-max-no-embedded:
  Rename base_max_configs to base_no_embedded_configs
BUILD/compile-pentium-debug-max:
  Use double quotes around $@
BUILD/compile-pentium-valgrind-max:
  Pass command line arguments to SETUP.sh. Allows calling
  compile-pentium-valgrind-max --warning-mode=pedantic
include/my_global.h:
  Remove an unnecessary ifdef: -pedantic hides the system-wide
  definition of ulong on Linux. In case there is no -pedantic, 
  the system-wide definition is available and HAVE_ULONG is defined
  by configure.

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


sql/opt_range.cc:
  Auto merged

* 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. 


mysql-test/r/partition_pruning.result:
  Testcase for BUG#18558
mysql-test/t/partition_pruning.test:
  Testcase for BUG#18558
sql/opt_range.cc:
  BUG#18558: Move partition set iterator initialization to sql_partition.cc, comment fixes
sql/partition_info.h:
  BUG#18558: Make each partition set iterator auto-reset itself after it has returned all 
  partition ids in the set it enumerates.
sql/sql_partition.cc:
  BUG#18558: 
  - Make each partition set iterator auto-reset itself after it has returned all 
    partition ids in the set it enumerates. 
  - Fix partition interval analysis to correctly handle intervals with one or both
    NULL bounds.
sql/sql_partition.h:
  BUG#18558: 
   - Make each partition set iterator auto-reset itself after it has returned all 
     partition ids in the set it enumerates. 
   - Rename PARTITION_ITERATOR::has_null_value to ret_null_part

support-files/mysql.server.sh:
  Fixed so that if the datadir has been set via the command line,
  it won't be reset by specifing the basedir after.