into  mysql.com:/usr/home/bar/mysql-4.1.b13046

into moonbone.local:/work/13356-bug-4.1-mysql

resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.

This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.


sql/item.cc:
  Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
  
  Added section to resolve_const_item() for Item_row items. If it can it
  recursively calls resolve_const_item() for each item the Item_row contains. If
  any of the contained items is null then Item_row is substituted by Item_null.
  Otherwise it just returns.
  Comment moved closer to function it belongs to.
mysql-test/t/select.test:
  Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.
mysql-test/r/select.result:
  Test case for bug#13356 resolve_const_item() wasn't able to handle Item_row items.

acl_init".

Updated calls to acl_init()/grant_init() in init_embedded_server() - their
signatures were changed recently, now they don't need argument for passing
pointer to THD object (this code was only compiled if one built embedded
server library with --with-embedded-privilege-control switch).


libmysqld/lib_sql.cc:
  acl_init/grant_init() are now used only at server start up so they always
  allocate temporary THD object and don't need argument for passing pointer
  to it.

into  mysql.com:/users/lthalmann/bk/mysql-4.1-max

into  mysql.com:/home/mydev/mysql-4.1-4100

into  mysql.com:/home/mydev/mysql-4.1-4100

client/mysql.cc:
  Don't use c_ptr() for cgets() and ensure buffer is not overwritten
mysql-test/r/cast.result:
  More test for CAST(0x.... as signed)
sql/opt_sum.cc:
  Fix bugs found during review
  - Changed code to be able to remove one if
  - Ensure that count == 0 only if is_exact_count == TRUE
sql/sql_delete.cc:
  Ensure 'allow_sum_func' is reset before call to setup_conds
sql/sql_lex.cc:
  allow_sum_func doesn't have to be reset for each query
  (It's to be reset in setup_fields() or before call to setup_conds()
sql/sql_load.cc:
  Move set of auto_increment_field_not_null so that it's not set if field value is NULL
sql/sql_prepare.cc:
  allow_sum_func doesn't have to be reset for each query
  (It's to be reset in setup_fields() or before call to setup_conds()
sql/sql_update.cc:
  Ensure 'allow_sum_func' is reset before call to setup_conds

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++


scripts/mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
client/mysqltest.c:
  Windows pclose() returns error code in low byte
Makefile.am:
  Revert to shell test script for test targets

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

into mysql.com:/home/psergey/mysql-4.1-bug13419

  Fix out-of-order status variable.


sql/mysqld.cc:
  Fix out-of-order status variable.

After merge fix

not equivalent to "x=y" when item->negated == TRUE.


mysql-test/r/func_in.result:
  Testcase for BUG#13419
mysql-test/t/func_in.test:
  Testcase for BUG#13419
sql/sql_select.cc:
  Fix for BUG#13419:
  * Take into account that item=Item_func_in(x,y) is not equivalent to "x=y" when 
    item->negated == TRUE.
  * Removed comment that is no longer true.

into  mysql.com:/home/mydev/mysql-4.1-4100


myisam/mi_dbug.c:
  Auto merged
myisam/mi_rkey.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisammrg/myrg_rkey.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Manual merge
mysql-test/r/merge.result:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Manual merge
mysql-test/t/merge.test:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Manual merge

The problem was an ab-use of last_rkey_length.
Formerly we saved the packed key length (of the search key)
in this element. But in certain cases it got replaced by 
the (packed) result key length.
Now we use a new element of MI_INFO to save the packed key 
length of the search key.


myisam/mi_dbug.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Fixed the recognition of NULL values in _mi_print_key().
myisam/mi_rkey.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Saved the packed key length in a new element of MI_INFO.
myisam/mi_search.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Added a comment and trace prints.
myisam/myisamdef.h:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Added a new element to store the packed key length
  for use by the MyISAMMRG engine.
myisammrg/myrg_rkey.c:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  Changed to use the new element of MI_INFO to get at the
  packed key length.
mysql-test/r/merge.result:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The test result.
mysql-test/t/merge.test:
  Bug#9112 - Merge table with composite index producing invalid results with some queries
  The test case.

into  mysql.com:/usr/home/bar/mysql-4.1.b13046

client/mysqltest.c:
  Set query_executed also for eval, that results in a query being executed and output is likely.

into  mysql.com:/usr/home/ram/work/4.1.b11553

into mysql.com:/home/gluh/MySQL/Merge/4.1

  set auto_increment_field_not_null to true to preserve zero values
  for autoincrement fields during LOAD DATA execution if 
  NO_AUTO_VALUE_ON_ZERO sql mode is set


mysql-test/r/loaddata.result:
  Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
    test case
mysql-test/t/loaddata.test:
  Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
    test case

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

  ndb big alter table


mysql-test/r/ndb_alter_table.result:
  Add testcase for bug#13316
mysql-test/t/ndb_alter_table.test:
  Add testcase for bug#13316

into  mysql.com:/usr/home/ram/work/4.1.b11553


sql/sql_yacc.yy:
  Auto merged

sql/sql_yacc.yy:
  a fix (#11553: gives error if aggregate user-defined function in HAVING clause).
  udf_sum_expr_list rule introduced and used for aggregate udf functions:            
    - call inc_in_sum_expr() before udf_expr_list parsing                            
      (as in_sum_expr rule does).

  ndb alter table with big dicttabinfo
  send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  DictTabInfo used during alter table can easily becom larger than MAX_MESSAGE_SIZE
    send fragmented instead

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push

ndb/src/ndbapi/Ndbinit.cpp:
  fix gcc4 compile problem

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean


zlib/ChangeLog:
  Auto merged
zlib/FAQ:
  Auto merged
zlib/README:
  Auto merged
zlib/crc32.c:
  Auto merged
zlib/deflate.c:
  Auto merged
zlib/deflate.h:
  Auto merged
zlib/gzio.c:
  Auto merged
zlib/infback.c:
  Auto merged
zlib/inffast.c:
  Auto merged
zlib/inflate.c:
  Auto merged
zlib/inftrees.c:
  Auto merged
zlib/inftrees.h:
  Auto merged
zlib/trees.c:
  Auto merged
zlib/zconf.h:
  Auto merged
zlib/zlib.3:
  Auto merged
zlib/zlib.h:
  Auto merged
zlib/zutil.h:
  Auto merged

into moonbone.local:/work/13180-bug-4.1-mysql

thd->allow_sum_func was left 'true' after previous statement thus allowing
sum funcs to be present in conditions.

thd->allow_sum_func should be set to 0 for each query and each prepared
statement reinitialization. This is done in lex_start() and 
reset_stmt_for_execute().


sql/sql_lex.cc:
  Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
  thd->allow_sum_func is set to 0 in lex_start().
sql/sql_prepare.cc:
  Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
  thd->allow_sum_func is set to 0 in  reset_stmt_for_execute().
mysql-test/t/update.test:
  Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
  processing.
mysql-test/r/update.result:
  Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
  processing.

             index doesn't return correct result
item_cmpfunc.cc:
  Use charset of LIKE to decide whether
  to use 8bit or Unicode "escape" value.
  But use charset of "escape" to scan escape character.
strings/ctype-xxx.c:
  We cannot reduce "end" pointer using charpos(),
  because of possible escape characters in the string.
  Limit the loop using count of written characters instead.
ctype_like_escape.inc:
  new file
mysql-test/t/ctype_xxx:
mysql-test/r/ctype_xxx:
  Adding test case.


strings/ctype-big5.c:
  Bug#13046: LIKE pattern matching using prefix index doesn't return correct result
  We cannot change "end" pointer using charpos(),
  because of possible escape characters.
  Use limit by count of written characters instead.
strings/ctype-cp932.c:
  Bug#13046: LIKE pattern matching using prefix index doesn't return correct
  result
  We cannot change "end" pointer using charpos(),
  because of possible escape characters.
  Use limit by count of written characters instead
strings/ctype-gbk.c:
  Bug#13046: LIKE pattern matching using prefix index doesn't return correct
  result
  We cannot change "end" pointer using charpos(),
  because of possible escape characters.
  Use limit by count of written characters instead
strings/ctype-mb.c:
  Bug#13046: LIKE pattern matching using prefix index doesn't return correct
  result
  We cannot change "end" pointer using charpos(),
  because of possible escape characters.
  Use limit by count of written characters instead
strings/ctype-simple.c:
  Bug#13046: LIKE pattern matching using prefix index doesn't return correct
  result
  We cannot change "end" pointer using charpos(),
  because of possible escape characters.
  Use limit by count of written characters instead
strings/ctype-sjis.c:
  Bug#13046: LIKE pattern matching using prefix index doesn't return correct
  result
  We cannot change "end" pointer using charpos(),
  because of possible escape characters.
  Use limit by count of written characters instead
strings/ctype-tis620.c:
  Bug#13046: LIKE pattern matching using prefix index doesn't return correct
  result
  We cannot change "end" pointer using charpos(),
  because of possible escape characters.
  Use limit by count of written characters instead
strings/ctype-ucs2.c:
  Bug#13046: LIKE pattern matching using prefix index doesn't return correct
  result
  We cannot change "end" pointer using charpos(),
  because of possible escape characters.
  Use limit by count of written characters instead
mysql-test/t/ctype_big5.test:
  Adding test case.
mysql-test/t/ctype_cp932.test:
  Adding test case.
mysql-test/t/ctype_gbk.test:
  Adding test case.
mysql-test/t/ctype_latin1.test:
  Adding test case.
mysql-test/t/ctype_sjis.test:
  Adding test case.
mysql-test/t/ctype_tis620.test:
  Adding test case.
mysql-test/t/ctype_uca.test:
  Adding test case.
mysql-test/t/ctype_ucs.test:
  Adding test case.
mysql-test/t/ctype_ujis.test:
  Adding test case.
mysql-test/t/ctype_utf8.test:
  Adding test case.
mysql-test/r/ctype_big5.result:
  Adding test case.
mysql-test/r/ctype_cp932.result:
  Adding test case.
mysql-test/r/ctype_gbk.result:
  Adding test case.
mysql-test/r/ctype_latin1.result:
  Adding test case.
mysql-test/r/ctype_sjis.result:
  Adding test case.
mysql-test/r/ctype_tis620.result:
  Adding test case.
mysql-test/r/ctype_uca.result:
  Adding test case.
mysql-test/r/ctype_ucs.result:
  Adding test case.
mysql-test/r/ctype_ujis.result:
  Adding test case.
mysql-test/r/ctype_utf8.result:
  Adding test case.
sql/item_cmpfunc.cc:
  More fixes.

into  mysql.com:/home/timka/mysql/src/4.1-dbg