into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/timezone_grant.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/lex.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  Manual merge.
mysql-test/t/disabled.def:
  Manual merge.
mysql-test/t/rpl_insert_id.test:
  Manual merge.
sql/item_func.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge - not complete yet.

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

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


sql/ha_ndbcluster.cc:
  Auto merged

client/mysql.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
BitKeeper/deleted/.del-innodb_unsafe_binlog-master.opt~9cbe1bb3d8696c5b:
  Auto merged
mysql-test/t/rpl_stm_until.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.h:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged

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

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

mysql-test/r/innodb.result:
  Corrected from manual merge.  I know the numbers are right (it's a 
  7,7-seeded fibbonaci sequence), but I don't know how I missed the latter 
  line.

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

Merge by hand.  This may not be right.


mysql-test/r/innodb.result:
  Merge by hand.  (Yay, vimdiff)
mysql-test/t/innodb.test:
  Merge by hand.  (Yay, vimdiff)

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-new


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/rpl_view-slave.opt:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/myisam/mi_packrec.c:
  Manual merge: use local, since this fix should be moved into mi_dynmap_file().

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

Fix for Bug #17840  mysqldump should not dump tables in database cluster, skip cluster internal database


client/mysqldump.c:
  Fix for Bug #17840  mysqldump should not dump tables in database , skip cluster internal database

into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1


configure.in:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/share/errmsg.txt:
  merge

into  mysql.com:/home/alexi/innodb/mysql-5.1

into  mysql.com:/home/alexi/innodb/mysql-5.1


sql/ha_innodb.cc:
  Auto merged
mysql-test/r/innodb.result:
  Hand-merge
mysql-test/t/innodb.test:
  Hand_merge

into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge


sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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


mysql-test/r/innodb.result:
  SCCS merged
mysql-test/t/innodb.test:
  SCCS merged

* Fix BUG#15650: "DELETE with LEFT JOIN crashes server with innodb_locks_unsafe_for binlog"
* Fix BUG#17134: "Partitions: uncommitted changes are visible"
* Fix BUG#17992: "Partitions: InnoDB, somehow rotten table after UPDATE"
  row0ins.c: MySQL's partitioned table code does not set preduilt->sql_stat_start right
  if it does an insert in the same statement after doing a search first in the same
  partition table. We now write trx id always to the buffer, not just when flag
  sql_stat_start is on. This will waste CPU time very sightly.
* Fix BUG#18077: "InnoDB uses full explicit table locks in stored FUNCTION"
* Fix BUG#18238: "When locks exhaust the buffer pool, InnoDB does not roll back the trx"
* Fix BUG#18252" "Disk space leak in updates of InnoDB BLOB rows in 5.0 and 5.1"
* Fix BUG#18283: "When InnoDB returns error 'lock table full', MySQL can write to binlog too much"
* Fix BUG#18350: "Use consistent read in CREATE ... SELECT ... if innodb_locks_unsafe_for_binlog"
* Fix BUG#18384: "InnoDB memory leak on duplicate key errors in 5.0 if row has many columns"
* Fix BUG#18934: "InnoDB crashes when table uses column names like DB_ROW_ID"
  Refuse tables that use reserved column names.
* InnoDB's SQL parser:
  - Add support for UNSIGNED types, EXIT keyword, quoted identifiers, user-function callbacks
    for processing results of FETCH statements, bound literals, DATA_VARCHAR for bound literals.
  - Allow bound literals of type non-INTEGER to be of length 0.
  - Add make_flex.sh and update lexer/parser generation documentation.
  - Add comment clarifying the difference between 'alias' and 'indirection' fields in sym_node_t.
  - Remove never reached duplicate code in pars_set_dfield_type().
  - Rewrite pars_info datatypes and APIs, add a few helper functions.
  - Since the functions definitions in pars_info_t are accessed after pars_sql() returns
    in the query graph execution stage, we can't free pars_info_t in pars_sql(). Instead,
    make pars_sql() transfer ownership of pars_info_t to the created query graph, and
    make que_graph_free() free it if needed.
  - Allow access to system columns like DB_ROW_ID.
* Use bound literals in row_truncate_table_for_mysql, row_drop_table_for_mysql,
  row_discard_tablespace_for_mysql, and row_rename_table_for_mysql.
* Setting an isolation level of the transaction to read committed weakens the locks for
  this session similarly like the option innodb_locks_unsafe_for binlog. This patch removes
  alnost all gap locking (used in next-key locking) and makes MySQL to release the row locks
  on the rows which does not belong to result set. Additionally, nonlocking selects on
  INSERT INTO SELECT, UPDATE ... (SELECT ...), and CREATE ... SELECT ... use a nonlocking
  consistent read. If a binlog is used, then binlog format should be set to row based
  binloging to make the execution of the complex SQL statements.
* Disable the statistic variables btr_search_n_hash_fail and n_hash_succ, n_hash_fail,
  n_patt_succ, and n_searches of btr_search_t in builds without #ifdef UNIV_SEARCH_PERF_STAT.
* Make innodb.test faster. Group all consistent read test cases to a one test case and
  wait their lock timeout after all have been send to the server. Decrease amount of rows
  inserted in a certain test - this has no effect on the effectiveness of the test and
  reduces the running time by ~10 sec. Remove temporary work-arounds from innodb.result
  now that ALTER TABLE DROP FOREIGN KEY works once again.
* Make innodb_unsafe_binlog.test faster. Grout all consistent read test cases to a one
  test case amd wait their lock timeout after all have been sent to the server. Remove
  unnecessary option --loose_innodb_lock_wait_timeout.
* Print dictionary memory size in SHOW INNODB STATUS.
* Fix memory leaks in row_create_table_for_mysql() in rare corner cases.
* Remove code related to clustered tables. They were never implemented, and the
  implementation would be challenging with ROW_FORMAT=COMPACT. Remove the table types
  DICT_TABLE_CLUSTER_MEMBER and DICT_TABLE_CLUSTER and all related tests and functions.
  dict_table_t: Remove mix_id, mix_len, mix_id_len, mix_id_buf, and cluster_name.
  plan_t: Remove mixed_index.
  dict_create_sys_tables_tuple(): Set MIX_ID=0, MIX_LEN=0, CLUSTER_NAME=NULL when
  inserting into SYS_TABLES.
  dict_tree_check_search_tuple(): Enclose in #ifdef UNIV_DEBUG.
* Move calling of thr_local_free() from trx_free_for_mysql() to
  innobase_close_connection().


mysql-test/r/innodb.result:
  Applied innodb-5.1-ss475 snapshot.
mysql-test/r/innodb_unsafe_binlog.result:
  Applied innodb-5.1-ss475 snapshot.
mysql-test/t/innodb-master.opt:
  Applied innodb-5.1-ss475 snapshot.
mysql-test/t/innodb.test:
  Applied innodb-5.1-ss475 snapshot.
mysql-test/t/innodb_unsafe_binlog-master.opt:
  Applied innodb-5.1-ss475 snapshot.
mysql-test/t/innodb_unsafe_binlog.test:
  Applied innodb-5.1-ss475 snapshot.
sql/ha_innodb.cc:
  Applied innodb-5.1-ss475 snapshot.
   Do not use inlined functions in ha_innodb.cc.
   Remove assertion ut_error which crashes the mysqld server
   if it prints a warning about the adaptive latch.
storage/innobase/Makefile.am:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/btr/btr0btr.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/btr/btr0cur.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/btr/btr0pcur.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/btr/btr0sea.c:
  Applied innodb-5.1-ss475 snapshot.
   Fix compilation problem with non-C99 compilers.
storage/innobase/buf/buf0lru.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/cmakelists.txt:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/configure.in:
  Applied innodb-5.1-ss475 snapshot.
   Add disabled-by-default logic to switch GCC to a strict C89-mode.
   Add -Werror-implicit-function_declaration to CFLAGS when using gcc.
storage/innobase/data/data0type.c:
  Applied innodb-5.1-ss475 snapshot.
   dtype_print(): Recognize DATA_FIXBINARY and DATA_BLOB types.
   Print known flags from prtype. Use a switch statement instead
   of else-if chain.
storage/innobase/dict/dict0crea.c:
  Applied innodb-5.1-ss475 snapshot.
   Use bound literals in all SQL statements instead of elaborately
   constructing correctly allocated and quoted strings to pass the
   data in ASCII form.
storage/innobase/dict/dict0dict.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/dict/dict0load.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/dict/dict0mem.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/eval/eval0proc.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/ibuf/ibuf0ibuf.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/btr0cur.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/btr0cur.ic:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/btr0sea.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/buf0lru.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/dict0dict.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/dict0dict.ic:
  Applied innodb-5.1-ss475 snapshot.
   Remove too strict assertions from some dict_table_t
   accessor functions.
storage/innobase/include/dict0mem.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/eval0proc.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/hash0hash.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/lock0lock.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/mem0mem.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/page0page.ic:
  Applied innodb-5.1-ss475 snapshot.
   Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
storage/innobase/include/pars0grm.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/pars0pars.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/pars0sym.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/pars0types.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/que0que.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/row0mysql.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/row0sel.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/row0upd.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/trx0trx.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/univ.i:
  Applied innodb-5.1-ss475 snapshot.
   Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
   When using GCC, use __inline__ instead of inline.
storage/innobase/include/ut0mem.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/lock/lock0lock.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/log/log0recv.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/mem/mem0dbg.c:
  Applied innodb-5.1-ss475 snapshot.
   Add (void*) cast when using the %p printf format specifier.
storage/innobase/mem/mem0mem.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/os/os0sync.c:
  Applied innodb-5.1-ss475 snapshot.
   Add (void*) cast when using the %p printf format specifier.
storage/innobase/pars/lexyy.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/pars/make_bison.sh:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/pars/pars0grm.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/pars/pars0grm.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/pars/pars0grm.y:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/pars/pars0lex.l:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/pars/pars0opt.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/pars/pars0pars.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/pars/pars0sym.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/que/que0que.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/row/row0ins.c:
  Applied innodb-5.1-ss475 snapshot.
   Remove a memory leak when trying to insert a duplicate record to a
   clustered inedx comprising more than about 90 columns (Bug#18384).
   row_ins_duplicate_error_in_clust(): Call mem_heap_free(heap) at
   func_exit if needed.
storage/innobase/row/row0mysql.c:
  Applied innodb-5.1-ss475 snapshot.
   row_mysql_is_system_table(): Use strncmp, not memcmp, since we
   don't know how long the input string is.
storage/innobase/row/row0sel.c:
  Applied innodb-5.1-ss475 snapshot.
   Remove UNIV_RELEASE_NOT_YET_STABLE and related checks.
   row_sel_field_store_in_mysql_format(): Turn the assertions on
   mbminlen, mbmaxlen, and templ->type into debug assertions.
   fetch_step(): Print a more usefull error message when the cursor is closed.
storage/innobase/row/row0upd.c:
  Applied innodb-5.1-ss475 snapshot.
   row_upd_index_replace_new_col_vals_index_pos(): Add a parameter
   order_only for limiting the replacement to the ordering fields
   of the index.
storage/innobase/srv/srv0srv.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/sync/sync0arr.c:
  Applied innodb-5.1-ss475 snapshot.
   Add (void*) cast when using the %p printf format specifier.
storage/innobase/sync/sync0rw.c:
  Applied innodb-5.1-ss475 snapshot.
   Add (void*) cast when using the %p printf format specifier.
storage/innobase/sync/sync0sync.c:
  Applied innodb-5.1-ss475 snapshot.
   Add (void*) cast when using the %p printf format specifier.
storage/innobase/trx/trx0trx.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/ut/Makefile.am:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/ut/ut0mem.c:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/ut0vec.h:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/include/ut0vec.ic:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/pars/make_flex.sh:
  Applied innodb-5.1-ss475 snapshot.
storage/innobase/ut/ut0vec.c:
  Applied innodb-5.1-ss475 snapshot.

into  mysql.com:/opt/local/work/mysql-5.1-merge

into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/mysqld.cc:
  Manual merge.
sql/sp_head.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.

mysql-test/t/rpl_view-slave.opt:
  Post-merge fix

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge


sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge

Fixed merge issue


sql/sql_partition.cc:
  Added some debug printouts
sql/sql_table.cc:
  Fixed merge issue

into  mysql.com:/home/dlenev/mysql-5.0-bg15153-2

Error was emitted when one tried to select information from view which used
merge algorithm and which also had CONVERT_TZ() function in its select list.

This bug was caused by wrong assumption that global table list for view
which is handled using merge algorithm begins from tables belonging to
the main select of this view. Nowadays the above assumption is not true only
when one uses convert_tz() function in view's select list, but in future
other cases may be added (for example we may support merging of views
with subqueries in select list one day). Relying on this false assumption
led to the usage of wrong table list for field lookups and therefor errors. 

With this fix we explicitly use pointer to the beginning of main select's
table list.


mysql-test/r/timezone_grant.result:
  Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in
  all places in VIEWs" that checks that usage of CONVERT_TZ() function in view
  does not require additional privileges.
mysql-test/r/view.result:
  Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in 
  VIEWs".
mysql-test/t/timezone_grant.test:
  Added additional test case for bug#15153 "CONVERT_TZ() is not allowed in
  all places in VIEWs" that checks that usage of CONVERT_TZ() function in view
  does not require additional privileges.
mysql-test/t/view.test:
  Added test case for bug#15153 "CONVERT_TZ() is not allowed in all places in 
  VIEWs".
sql/sql_view.cc:
  mysql_make_view():
    We should not assume that global table list for view which is handled using
    merge algorithm begins from tables belonging to the main select of this
    view. Nowadays the above assumption is not true only when one uses
    convert_tz() function in view's select list, but in future other cases
    may be added (for example we may support merging of views with subqueries
    in select list one day). So let us instead explicitly use pointer to the
    beginning of main select's table list.

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge


sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


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

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge

  Make InnoDB option "loose", as the server might be
  started with this option just to find out the test
  is to be skipped in the configuration (bug#17359)


mysql-test/t/innodb_unsafe_binlog-master.opt:
  Make InnoDB option "loose", as the server might be
  started with this option just to find out the test
  is to be skipped in the configuration (bug#17359)

client/mysql.cc:
  Auto merged

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge


sql/sql_repl.cc:
  Auto merged
sql/ha_innodb.cc:
  Manual merge 5.0 -> 5.1
sql/ha_innodb.h:
  Manual merge 5.0 -> 5.1
sql/handler.cc:
  Manual merge 5.0 -> 5.1
sql/handler.h:
  Manual merge 5.0 -> 5.1
sql/mysqld.cc:
  Manual merge 5.0 -> 5.1
sql/set_var.cc:
  Manual merge 5.0 -> 5.1
sql/sql_class.h:
  Manual merge 5.0 -> 5.1