into  rama.(none):/home/jimw/my/mysql-5.0-16881


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  rama.(none):/home/jimw/my/mysql-5.0-19498

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

mysql-test/r/perror.result:
  Add error result for 1186
  Remove the result for the others
mysql-test/t/perror.test:
  As it's only just interesting to see that perror doesn't crash(and as result varies across platforms), send result to /dev/null

 - Since error 1186 is not found among NDB error codes, the message retuned should indicate that.


extra/perror.c:
  Move the !found out one level
mysql-test/t/perror.test:
  Add test case for bug#16561
ndb/src/kernel/error/ndbd_exit_codes.c:
  Check not only for zero size string but also classification "unknown error" when looking for an error mesage for an error code

 - Allow "query" to be used as a prefix for focing a command to be sent to server
 - Add testcases


client/mysqltest.c:
  To force something being sent as a query to the mysqld one can
  use the prefix "query". Remove "query" from string before executing.
mysql-test/r/mysqltest.result:
  Add test case for "query" command
mysql-test/t/mysqltest.test:
  Add test case for "query" command

 - Add test case


mysql-test/r/mysql.result:
  Update test result
mysql-test/t/mysql.test:
  Add test for mysql using DESC command

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

  - Add test case(execute perror)
  - Check if strerror has returned NULL and set msg to "Unknown Error" in that case
  - Thanks to Steven Xie for pointing out how to fix. 


extra/perror.c:
  strerror might return NULL on Solaris 2.8
mysql-test/mysql-test-run.pl:
  Add possibility to execute perror from test case
mysql-test/r/have_perror.require:
  New BitKeeper file ``mysql-test/r/have_perror.require''
mysql-test/r/perror.result:
  New BitKeeper file ``mysql-test/r/perror.result''
mysql-test/t/perror.test:
  New BitKeeper file ``mysql-test/t/perror.test''

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

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

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

 - Add printout in write_footer to tell that mysqldump has completed.
   Ex: -- Dump completed 2006-07-24  8:55:05


client/Makefile.am:
  Build mysqldump with mf_getdate.c
client/mysqldump.c:
  Add printout in write_footer that will print info that mysqldump has completed

into  mysql.com:/usr/home/ram/work/5.0.b19370

into  mysql.com:/usr/home/ram/work/5.0.b19370

into  mysql.com:/usr/home/ram/work/5.0.b8143

mysql-test/r/delete.result:
  Fix for bug #8143: A date with value 0 is treated as a NULL value
    - test result
mysql-test/t/delete.test:
  Fix for bug #8143: A date with value 0 is treated as a NULL value
    - test case
sql/sql_delete.cc:
  Fix for bug #8143: A date with value 0 is treated as a NULL value
    - during SELECT queries processing we convert 'date[time]_field is null' 
      conditions into 'date[time]_field = 0000-00-00[ 00:00:00]' for not null 
      DATE and DATETIME fields. To be consistent, we have to do the same for DELETE
      queries. So we should call remove_eq_conds() in the mysql_delete() as well.
      Also it may simplify and speed up DELETE queries execution.

into  mysql.com:/usr/home/ram/work/5.0.b19370


mysql-test/r/date_formats.result:
  Auto merged

into  mysql.com:/usr/home/ram/work/5.0.b10966


mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged

  This was only demonstrated by the use of PASSWORD(), it was not related to
  that function at all. The calculation of the size of a field in the results
  of a UNION did not take into account the possible growth of a string field
  when being converted to the aggregated character set.


mysql-test/r/union.result:
  Add new results
mysql-test/t/union.test:
  Add new regression test
sql/item.cc:
  Fix calculation of max_length when figuring out the type of a column in
  a UNION. It needs to take into account any expansion of field size due to
  charset conversions.

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

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

 - "set @@character_set_database" should be ignored by servers prior to 4.1.1


client/mysqlimport.c:
  Enclose "set @@character_set_databse=x" with comments that makes it be ignored by servers prior to 4.1.1

into  maint1.mysql.com:/data/localhome/msvensson/my50-bug19517

into  maint1.mysql.com:/data/localhome/msvensson/my50-bug19517


configure.in:
  Auto merged

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


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

"I want to have the current delimiter in the prompt so that I can know at 
a glance which is set."

Add a 'l' format specifier that represents the current statement delimiter.


client/mysql.cc:
  Add a 'l' prompt format specifier, which becomes the current delimiter
  string in the prompt.

  When a default of '' was specified for TEXT/BLOB columns, the specification
  was silently ignored. This is presumably to be nice to applications (or
  people) who generate their column definitions in a not-very-clever fashion.

  For clarity, doing this now results in a warning, or an error in strict
  mode.


mysql-test/r/federated.result:
  Update results
mysql-test/r/fulltext_distinct.result:
  Update results
mysql-test/r/fulltext_update.result:
  Update results
mysql-test/r/gis-rtree.result:
  Update results
mysql-test/r/gis.result:
  Update results
mysql-test/r/join_outer.result:
  Update results
mysql-test/r/order_by.result:
  Update results
mysql-test/r/type_blob.result:
  Add new results
mysql-test/r/type_ranges.result:
  Update results
mysql-test/t/type_blob.test:
  Add new test
sql/field.cc:
  Issue a warning when setting '' as the default on a BLOB/TEXT column,
  and make it an error in strict mode. Also, clarify comments about when
  NO_DEFAULT_VALUE_FLAG is set.

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/time.cc:
  Auto merged

into  rama.(none):/home/jimw/my/mysql-5.0-17903

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/time.cc:
  Manual merge

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql


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

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  production.mysql.com:/usersnfs/abotchkov/mysql-5.0.mrg

 - Add a check that length of field to uncompress is longer than 4 bytes.
   This can be dones as the length of uncompressed data is written as 
   first four bytes of field and thus it can't be valid compressed data.


mysql-test/r/func_compress.result:
  Update test results
sql/item_strfunc.cc:
  Is size of field is less than or equal to 4 bytes, indicate data is uncompressable/corrupt.

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


libmysqld/embedded_priv.h:
  Auto merged
sql-common/client.c:
  Auto merged
include/mysql.h:
  merging
libmysql/libmysql.c:
  merging
libmysqld/lib_sql.cc:
  merging
libmysqld/libmysqld.c:
  merging
sql/sql_parse.cc:
  merging

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

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

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


sql/sql_udf.cc:
  Auto merged