Post merge changes
sql_yacc.yy:
  Post merge changes
sql_select.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions (post merge changes).
   The function add_key_fields() is modified. There cannot be NOT before
   BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
   now [NOT]BETWEEN/IN expressions.

into  mysql.com:/home/alexi/dev/mysql-5.0-0

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

  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   The classes Item_func_between, Item_func_if, Item_func_in are modified.
   Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions.
   The class Item_func_opt_neg is added to factor out the functionality
   common for the modified classes Item_func_between and Item_func_in.
item_cmpfunc.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   Added Item_func_between::fix_fields(), Item_func_if::fix_fields(),
   Item_func_in::fix_fields(). They correct generic calculation of
   the not_null_tables attribute when it is needed.
   Modified Item_func_between::val_int(), Item_func_in::val_int().
opt_range.cc:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   The function get_mm_tree() is modified. There cannot be NOT before
   BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
   now [NOT]BETWEEN/IN expressions.
sql_yacc.yy:
  Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
   for some expressions.
   Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions.
join_outer.result:
  Fixed some testcases results (bugs #12101, #12102)
join_outer.test:
  Added testcases for bugs #12101, #12102

 - Common error handling regardless of --ps-protocol or not.

  after merge fix

into  mysql.com:/usr/home/bar/mysql-5.0

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

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

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

 - Update test cases

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

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

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

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

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

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

  bug#9948
  changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  after review fixes

into dl145b.mysql.com:/home/ndbdev/mysql-4.1

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

added parseable printout in ndb_restore

  Test case for bug #12859 group_concat in subquery cause incorrect not null.

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

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

TRASH macro confliciting with TRASH in my_sys.h

+ added option to dumpe rest of page after exnd of data

into  hundin.mysql.fi:/home/jan/new/mysql-5.0

  Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement