into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198

Added functions to enable/disable allowed/disallowed partition functions


sql/item.h:
  Added functions to enable/disable allowed/disallowed partition functions
sql/item_cmpfunc.h:
  Added functions to enable/disable allowed/disallowed partition functions
sql/item_func.h:
  Added functions to enable/disable allowed/disallowed partition functions
sql/item_strfunc.h:
  Added functions to enable/disable allowed/disallowed partition functions
sql/item_timefunc.h:
  Added functions to enable/disable allowed/disallowed partition functions
sql/item_xmlfunc.h:
  Added functions to enable/disable allowed/disallowed partition functions
sql/partition_info.cc:
  Added functions to enable/disable allowed/disallowed partition functions
sql/share/errmsg.txt:
  Added new error message

into  mysql.com:/home/mydev/mysql-5.1-aid


sql/item.cc:
  Auto merged

into  rurik.mysql.com:/home/igor/mysql-5.1

into  mysql.com:/home/mydev/mysql-5.1-aid

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

    no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c
    comments clarified. everything local to a plugin was declared static


plugin/fulltext/configure.in:
  no sense in building static library version of a plugin
plugin/fulltext/plugin_example.c:
  comments clarified. everything local to a plugin was declared static.

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


sql/opt_sum.cc:
  Auto merged

  increase version number for clone


configure.in:
  increase version number for clone

into  mysql.com:/home/mydev/mysql-5.1-aid


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/sql_yacc.yy:
  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:/home/mydev/mysql-5.1-aid

into mysql.com:C:/cygwin/home/mysqldev/my/mysql-5.1-new

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


sql/item.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged

The problem was due to the fact that with --lower-case-table-names set to 1 
the function find_field_in_group did not convert the prefix 'HU' in
HU.PROJ.CITY into lower case when looking for it in the group list. Yet the
names in the group list were extended by the database name in lower case.


mysql-test/r/having.result:
  Added a test case for bug #15917.
mysql-test/t/having.test:
  Added a test case for bug #15917.
sql/item.cc:
  Fixed bug #15917: unexpected complain for a NIST test case.
  The problem was due to the fact that with --lower-case-table-names set to 1 
  the function find_field_in_group did not convert the prefix 'HU' in
  HU.PROJ.CITY into lower case when looking for it in the group list. Yet the
  names in the group list were extended by the database name in lower case.
  The needed conversion was added to the code of find_field_in_group.

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/mydev/mysql-5.1-aid

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