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


sql/ha_ndbcluster.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

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

win/cmakefiles/mysys:
  Remove no longer existing source file from list.
sql/log_event.cc:
  Fix byte * <-> char * Windows build problem.
VC++Files/mysys/mysys.vcproj:
  Remove no longer existing source file from list.

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

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


sql/field.h:
  Auto merged

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


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

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


sql/handler.h:
  Auto merged

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

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

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

into  devsrv-b.mysql.com:/space/magnus/bug17279/my51-bug17279


sql/sql_acl.cc:
  Auto merged

sql/sql_class.cc:
  fixed code caused superfluous protocol->remove_last_row() call

into  zim.(none):/home/brian/mysql/dep-5.1

mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Fixing isssues with preexisting tables
mysql-test/r/binlog_stm_insert_select.result:
  new results

into  mysql.com:/users/lthalmann/bk/mysql-5.0-bug13418


sql/field.h:
  Auto merged

into  mysql.com:/home/dlenev/src/mysql-5.1-merges2


mysql-test/t/trigger.test:
  Auto merged

sql/field.h:
  Virtualized some functions so that Bit_field class will use correct cmp functions

bug #13525 "Rename table does not keep info of triggers".

Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
vardir. Also improved cleanup after the test.


mysql-test/t/trigger.test:
  Now we use MYSQLTEST_VARDIR in order to be able to run this test in different
  vardir. Also improved cleanup after the test.

into  mysql.com:/home/dlenev/src/mysql-5.1-merges2


sql/sql_base.cc:
  Auto merged

into  mysql.com:/home/dlenev/src/mysql-5.1-merges2


client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
sql/sql_rename.cc:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525

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


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged

into  mysql.com:/home/dlenev/src/mysql-5.0-bg13525


sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_select.h:
  Manual merge.

into  mysql.com:/home/psergey/mysql-5.0-bug17314-push

sql/ha_ndbcluster_binlog.cc:
  Correcting use of bad variable in merge.
sql/sql_base.cc:
  Removing assertion check for mutex in table share.

 - Use 'poll' if available
 - Check that sd <= FD_SETSIZE if using 'select'
 - Handle case when 'net_data_is_ready' returns -1, ie. sd > FD_SETSIZE and 'select' is used 


sql/net_serv.cc:
  Use 'poll' in favor of 'select' if avaliable
  This is to avoid the limitation with 'select' only being able to handle fd's with numbers <= 1024 as default.
  If 'poll' is not available use 'select' but check that we are not having a number higher than FD_SETSIZE
  Handle the case when 'net_data_is_ready' can't check if there is data to read, since the sd number is too high

 - Use binary charset in acl_cache, to make searches case sensitive
 - Add testcase 


mysql-test/r/grant2.result:
  Update test result
mysql-test/t/grant2.test:
  Add test case for bug#17279, checking that user with access to TESTDB can't create TEStdb
sql/sql_acl.cc:
  Use binary charset for the acl_cache to make the hash lookups case sensitive.
  Thus denying user with access to "TESTDB" access to "TEStdb"

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

- Removed ifdefs from handler class
- The handler class is an external interface to dynamically loadable storage engine and should not be changed by defines. This is especially important for the virtual functions. 


sql/handler.h:
  Remove the ifdef's for WITH_PARTITION_STORAG_ENGINE from handler class.

 - Change && to ||
 - Check for return value != 0 in "ndb->init()"


mysql-test/r/ndb_cache_multi2.result:
  Update test result
mysql-test/t/ndb_cache_multi2.test:
  Update test case
  - add printouts for what server the queries are from
  - Run the query from "while" once on server1 to cache it
sql/ha_ndbcluster.cc:
  && => ||, to call both the function "thd->store_global()" and "ndb->init()" 
  ndb_init returns 0 on sucess. Fail if not zero.

 - Set FD_SETSIZE before including "sys/select.h"


include/my_global.h:
  Define FD_SETSIZE on QNX before including "sys/select.h" or "sys/time.h". This defines number of bits in fd_set type used for 'select'

into mysql.com:/home/psergey/mysql-5.0-bug17314

into  mysql.com:/home/bk/fix-mysql-5.1-release


sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged

xml.result:
  Adding test for Bug #16312 XML: extractvalue() crash if angle brackets,
  A fix for #16234 fixed this bug automatically.


mysql-test/t/xml.test:
  Adding test for Bug #16312 XML: extractvalue() crash if angle brackets,
  A fix for #16234 fixed this bug automatically.

mysql-test/mysql-test-run.pl:
  Let mysqlcheck have it's own trace file

into  mysql.com:/home/my/mysql-5.1