into  siva.hindu.god:/home/tsmith/m/bk/maint/41

into  mysql.com:/d2/hf/mrg/mysql-4.1-opt

into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-opt

are used as arguments of the IN predicate.
Added a function to check compatibility of row expressions. Made sure that this
function to be called for Item_func_in objects by fix_length_and_dec().


mysql-test/r/row.result:
  Added a test case for bug #27484.
mysql-test/t/row.test:
  Added a test case for bug #27484.

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

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

  fix commit trigger on multi-update


ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix commit trigger on multi-update

into  mysql.com:/home/kent/bk/tmp3/mysql-4.1-build

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

into  trift2.:/MySQL/M41/push-4.1

into  mysql.com:/d2/hf/mrg/mysql-4.1-opt

Usage:
  query_sorted <query>;


client/mysqltest.c:
  Add query_sorted command to mysqltest
mysql-test/r/mysqltest.result:
  Update result
mysql-test/t/mysqltest.test:
  Add tests for query_sorted

Cleanup exit handling

  configure.in.rej
  include/my_global.h.rej
  BUILD/SETUP.sh.rej
  mysys/thr_alarm.c.rej
  include/my_pthread.h.rej


BitKeeper/deleted/.del-SETUP.sh.rej:
  Delete: BUILD/SETUP.sh.rej
BitKeeper/deleted/.del-configure.in.rej:
  Delete: configure.in.rej
BitKeeper/deleted/.del-my_global.h.rej:
  Delete: include/my_global.h.rej
BitKeeper/deleted/.del-my_pthread.h.rej:
  Delete: include/my_pthread.h.rej
BitKeeper/deleted/.del-thr_alarm.c.rej:
  Delete: mysys/thr_alarm.c.rej

   - length($sockdir) >= 80 !!


mysql-test/mysql-test-run.pl:
  Change check to create a tmp file for socket if length($sockdir) >= 80 !!

error code indicating test should be skipped

"if with query" and "while with query"

IN/BETWEEN predicates in sorting expressions.
Wrong results may occur when the select list contains an expression
with IN/BETWEEN predicate that differs from a sorting expression by
an additional NOT only.
 
Added the method Item_func_opt_neg::eq to compare correctly expressions
containing [NOT] IN/BETWEEN.
The eq method inherited from the Item_func returns TRUE when comparing
'a IN (1,2)' with 'a NOT IN (1,2)' that is not, of course, correct.  


mysql-test/r/order_by.result:
  Added a test case for bug #27532.
mysql-test/t/order_by.test:
  Added a test case for bug #27532.
sql/item_cmpfunc.cc:
  Fixed bug #27532.
  Added the method Item_func_opt_neg::eq to compare correctly expressions
  containing [NOT] IN/BETWEEN.
  The eq method inherited from the Item_func returns TRUE when comparing
  'a IN (1,2)' with 'a NOT IN (1,2)' that is not, of course, correct.
sql/item_cmpfunc.h:
  Added the method Item_func_opt_neg::eq to compare correctly expressions
  containing [NOT] IN/BETWEEN.
  The eq method inherited from the Item_func returns TRUE when comparing
  'a IN (1,2)' with 'a NOT IN (1,2)' that is not, of course, correct.

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

myisam/mi_open.c:
  Exclude
mysql-test/r/create.result:
  Exclude
mysql-test/t/create.test:
  Exclude
sql/table.cc:
  Exclude

into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt

Pushbuild fixes: 
 - Make MAX_SEL_ARGS smaller (even 16K records_in_range() calls is 
   more than it makes sense to do in typical cases)
 - Don't call sel_arg->test_use_count() if we've already allocated 
   more than MAX_SEL_ARGs elements. The test will succeed but will take
   too much time for the test suite (and not provide much value).


mysql-test/r/range.result:
  BUG#26624: high mem usage (crash) in range optimizer
  Pushbuild fixes: make the test go faster
mysql-test/t/range.test:
  BUG#26624: high mem usage (crash) in range optimizer
  Pushbuild fixes: make the test go faster

into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

 - GRANT and REVOKE statments didn't have the "updating" flag set and
   thus statements with a table specified would not replicate if
   slave filtering rules where turned on.
   For example "GRANT ... ON test.t1 TO ..." would not replicate.


mysql-test/r/rpl_ignore_table.result:
  Add test results
mysql-test/t/rpl_ignore_table.test:
  Add tests
sql/sql_yacc.yy:
  Pass option TL_OPTION_UPDATING to 'add_table_to_list' when parsing a
  GRANT or REVOKE and a table specifier is found. This will set the
  property "updating" on the table and thus the slave filtering rules will 
  be applied.
  
  Without setting updating the statement will be not
  replicated - since "it's not updating anything" - an optimization
  to quickly skip SELECT's and similar.

 - Post-review fixes

Thanks to Martin Friebe for finding and submitting a fix for this bug!

A table with maximum number of key segments and maximum length key name
would have a corrupted .frm file, due to an incorrect calculation of the
complete key length.  Now the key length is computed correctly (I hope) :-)

MyISAM would reject a table with the maximum number of keys and the maximum
number of key segments in all keys.  It would allow one less than this total
maximum.  Now MyISAM accepts a table defined with the maximum.  (This is a
very minor issue.)


myisam/mi_open.c:
  change >= to > in a comparison (i.e., error only if key_parts_in_table
  really is greater than MAX_KEY * MAX_KEY_SEG)
mysql-test/r/create.result:
  Add test results for bug #26642 (create index corrupts table definition in .frm)
mysql-test/t/create.test:
  Add test case for bug #26642 (create index corrupts table definition in .frm)
sql/table.cc:
  In create_frm(), fix formula for key_length; it was too small by (keys * 2) bytes

into  mysql.com:/home/psergey/mysql-4.1-bug26624-r2

- Added PARAM::alloced_sel_args where we count the # of SEL_ARGs
  created by SEL_ARG tree cloning operations.
- Made the range analyzer to shortcut and not do any more cloning 
  if we've already created MAX_SEL_ARGS SEL_ARG objects in cloning.
- Added comments about space complexity of SEL_ARG-graph 
  representation.


mysql-test/r/range.result:
  BUG#26624: Testcase
mysql-test/t/range.test:
  BUG#26624: Testcase

- Define Sql_alloc::operator new() as thow() so that C++ compiler
  handles NULL return values
(there is no testcase as there is no portable way to set limit on the 
amount of memory that a process can allocate)


sql/sql_list.h:
  BUG#26625: crash in range optimizer (out of mem) 
  - Define Sql_alloc::operator new() as thow() so that C++ compiler
    handles NULL return values

into  chilla.local:/home/mydev/mysql-4.1-axmrg