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


mysql-test/r/ndb_dd_backuprestore.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

 - Add "not in version before" commensta around new syntax "WITH PARSER" and "TABLESPACE xxx STORAGE DISK"
 


mysql-test/r/ndb_dd_advance.result:
  Update result file
mysql-test/r/ndb_dd_advance2.result:
  Update result file
mysql-test/r/ndb_dd_backuprestore.result:
  Update result file
mysql-test/r/ndb_dd_basic.result:
  Update result file
mysql-test/r/ndb_dd_disk2memory.result:
  Update result file
sql/sql_show.cc:
  Add "not in version before"  comments around "WITH PARSER xxx" and "TABLESPACE xxx STORAGE DISK"
  Use STRING_WITH_LEN when adding fixed string AUTO_INCREMENT= to output from SHOW TABLE

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

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


dbug/dbug.c:
  Auto merged
configure.in:
  SCCS merged

configure.in:
  Exclude
dbug/dbug.c:
  Exclude

into  maint1.mysql.com:/data/localhome/tsmith/bk/51

into  siva.hindu.god:/usr/home/tim/m/bk/51


sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/beef-51


mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/beef-50


mysql-test/r/func_misc.result:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge
sql/item_func.h:
  Manual merge
sql/item_strfunc.cc:
  Manual merge

- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors


mysql-test/r/func_misc.result:
  Test EXPORT_SET() with charset coersion (bug #21531)
mysql-test/t/func_misc.test:
  Test EXPORT_SET() with charset coersion (bug #21531)
sql/item_func.h:
  Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors.
sql/item_strfunc.cc:
  Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


BitKeeper/etc/ignore:
  auto-union
sql/gen_lex_hash.cc:
  Auto merged

BitKeeper/etc/ignore:
  Added sql/f.c to the ignore list

into  siva.hindu.god:/usr/home/tim/m/bk/51


sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/b20536-51


sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

sql/slave.cc:
  Auto merged

Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).

Also, convert an sql_print_error -> sql_print_information for a non-error server event.


sql/slave.cc:
  Change sql_print_error to sql_print_information for non-error status message.
sql/sql_acl.cc:
  Remove sql_print_error calls for events which are not server errors

into  siva.hindu.god:/usr/home/tim/m/bk/51


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged

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


sql/sql_lex.cc:
  Auto merged

into  maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Manual merge.

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  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint


sql/sql_lex.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


sql/mysqld.cc:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21757


tests/mysql_client_test.c:
  Auto merged
client/mysqltest.c:
  manual merge.

tests/mysql_client_test.c:
  Replace fopen with my_fopen and specify O_BINARY. Replace fclose with my_fclose.

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


tests/mysql_client_test.c:
  Auto merged

on up-merging 17926 from 5.0 tree it collides with near-identical fix 1989
in 5.1 tree. backing 17926 out of 5.1 tree.


client/mysql.cc:
  Bug#17926 duplicates Bug#1989 in bug db
  
  back 17926 out of 5.1 tree

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint


sql/ha_innodb.cc:
  null
storage/innobase/btr/btr0btr.c:
  null
storage/innobase/buf/buf0buf.c:
  null
storage/innobase/dict/dict0dict.c:
  null
storage/innobase/fil/fil0fil.c:
  null
storage/innobase/fsp/fsp0fsp.c:
  null
storage/innobase/include/btr0cur.ic:
  null
storage/innobase/include/buf0buf.ic:
  null
storage/innobase/log/log0log.c:
  null
storage/innobase/log/log0recv.c:
  null
storage/innobase/os/os0file.c:
  null
storage/innobase/row/row0mysql.c:
  null
storage/innobase/row/row0sel.c:
  null
storage/innobase/srv/srv0start.c:
  null
storage/innobase/ut/ut0dbg.c:
  null

innodb r719


innobase/btr/btr0btr.c:
  innodb r702
innobase/buf/buf0buf.c:
  innodb r702
innobase/dict/dict0dict.c:
  innodb r702
innobase/fil/fil0fil.c:
  innodb r702
innobase/fsp/fsp0fsp.c:
  innodb r702
innobase/include/btr0cur.ic:
  innodb r719
innobase/include/buf0buf.ic:
  innodb r702
innobase/log/log0log.c:
  innodb r702
innobase/log/log0recv.c:
  innodb r702
innobase/os/os0file.c:
  innodb r702
innobase/row/row0mysql.c:
  innodb r702
innobase/row/row0sel.c:
  innodb r702
innobase/srv/srv0start.c:
  innodb r702
innobase/ut/ut0dbg.c:
  innodb r702
sql/ha_innodb.cc:
  innodb r702

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1

instance.cc:
  Removed wrongly placed closing brace
item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*


server-tools/instance-manager/instance.cc:
  Removed wrongly placed closing brace
sql/item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1

BitKeeper/deleted/.del-readme-renamed:
  Rename: BitKeeper/deleted/.del-readme -> BitKeeper/deleted/.del-readme-renamed

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged