sql_parse.cc:
mysqld.cc:

  Added --skip-client-character-set-handshake.
  When this option is activated, client side character set
  (which is sent in handshake) is ignored, and server side
  default-character-set value is used for character_set_client
  and character_set_results, thus reprodicing 4.0 behaviour.


sql/mysqld.cc:
  bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  Added --skip-client-character-set-handshake, 
  to reproduce 4.0 behaviour.
sql/sql_parse.cc:
  bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  Added --skip-client-character-set-handshake,
  to reproduce 4.0 behaviour.

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

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

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

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

include/my_alloc.h:
  Fix incorrect spelling
mysql-test/t/rpl000009.test:
  Fix incorrect spelling
mysql-test/t/system_mysql_db_fix.test:
  Fix incorrect spelling
sql/sql_table.cc:
  Fix incorrect spelling
tests/mysql_client_test.c:
  Fix incorrect spelling

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

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

Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
was converting string field to blob depending on byte-wise length instead of
character length, which results in converting valid varchar string with
length == 86 to longtext.

Made that functions above take into account max width of character when
converting string fields to blobs.


sql/item.cc:
  Fix bug #12537 UNION produces longtext instead of varchar
  Item::tmp_table_field_from_field_type() now taking into account max char width when creating tmp field for string fields.
sql/sql_select.cc:
  Fix bug #12537 UNION produces longtext instead of varchar
   create_tmp_field_from_item()now taking into account max char width when creating tmp field for string fields.
mysql-test/r/create.result:
  Test case for bug #12537 UNION produces longtext instead of varchar
mysql-test/t/create.test:
  Test case for bug #12537 UNION produces longtext instead of varchar

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

into  mysql.com:/home/mydev/mysql-4.1-4100

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


sql/set_var.cc:
  Auto merged

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

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

 fix typo


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

into  mysql.com:/home/mydev/mysql-4.1-4100

  Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!


sql/ha_blackhole.cc:
  Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!

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

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.

  Added missing DBUG enter, compiled and tested on production with debug-max
  build (my regular build missed the previous errors friday)

Changeset:
 Added missing DBUG_ENTER, compiled and tested on production with debug-max
 build!



sql/ha_blackhole.cc:
  Added missing DBUG enter, compiled and tested on production with debug-max build (my regular build missed the previous errors friday)
  C

into  mysql.com:/home/mydev/mysql-4.1-4100

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

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.

  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.


sql/item.cc:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
mysql-test/t/ctype_utf8.test:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
mysql-test/r/ctype_utf8.result:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.

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


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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Make ports configurable from environment for test


Makefile.am:
  Make ports configurable from environment for test

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

  Reorder out-of-order system variables.


sql/set_var.cc:
  Reorder out-of-order system variables.

  Reorder out-of-order status variables.


sql/mysqld.cc:
  Reorder out-of-order status variables.

into deer.(none):/home/hf/work/mysql-4.1.clean

sql/ha_blackhole.cc:
  Typo to DBUG_RETURN fixed

sql/set_var.cc:
  workaround (bug #9613: Some read-only variables are selectable, others are not).
  sys_have_innodb variable added.

into  radha.local:/Users/patg/mysql-build/mysql-4.1

sql/ha_blackhole.cc:
  Blackhole Lock changes to blackhole per Brian, reapplied
sql/ha_blackhole.h:
  blackhold lock changes added per brian