into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


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

 - Fix for ndb_gis to run with all types of logging


mysql-test/include/gis_generic.inc:
  Make the test tables for gis have a primary key with auto increment
mysql-test/r/archive_gis.result:
  Update test result
mysql-test/r/bdb_gis.result:
  Update test result
mysql-test/r/innodb_gis.result:
  Update test result
mysql-test/r/ndb_gis.result:
  Update test result
mysql-test/t/ndb_gis.test:
  Remove the requirement to only run thiswhen binlog format is row.

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

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 lmy004.:/work/mysql-5.1-bug16406

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged

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

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

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

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

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


sql/event_timed.cc:
  Auto merged

into mysql.com:/home/hf/work/mysql-5.1.mrg

sql_partition.cc:
  Changeing THD charset to utf8 when parsing a frm file.
partition_charset.test, partition_charset.result:
  new file


sql/sql_partition.cc:
  Bug#14527: Partitions: table unreadable if partition name = c-cedilla
  Changering THD charset to utf8 when parsing
  a frm file.

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

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


sql/item_xmlfunc.cc:
  Auto merged
mysql-test/r/xml.result:
  After merge fix
mysql-test/t/xml.test:
  After merge fix

into mysql.com:/home/hf/work/mysql-5.1.mrg


mysql-test/r/bigint.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

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


mysql-test/mysql-test-run.sh:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

restore CREATE TABLE ... TYPE=engine until 5.2

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

 - Fix test case for systems with "lowercase names" 


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

 - Add "storage/csv" to directories to be copied


scripts/make_win_src_distribution.sh:
  Add "storage/csv" to directories to be copied(removed duplicated storage/example)

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged

- redo log table query for log, split into separate entries per rename, to avoid duplicates, also to only log renames that relate to ndb tables


sql/ha_ndbcluster_binlog.h:
  Bug #17827  	cluster: rename of several tables in one statement, gets multiply logged

This test is being performed by:
1. ctype_cp932_binlog_row.test  and  2. ctype_cp932_binlog_stm.test
Both of these source the file extra/binlog_tests/ctype_cp932_binlog.test


BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Delete: mysql-test/t/ctype_cp932_notembedded.test
BitKeeper/deleted/.del-ctype_cp932_notembedded.result~f8bc6ad0446e82e3:
  Delete: mysql-test/r/ctype_cp932_notembedded.result

mysql-test/r/binlog_row_insert_select.result:
  Corrected result file

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new

mysql-test/mysql-test-run.sh:
  binlog_stm_mix_innodb_my depends on umask

BUG#17780: Incorrect result file.  (Test for that part is extra/binlog_tests/binlog_row_ctype_cp932.test)


mysql-test/r/binlog_row_ctype_cp932.result:
  Corrected result file

WL#1034


mysql-test/t/events_logs_tests-master.opt:
  Rename: mysql-test/t/events_slow_query-master.opt -> mysql-test/t/events_logs_tests-master.opt
sql/event_timed.cc:
  ask the anonymous SP to log general statements
sql/sp_head.cc:
  save the OPTION_LOG_OFF and restore it after execution
sql/sp_head.h:
  add a new flag for general log
mysql-test/r/events_logs_tests.result:
  update result file
mysql-test/t/events_logs_tests.test:
  add test for general log

into  shellback.(none):/home/msvensson/mysql/mysql-5.1


sql/sql_db.cc:
  Auto merged
strings/decimal.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  shellback.(none):/home/msvensson/mysql/mysql-5.1

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

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