into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new

into  mysql.com:/home/cps/mysql/devel/5.1-cleanup


sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged

The update log itself was removed back in 5.0. Recommit
with post-review fixes.


sql/log.cc:
  OPTION_UPDATE_LOG was set in all threads but replication ones.
  So, it seems that the check filtered out slow log records from
  replication threads. Now we do it with explicit check.
sql/mysql_priv.h:
  remove unused define
sql/mysqld.cc:
  Do not set OPTION_UPDATE_LOG. It is not used anymore.
sql/set_var.cc:
  We never check for OPTION_UPDATE_LOG. So, we should not bother setting it.

into  big_geek.:C:/Work/mysql/mysql-5.1

win/cmakefiles/client:
  fix dependencies
win/cmakefiles/libmysql:
  fix dependencies
win/cmakefiles/regex:
  removed definitions defined here.  They are defined globally
win/cmakefiles/strings:
  removed definitions defined here.  They are defined globally
win/cmakefiles/tests:
  fixed dependencies
win/cmakefiles/vio:
  removed definitions defined here.  They are defined globally
win/cmakefiles/zlib:
  removed definitions defined here.  They are defined globally

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1-clone


client/mysqltest.c:
  Auto merged

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone


client/mysqltest.c:
  Auto merged

  Typos.


client/mysqltest.c:
  Typos.

  Better fix for do_sleep().


client/mysqltest.c:
  Better fix for do_sleep().

  Revise stress-test README


mysql-test/README.stress:
  Revise stress-test README
mysql-test/mysql-stress-test.pl:
  Revise stress-test README

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

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new

into  mysql.com:/usr/home/bar/mysql-5.1-new.b16316

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/skip_grants.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
VC++Files/mysql.sln:
  Manual merge (use local).
configure.in:
  Manual merge.
sql/table.cc:
  Manual merge.

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  by-pass dict cache when creating blob event op
  does get event using table stored under main event op
  in preparation to remove blob tables from dict cache
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  by-pass dict cache when creating blob event op
  does get event using table stored under main event op
  in preparation to remove blob tables from dict cache
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  by-pass dict cache when creating blob event op
  does get event using table stored under main event op
  in preparation to remove blob tables from dict cache
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  by-pass dict cache when creating blob event op
  does get event using table stored under main event op
  in preparation to remove blob tables from dict cache

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

(ASCII space).  For Bug#16857.


sql/field_conv.cc:
  Bug#16857:  Do not expand BINARY fields as if they are strings (which 
  presumably /should/ be filled with spaces).  Instead, fill BINARY fields
  with 0x00 bytes.

mysql-test/r/events_logs_tests.result:
  update result

  Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'
mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861


scripts/mysqld_safe.sh:
  Don't try 'mysqld-max' before 'mysqld' if no server given, bug#17861
mysql-test/mysql-test-run.pl:
  Try find in order 'mysqld-nt', 'mysqld', 'mysqld-debug' and 'mysqld-max'

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


sql/event_timed.cc:
  Auto merged

into  selena.:H:/MYSQL/src/#17595-mysql-5.0

into lmy004.:/work/mysql-5.1-bug16406

into  mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0

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

into  mysql.com:/home/alexi/bugs/mysql-5.1-merged


sql/sql_db.cc:
  Auto merged

into  mysql.com:/home/alexi/bugs/mysql-5.1-16175


sql/sql_db.cc:
  Auto merged

                 time per connection
  Removed const_string() method from Item_string (it was only used in one
  place, in a bad way). Defer possible SP variable, and access data directly
  instead, in date_format item.


mysql-test/r/sp.result:
  Updated results for new test (BUG#17476).
mysql-test/t/sp.test:
  New test case (BUG#17476)
sql/item.h:
  Removed const_string() from Item_string.
  It was only used in one place, and we can just use str_value in Item directly.
sql/item_timefunc.cc:
  Must defer a (possible) local SP variable to use max_length and str_value
  in Item_func_date_format::fix_length_and_dec(), and refer to str_value
  directly without the const_string() method (now removed); the cast didn't
  work in all cases anyway.

  cloned


configure.in:
  cloned

into mysql.com:/M50/mysql-5.0

xml.result, xml.test:
  Adding test case.
item_xmlfunc.cc:
  Fixed that Item_nodeset_func derived classes
  didn't take into account charset of the XML value
  and always worked using "binary" charset.


sql/item_xmlfunc.cc:
  Bug#16316: XML: extractvalue() is case-sensitive with contains()
  Fixed that Item_nodeset_func derived classes
  didn't take into account charset of the XML value
  and always worked using "binary" charset.
mysql-test/t/xml.test:
  Adding test case.
mysql-test/r/xml.result:
  Adding test case.

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

database
 - Fix test case for systems with "lowercase names"


mysql-test/r/grant2.result:
  Fix for system with "lowercase names", allow error 1007 to be returned
mysql-test/t/grant2.test:
  Fix for system with "lowercase names", allow error 1007 to be returned

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

per run, failing ALL mysql_real_connect() calls - nobody noticed,
the test always appeared to "pass".

scripts/make_binary_distribution.sh:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-5.1-new.b14527