into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint


sql/sql_lex.cc:
  Auto merged

Zero-length variables caused failures when using the length to look
up the name in a hash.  Instead, signal that no zero-length name can
ever be found and that to encounter one is a syntax error.


mysql-test/r/variables.result:
  Results for test.
mysql-test/t/variables.test:
  Insert tests to prove that zero-length variable names do not cause
  faults.
sql/gen_lex_hash.cc:
  If the length is zero, then there is nothing to look-up in the 
  hash.
sql/sql_lex.cc:
  Names of variables must not be empty.  Signal an error of that 
  happens.

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

 - Change $d to $libs as suggested.
 - Thanks to Michael Prohm for the patch!


config/ac-macros/openssl.m4:
  Replace $d with $libs as suggested in bug report.

into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-17926

SIGINT is handled in funny ways on windows, which could lead to problems when
Control-C was pressed in the client during a long-running query.  Now Control-C
during a query aborts that query (by sending KILL to the server on a second
connexion), while Control-C outside of a running query terminates the client.


client/mysql.cc:
  Bug#17926: mysql.exe crashes when ctrl-c is pressed in windows
  
  Rather than tear down the client right away, open a second connexion to server
  on SIGINT and send a KILL for the first connexion.  Only if we receive another
  SIGINT before the KILL goes through (or if no query was running in the first
  place) do we terminate the client.

into  mysql.com:/home/hartmut/projects/mysql/dev/5.0-bug14995

tests/mysql_client_test.c:
  Add printout describing what master.log is to be opened.
  Add printout about statements that are found in the log.

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

  manual merge


mysql-test/r/grant.result:
  manual merge

into  mysql.com:/home/tnurnberg/work/mysql-5.0-maint-20214


mysql-test/r/grant.result:
  manual merge
mysql-test/t/grant.test:
  manual merge

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

  declared in the 'for' statement is not portable, some compilers
  still don't implement this ANSI C++ specification (Bug #14995)

sql/mysqld.cc:
  Corrected debug message.

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

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

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

   - Thanks to cerber for the patch!


server-tools/instance-manager/portability.h:
  Define SHUT_RDWR also on Unixware 7

now takes mbmaxlen into account when calculating max_length of new field. 

"A SELECT privilege on a view is required for SHOW CREATE VIEW and it will stay
that way because of compatibility reasons." (see #20136)

a test case to illustrate how the ACLs work in this case (and ensure they will continue
to do so in the future)


mysql-test/r/grant.result:
  Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
  
  a test case to illustrate how the ACLs work in this case (and ensure they will continue
  to do so in the future)
mysql-test/t/grant.test:
  Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
  
  a test case to illustrate how the ACLs work in this case (and ensure they will continue
  to do so in the future)

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


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  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

client/mysqldump.c:
  Remove double error printout, mysql_query_with_error_report will do that. And set the exit code for us.
mysql-test/r/mysqldump.result:
  Update test result after merge

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


mysql-test/t/mysqlbinlog.test:
  Null merge

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


client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  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
client/mysqldump.c:
  Manual merge
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/t/mysqldump.test:
  Manual merge

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


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/func_group.result:
  Merge manually
mysql-test/t/func_group.test:
  Merge manually

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

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


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-16502

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/r/udf.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
mysql-test/t/udf.test:
  Manual merge.

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


client/mysql.cc:
  Auto merged