into  kite-hub.kitebird.com:/tmp/merge-5.0


sql/set_var.cc:
  Auto merged

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


sql/handler.h:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-bug12720

into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_delete.cc:
  After merge fix.

into mysql.com:/home/psergey/mysql-5.0-bug12720


sql/opt_range.cc:
  Auto merged

into  mysql.com:/home/timka/mysql/src/5.0-bug-12672

into  127.(none):/home/osku/mysql-5.0

sql/ha_innodb.cc:
  Add 'value' parameter to reset_auto_increment.
sql/ha_innodb.h:
  Add 'value' parameter to reset_auto_increment.
sql/handler.h:
  Add 'value' parameter to reset_auto_increment.
sql/mysql_priv.h:
  Add 'reset_auto_increment' parameter to mysql_delete.
sql/sql_delete.cc:
  Add 'reset_auto_increment' parameter to mysql_delete, and use it instead
  of checking for SQLCOM_TRUNCATE.
  
  mysql_truncate: Adapt to changes in mysql_delete.
sql/sql_parse.cc:
  mysql_execute_command: Adapt to changes in mysql_delete.

into  mysql.com:/home/timka/mysql/src/5.0-bug-12672

into  mysql.com:/home/mydev/mysql-5.0-5000

into  127.(none):/home/osku/mysql-5.0

into  eel.(none):/home/jonas/src/mysql-5.0-push

into  eel.(none):/home/jonas/src/mysql-5.0-push

into  eel.(none):/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

 fix typo


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo

into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/sql_table.cc:
  Auto merged

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

doesn't continue reading the last range.


mysql-test/r/index_merge_innodb.result:
  Testcase for BUG#12720
mysql-test/t/index_merge_innodb.test:
  Testcase for BUG#12720

mysql-test/t/archive.test:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/r/archive.result:
  Result sets
sql/examples/ha_archive.cc:
  Update for tests
sql/examples/ha_archive.h:
  Updated from merge, added new method for solving truncate problems.

mysql-test/r/archive.result:
  Update for test case to make sure that TRUNCATE and DELETE function(hah!) as designed.
mysql-test/t/archive.test:
  Add TRUNCATE and DELETE support.
sql/examples/ha_archive.cc:
  Added delete_all_rows() support.
sql/examples/ha_archive.h:
  Added delete_all_rows() support.
sql/handler.h:
  Added flags for fast delete support for archive and federated.

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into lmy004.:/work/mysql-5.0-clean

BitKeeper/deleted/.del-factory.h~c1679505d3a6dd53:
  Delete: server-tools/instance-manager/factory.h
BitKeeper/deleted/.del-factory.cc~6836cccd4cd35b4d:
  Delete: server-tools/instance-manager/factory.cc
server-tools/instance-manager/Makefile.am:
  - remove Commands_factory: it'll be needed when we add support
  for NNTP/HTTP connections, currently it only adds unnecessary
  complexity.
server-tools/instance-manager/commands.cc:
  - fix coding style: no else after return; fix comments, make
  one place a bit faster.
server-tools/instance-manager/guardian.cc:
  - fix coding style and comments.
  - we must register the current thread in the thread registry
    before entering pthread_cond_timedwait, because at shutdown
    the thread registry will try to kick out of wait all blocked 
    threads. Unregistered threads are not awakened by the registry. 
    This fixes the failinig assert in Thread_registry::~Thread_registry
    at shutdown, when shutdown is requested and there is an
    instance monitored by Guardian.
server-tools/instance-manager/guardian.h:
  - fix coding style: enums must start with enum_
server-tools/instance-manager/instance.h:
  - move comment to the variable it comments
server-tools/instance-manager/instance_map.cc:
  - cleanup
server-tools/instance-manager/instance_options.cc:
  - cleanup; no else after return (fix coding style).
server-tools/instance-manager/manager.cc:
  - fix alignment; make some code easier to read.
server-tools/instance-manager/mysql_connection.cc:
  - remove Commands_factory
server-tools/instance-manager/options.cc:
  - fix a possible crash when the instance manager is started with
  --no-defaults --defaults-file=~/.my.cnf: if we return
  without cloning saved_argv by calling load_defaults, Options::cleanup
  will crash on attempt to free_defaults(saved_argv);
server-tools/instance-manager/parse.cc:
  - get rid of Commands_factory
server-tools/instance-manager/parse.h:
  - get rid of Commands_factory
server-tools/instance-manager/parse_output.cc:
  - in parse_output_and_get_value return error also if the specified
    pattern was not found, or the command failed to execute.
server-tools/instance-manager/portability.h:
  - fix coding style (// comments are allowed only at ends of lines)
server-tools/instance-manager/thread_registry.cc:
  - implement Thread_registry::cond_timedwait
server-tools/instance-manager/thread_registry.h:
  - implement Thread_registry::cond_timedwait; remove
    unused out parameter from Thread_registry::cond_wait.
server-tools/instance-manager/user_map.cc:
  - safety: newline can take 2 bytes.

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into  mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_yacc.yy:
  Auto merged

mysql-test/r/innodb.result:
  After merge fix.
  Test for bug 11816 has four more inserts.

causes ERROR 2013).
(all-in-one approved patch)


mysql-test/r/alter_table.result:
  result for test for bug #12207
  (alter table discard database works on mysiam and causes error 2013)
mysql-test/t/alter_table.test:
  test for bug #12207 (alter table discard tablescpae on MyISAM table
  causes ERROR 2013)
sql/sql_table.cc:
  send all error message to table->file->print_error() thus not missing
  handing of some (like engine not supported).
  
  fix for bug #12207 (alter table discard tablespace on MyISAM table
  causes ERROR 2013)

into  mysql.com:/home/jimw/my/mysql-5.0-clean

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


sql/item.h:
  don't merge bug#12371 fix into 5.0.
  It's correct only for 4.1.

into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.0-5000


myisam/mi_search.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/innodb.result:
  Hand merged.
mysql-test/r/key.result:
  Hand merged.
mysql-test/r/myisam.result:
  Hand merged.
mysql-test/t/key.test:
  Hand merged.
mysql-test/t/myisam.test:
  Hand merged.
sql/sql_delete.cc:
  Hand merged.
sql/sql_parse.cc:
  Hand merged.

Added a switch to reject illegal values for PACK_KEYS.


mysql-test/r/myisam.result:
  Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
  The test result.
mysql-test/t/myisam.test:
  Bug#10056 - PACK_KEYS option take values greater than 1 while creating table
  The test case.

Skipping deleted records instead of breaking the loop
during checksum calculation.


mysql-test/r/myisam.result:
  Bug#12296 - CHECKSUM TABLE reports 0 for the table
  The test result.
mysql-test/t/myisam.test:
  Bug#12296 - CHECKSUM TABLE reports 0 for the table
  The test case.

Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.


mysql-test/r/innodb.result:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  The test result.
mysql-test/t/innodb.test:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  The test case.
sql/sql_delete.cc:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  Handle temporary tables like permanent tables: If the storage engine
  cannot truncate, delete instead.
  Replaced a numeric literal by its symbolic name.

Supplied the default database name for ALTER TABLE ... RENAME 
for the new table instead of the old tables db like we do for 
other ALTERs.


mysql-test/r/alter_table.result:
  Bug#11493 - Alter table rename to default database does not work without db name qualifying
  The test result.
mysql-test/t/alter_table.test:
  Bug#11493 - Alter table rename to default database does not work without db name qualifying
  The test case.

Changed end-space comparison so that the key is not used past
its end. This is due to the new end-space behaviour in 4.1.
See also bug 6151 and 9188.


mysql-test/r/key.result:
  Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
  The test result.
mysql-test/t/key.test:
  Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
  The test case.

mysql-test/r/group_min_max.result:
  Test for BUG#12672.
mysql-test/t/group_min_max.test:
  Test for BUG#12672.
sql/opt_range.cc:
  Some storage managers like InnoDB always retrieve the value of
  the primary key (if any) with any other key. For such storage
  managers the optimizer marks an index as covering if that index
  and the primary key contain all query fields. This is good for
  reading data from an index, but not for lookup. The patch detects
  such cases and tests whether an index is really a covering index
  by itself, without the primary key. If yes, then that index can
  be used for the index skip algorithm of the GROUP_MIN_MAX
  access method.