sql/item.cc:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged

into  zim.(none):/home/brian/mysql/mysql-5.0

This patch restores sync_binlog.


sql/set_var.cc:
  restoring sync_binlog variable

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

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

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work

mysql-test/r/innodb_mysql.result:
  Fix result.

  clone-off for 5.0.21


configure.in:
  clone-off for 5.0.21

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work


mysql-test/t/innodb.test:
  Auto merged

 Use files innodb_mysql.[test|result] instead.


mysql-test/t/innodb.test:
  This file is to be used by Innobase only.
mysql-test/r/innodb_mysql.result:
  New BitKeeper file ``mysql-test/r/innodb_mysql.result''
   Use this file instead of innodb.result.
mysql-test/t/innodb_mysql.test:
  New BitKeeper file ``mysql-test/t/innodb_mysql.test''
   Use this file instead of innodb.test.

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged

 Fixed BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".


innobase/dict/dict0load.c:
  Applied innodb-5.0-ss492 snapshot.
   dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
   SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).

(reported by Stefano Di Paola)

into mysql.com:/home/psergey/mysql-5.0-bug15827-r2

too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that
strictly include the area to scan
(Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big 
IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated)


mysql-test/r/func_in.result:
  Testcase for BUG#15872
mysql-test/t/func_in.test:
  Testcase for BUG#15872
sql/item.cc:
  BUG#15872: Added Item_decimal::set_decimal_value()
sql/item.h:
  UG#15872: Added Item_decimal::set_decimal_value()
sql/item_cmpfunc.h:
  BUG#15872: Added in_vector::create_item(), in_vector::value_to_item() and their implementations in concrete
  classes.
sql/opt_range.cc:
  BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that 
  consumes too much memory. Instead, either 
   A) create the equivalent SEL_TREE manually, making use of the fact that item_not_in->array
      has an ordered IN-list, or
   B) create only two ranges: (-inf|NULL) < X < min_value_from_in_list,  max_value_from_in_list < X
  (Choose #B if the IN-list has > 10K elements)

small cleanup fixes in kernel/vm/Configuration


ndb/src/kernel/vm/Configuration.cpp:
  clean up m_logLevel
  
  free the connectstring if we allocated one

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


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

  Handle early abort of scan, so that resources are correctly freed


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Handle early abort
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle early abort so that require on running.empty() does not fire

into moonbone.local:/work/18739-bug-5.0-mysql

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/data0/knielsen/mysql-5.0-mtr-fix

into  mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/case.result:
  SCCS merged

  After merge fix for bug#18739


mysql-test/t/having.test:
  After merge fix for bug#18739

sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/mysql-test-run.pl:
  Fix typo.

into  mysql.com:/data0/knielsen/mysql-4.1-mtr-fix

into mysql.com:/M50/mysql-5.0

into  production.mysql.com:/usersnfs/rkalimullin/4.1.b17896

into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0

into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0