into mysql.com:/home/wax/mysql/mysql-4.1mysqltest


client/mysqltest.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged

porting mysql_test_run on Linux and Windows


client/mysqltest.c:
  added windows code
mysql-test/Makefile.am:
  added code of creating make file
mysql-test/r/fulltext.result:
  added FORMAT() for compatible with Windows version
mysql-test/r/fulltext_cache.result:
  added FORMAT()
mysql-test/r/fulltext_multi.result:
  added FORMAT()
mysql-test/r/fulltext_order_by.result:
  added FORMAT()
mysql-test/r/type_float.result:
  added --replace-result
mysql-test/t/fulltext.test:
  added FORMAT()
mysql-test/t/fulltext_cache.test:
  added FORMAT()
mysql-test/t/fulltext_multi.test:
  added FORMAT()
mysql-test/t/fulltext_order_by.test:
  added FORMAT()
mysql-test/t/innodb.test:
  added --replace-result
mysql-test/t/insert.test:
  added --replace_result
mysql-test/t/type_float.test:
  added --replace-result
mysql-test/t/variables.test:
  added --replace_result

into mysql.com:/home/wax/mysql/mysql-4.1group_concat


sql-common/client.c:
  Auto merged

  fix typos noticed while poking around in test program.


tests/client_test.c:
  fix typos noticed while poking around in test program.

  Changed label on INFORMATION log items to NOTE


sql/log.cc:
  Changed label on INFORMATION log items to NOTE

Statements": 
- fix a couple of net->buff overruns in libmysql,
- check in the server that statement parameter count is less than
  65535 (maximum value supported by prepared statements protocol).
 


libmysql/libmysql.c:
  Bug#5194 "Bulk Insert Failures with Prepared Statements":
  - clean up my_realloc_str()
  - ensure that net buffer has space when storing null bits and
    parameter typecodes.
sql/net_serv.cc:
  - set net->last_errno if packet is too big, even on client
    (Why was it ifdefed before?)
sql/sql_prepare.cc:
  Bug#5194 "Bulk Insert Failures with Prepared Statements":
  - if placeholder count is bigger than 65535, give error.
    We have only 2 bytes reserved for transferring placeholder count
    in 4.1 protocol.
  - can't add a proper error code and message in 4.1 because of
    possible merge difficulties."
tests/client_test.c:
  A test case for Bug#5194 "Bulk Insert Failures with Prepared 
  Statements".

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into mysql.com:/dbdata/psergey/mysql-4.1-bug-grp

Don't evaluate the value of GROUP_CONCAT several times for the same 'group', reuse the value instead.


mysql-test/r/group_by.result:
   Testcase for bug#5400
mysql-test/t/group_by.test:
   Testcase for bug#5400

  Print sqlstate value in batch mode, not just in interactive mode.


client/mysql.cc:
  Print sqlstate value in batch mode, not just in interactive mode.

sql/mysqld.cc:
  mlockall() call hided behind !defined(EMBEDDED_LIBRARY).

 server" (use my_charset_bin for stmt id hash).


sql/sql_class.cc:
  Fix for bug#5399 "Wrong statement executed by MySQL server": 
  we hash stmt ids bytewise, need to use binary collation for it.
tests/client_test.c:
  Test case for bug#5399 "Wrong statement executed by MySQL server":
  create number of statements returning different results, execute them
  one by one.

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

  Added test case for bug #5406.
opt_sum.cc:
  Fixed bug #5406.


sql/opt_sum.cc:
  Fixed bug #5406.
mysql-test/r/func_group.result:
  Added test case for bug #5406.
mysql-test/t/func_group.test:
  Added test case for bug #5406.

mysql-test/r/rpl_set_charset.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_set_charset.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/slave.cc:
  Auto merged

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

  Added newline at the end of file.


mysql-test/t/select.test:
  Added newline at the end of file.

BitKeeper/etc/ignore:
  auto-union
client/mysqlcheck.c:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/sql_analyse.cc:
  Auto merged

into mysql.com:/home/mysql_src/mysql-4.0

This does not fix any known bug, but is still a good idea.


sql/log_event.cc:
  when we update thd->db in replication, it's safer to update thd->db_length too.
sql/slave.cc:
  when we update thd->db in replication, it's safer to update thd->db_length too.
sql/sql_db.cc:
  comment

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205

mysql-test/r/rpl_set_charset.result:
  result update
mysql-test/t/rpl_set_charset.test:
  clean up on slave too.

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


sql/sql_parse.cc:
  Auto merged

into deer.(none):/home/hf/work/mysql-4.1.5371

libmysql/libmysql.c:
  Code trimmed

into neptunus.(none):/home/magnus/mysql/mysql-4.1

mysql-test/r/ndb_insert.result:
  Add tests for duplicate keys in combination with start/end_bulk_insert
mysql-test/t/ndb_insert.test:
  Add tests for duplicate keys in combination with start/end_bulk_insert
sql/ha_ndbcluster.cc:
  Set my_errno if error occurs in end_bulk_insert

stack)
We just don't expect BIG buffer to be sent for just a double


libmysql/libmysql.c:
  We shouldn't fall if the buffer_length is bigger than 330

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

into mysql.com:/home/mysql_src/mysql-4.0

As I cannot be 100% sure that there won't be issues with some of our exotic platforms
(who knows if the charset of <obscure old OS> will play fair?), I'll send an email to the build guys.
Well, this holds if bk does not crash on binary chars of this cset.