mysys/my_init.c:
  Move my_once_free() up to not get warnings for this from safemalloc.
sql/item_row.cc:
  Removed compiler warnings
sql/sql_select.cc:
  split fix_tables_pointer() into two functions to be able to reuse code
sql/sql_select.h:
  split fix_tables_pointer() into two functions to be able to reuse code

  memory leak fix
  I will move my_once_strdup to my_alloc.c later. 


mysys/charset.c:
  memory leak fix
  I will move my_once_strdup to my_alloc.c later.

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

  Reduce memory usage of the buffer headers
Many files:
  Merge InnoDB-4.1 with AWE support


sql/mysqld.cc:
  Merge InnoDB-4.1 with AWE support
sql/set_var.cc:
  Merge InnoDB-4.1 with AWE support
sql/ha_innodb.h:
  Merge InnoDB-4.1 with AWE support
sql/ha_innodb.cc:
  Merge InnoDB-4.1 with AWE support
innobase/btr/btr0cur.c:
  Merge InnoDB-4.1 with AWE support
innobase/btr/btr0pcur.c:
  Merge InnoDB-4.1 with AWE support
innobase/buf/buf0flu.c:
  Merge InnoDB-4.1 with AWE support
innobase/buf/buf0lru.c:
  Merge InnoDB-4.1 with AWE support
innobase/buf/buf0rea.c:
  Merge InnoDB-4.1 with AWE support
innobase/include/btr0pcur.h:
  Merge InnoDB-4.1 with AWE support
innobase/include/buf0lru.h:
  Merge InnoDB-4.1 with AWE support
innobase/include/log0recv.h:
  Merge InnoDB-4.1 with AWE support
innobase/include/os0proc.h:
  Merge InnoDB-4.1 with AWE support
innobase/include/srv0srv.h:
  Merge InnoDB-4.1 with AWE support
innobase/log/log0log.c:
  Merge InnoDB-4.1 with AWE support
innobase/log/log0recv.c:
  Merge InnoDB-4.1 with AWE support
innobase/os/os0file.c:
  Merge InnoDB-4.1 with AWE support
innobase/os/os0proc.c:
  Merge InnoDB-4.1 with AWE support
innobase/srv/srv0srv.c:
  Merge InnoDB-4.1 with AWE support
innobase/srv/srv0start.c:
  Merge InnoDB-4.1 with AWE support
innobase/trx/trx0sys.c:
  Merge InnoDB-4.1 with AWE support
innobase/trx/trx0trx.c:
  Merge InnoDB-4.1 with AWE support
innobase/ut/ut0ut.c:
  Merge InnoDB-4.1 with AWE support
innobase/include/buf0buf.h:
  Reduce memory usage of the buffer headers
innobase/include/buf0buf.ic:
  Reduce memory usage of the buffer headers
innobase/buf/buf0buf.c:
  Reduce memory usage of the buffer headers

mysql-test/t/ctype_many.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
acinclude.m4:
  Auto merged
include/mysql.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/table.cc:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print()



BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87:
  Delete: mysql-test/t/rpl000016-slave.opt
BitKeeper/deleted/.del-sel000001.test~9567c1646058cc:
  Delete: mysql-test/t/sel000001.test
BitKeeper/deleted/.del-sel000002.test~9f500639572e18e1:
  Delete: mysql-test/t/sel000002.test
BitKeeper/deleted/.del-sel000003.test~63a5512d18cd20a2:
  Delete: mysql-test/t/sel000003.test
BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86:
  Delete: mysql-test/r/sel000001.result
BitKeeper/deleted/.del-sel000002.result~d1787e6fd5dbc1cc:
  Delete: mysql-test/r/sel000002.result
BitKeeper/deleted/.del-sel000003.result~d7b657b1e3a286a7:
  Delete: mysql-test/r/sel000003.result
BitKeeper/deleted/.del-sel000031.result~d49aeac63ad7db4d:
  Delete: mysql-test/r/sel000031.result
BitKeeper/deleted/.del-sel000031.test~50a19a8e204e99bc:
  Delete: mysql-test/t/sel000031.test
BitKeeper/deleted/.del-sel000032.result~6cb30e23cbca9fb0:
  Delete: mysql-test/r/sel000032.result
BitKeeper/deleted/.del-sel000032.test~e32da7c3fc4b7ace:
  Delete: mysql-test/t/sel000032.test
BitKeeper/deleted/.del-rpl000003.result~68d6ee00beaa011:
  Delete: mysql-test/r/rpl000003.result
BitKeeper/deleted/.del-rpl000003.test~b7cfc4c5576fbafd:
  Delete: mysql-test/t/rpl000003.test
client/mysql.cc:
  Don't yet print information about SQL help
client/mysqltest.c:
  Added test options:
  --enable_warnings
  --disable_warnings
  --enable_info
  --disable_info
configure.in:
  changed version number of shared libraries
mysql-test/include/master-slave.inc:
  Don't write warnings on init
mysql-test/r/backup.result:
  Updated results
mysql-test/r/bdb.result:
  Updated results
mysql-test/r/bigint.result:
  Updated results
mysql-test/r/bool.result:
  Updated results
mysql-test/r/create.result:
  Updated results
mysql-test/r/delete.result:
  Updated results
mysql-test/r/derived.result:
  Updated results
mysql-test/r/distinct.result:
  Updated results
mysql-test/r/drop.result:
  Updated results
mysql-test/r/flush.result:
  Updated results
mysql-test/r/fulltext.result:
  Updated results
mysql-test/r/fulltext_multi.result:
  Updated results
mysql-test/r/fulltext_order_by.result:
  Updated results
mysql-test/r/func_equal.result:
  Updated results
mysql-test/r/func_in.result:
  Updated results
mysql-test/r/func_set.result:
  Updated results
mysql-test/r/gcc296.result:
  Updated results
mysql-test/r/group_by.result:
  Updated results
mysql-test/r/innodb-deadlock.result:
  Updated results
mysql-test/r/innodb.result:
  Updated results
mysql-test/r/innodb_cache.result:
  Updated results
mysql-test/r/innodb_handler.result:
  Updated results
mysql-test/r/insert.result:
  Updated results
mysql-test/r/insert_select.result:
  Updated results
mysql-test/r/isam.result:
  Updated results
mysql-test/r/join_outer.result:
  Updated results
mysql-test/r/key.result:
  Updated results
mysql-test/r/merge.result:
  Updated results
mysql-test/r/multi_update.result:
  Updated results
mysql-test/r/myisam.result:
  Updated results
mysql-test/r/null.result:
  Updated results
mysql-test/r/null_key.result:
  Updated results
mysql-test/r/odbc.result:
  Updated results
mysql-test/r/olap.result:
  Updated results
mysql-test/r/order_by.result:
  Updated results
mysql-test/r/query_cache.result:
  Updated results
mysql-test/r/rename.result:
  Updated results
mysql-test/r/row.result:
  Updated results
mysql-test/r/rpl000001.result:
  Updated results
mysql-test/r/rpl000002.result:
  Updated results
mysql-test/r/rpl000004.result:
  Updated results
mysql-test/r/rpl000005.result:
  Updated results
mysql-test/r/rpl000006.result:
  Updated results
mysql-test/r/rpl000008.result:
  Updated results
mysql-test/r/rpl000009.result:
  Updated results
mysql-test/r/rpl000010.result:
  Updated results
mysql-test/r/rpl000011.result:
  Updated results
mysql-test/r/rpl000012.result:
  Updated results
mysql-test/r/rpl000013.result:
  Updated results
mysql-test/r/rpl_alter.result:
  Updated results
mysql-test/r/rpl_empty_master_crash.result:
  Updated results
mysql-test/r/rpl_redirect.result:
  Updated results
mysql-test/r/rpl_replicate_do.result:
  Updated results
mysql-test/r/rpl_rotate_logs.result:
  Updated results
mysql-test/r/rpl_skip_error.result:
  Updated results
mysql-test/r/rpl_temporary.result:
  Updated results
mysql-test/r/select.result:
  Updated results
mysql-test/r/subselect.result:
  Updated results
mysql-test/r/temp_table.result:
  Updated results
mysql-test/r/type_date.result:
  Updated results
mysql-test/r/type_float.result:
  Updated results
mysql-test/r/union.result:
  Updated results
mysql-test/r/update.result:
  Updated results
mysql-test/r/user_var.result:
  Updated results
mysql-test/r/varbinary.result:
  Updated results
mysql-test/r/variables.result:
  Updated results
mysql-test/r/warnings.result:
  Updated results
mysql-test/t/alias.test:
  Don't write warnings when initializing test
mysql-test/t/alter_table.test:
  Don't write warnings when initializing test
mysql-test/t/analyse.test:
  Don't write warnings when initializing test
mysql-test/t/auto_increment.test:
  Don't write warnings when initializing test
mysql-test/t/backup.test:
  Don't write warnings when initializing test
mysql-test/t/bdb-alter-table-1.test:
  Don't write warnings when initializing test
mysql-test/t/bdb-crash.test:
  Don't write warnings when initializing test
mysql-test/t/bdb-deadlock.test:
  Don't write warnings when initializing test
mysql-test/t/bdb.test:
  Don't write warnings when initializing test
  cleaned up test
mysql-test/t/bdb_cache.test:
  Don't write warnings when initializing test
mysql-test/t/bench_count_distinct.test:
  Don't write warnings when initializing test
mysql-test/t/bigint.test:
  Don't write warnings when initializing test
mysql-test/t/binary.test:
  Don't write warnings when initializing test
mysql-test/t/bool.test:
  Don't write warnings when initializing test
  Changed to use standard table names
mysql-test/t/bulk_replace.test:
  Don't write warnings when initializing test
mysql-test/t/case.test:
  Don't write warnings when initializing test
mysql-test/t/check.test:
  Don't write warnings when initializing test
mysql-test/t/compare.test:
  Don't write warnings when initializing test
mysql-test/t/connect.test:
  Removed empty line
mysql-test/t/constraints.test:
  Don't write warnings when initializing test
mysql-test/t/count_distinct.test:
  Don't write warnings when initializing test
mysql-test/t/count_distinct2.test:
  Don't write warnings when initializing test
mysql-test/t/create.test:
  Don't write warnings when initializing test
  Cleaned up test
mysql-test/t/ctype_latin1_de.test:
  Don't write warnings when initializing test
mysql-test/t/ctype_many.test:
  Don't write warnings when initializing test
mysql-test/t/delayed.test:
  Don't write warnings when initializing test
mysql-test/t/delete.test:
  Don't write warnings when initializing test
  Cleaned up test
mysql-test/t/derived.test:
  Don't write warnings when initializing test
  Cleaned up test
mysql-test/t/dirty_close.test:
  Don't write warnings when initializing test
mysql-test/t/distinct.test:
  Don't write warnings when initializing test
  Cleaned up test
mysql-test/t/drop.test:
  Don't write warnings when initializing test
mysql-test/t/empty_table.test:
  Don't write warnings when initializing test
mysql-test/t/err000001.test:
  Don't write warnings when initializing test
  Cleaned up test
mysql-test/t/explain.test:
  Don't write warnings when initializing test
mysql-test/t/flush.test:
  Don't write warnings when initializing test
mysql-test/t/foreign_key.test:
  Don't write warnings when initializing test
mysql-test/t/fulltext.test:
  Don't write warnings when initializing test
mysql-test/t/fulltext_cache.test:
  Don't write warnings when initializing test
mysql-test/t/fulltext_distinct.test:
  Don't write warnings when initializing test
mysql-test/t/fulltext_left_join.test:
  Don't write warnings when initializing test
mysql-test/t/fulltext_multi.test:
  Don't write warnings when initializing test
mysql-test/t/fulltext_order_by.test:
  Don't write warnings when initializing test
mysql-test/t/fulltext_update.test:
  Don't write warnings when initializing test
mysql-test/t/func_concat.test:
  Don't write warnings when initializing test
mysql-test/t/func_date_add.test:
  Don't write warnings when initializing test
mysql-test/t/func_encrypt.test:
  Don't write warnings when initializing test
mysql-test/t/func_equal.test:
  Don't write warnings when initializing test
mysql-test/t/func_group.test:
  Don't write warnings when initializing test
mysql-test/t/func_if.test:
  Don't write warnings when initializing test
mysql-test/t/func_in.test:
  Don't write warnings when initializing test
mysql-test/t/func_isnull.test:
  Don't write warnings when initializing test
mysql-test/t/func_like.test:
  Don't write warnings when initializing test
mysql-test/t/func_regexp.test:
  Don't write warnings when initializing test
mysql-test/t/func_set.test:
  Don't write warnings when initializing test
  Merged test with other tests
mysql-test/t/func_str.test:
  Don't write warnings when initializing test
mysql-test/t/func_time.test:
  Don't write warnings when initializing test
mysql-test/t/func_timestamp.test:
  Don't write warnings when initializing test
mysql-test/t/gcc296.test:
  Don't write warnings when initializing test
  Cleaned up test
mysql-test/t/grant_cache.test:
  Don't write warnings when initializing test
mysql-test/t/group_by.test:
  Don't write warnings when initializing test
  Cleaned up test
mysql-test/t/handler.test:
  Don't write warnings when initializing test
mysql-test/t/having.test:
  Don't write warnings when initializing test
mysql-test/t/heap.test:
  Don't write warnings when initializing test
mysql-test/t/heap_auto_increment.test:
  Don't write warnings when initializing test
mysql-test/t/heap_btree.test:
  Don't write warnings when initializing test
mysql-test/t/heap_hash.test:
  Don't write warnings when initializing test
mysql-test/t/innodb-deadlock.test:
  Don't write warnings when initializing test
mysql-test/t/innodb.test:
  Don't write warnings when initializing test
mysql-test/t/innodb_cache.test:
  Don't write warnings when initializing test
mysql-test/t/innodb_handler.test:
  Don't write warnings when initializing test
mysql-test/t/ins000001.test:
  Don't write warnings when initializing test
mysql-test/t/insert.test:
  Don't write warnings when initializing test
  cleaned up test.
  Changed to use standard database and table names
mysql-test/t/insert_select.test:
  Don't write warnings when initializing test
  Changed to use standard table names
mysql-test/t/insert_update.test:
  Don't write warnings when initializing test
mysql-test/t/isam.test:
  Don't write warnings when initializing test
  cleaned up test
mysql-test/t/join.test:
  Don't write warnings when initializing test
mysql-test/t/join_crash.test:
  Don't write warnings when initializing test
mysql-test/t/join_outer.test:
  Don't write warnings when initializing test
mysql-test/t/key.test:
  Don't write warnings when initializing test
mysql-test/t/key_diff.test:
  Don't write warnings when initializing test
mysql-test/t/key_primary.test:
  Don't write warnings when initializing test
mysql-test/t/keywords.test:
  Don't write warnings when initializing test
mysql-test/t/kill.test:
  Don't write warnings when initializing test
mysql-test/t/limit.test:
  Don't write warnings when initializing test
mysql-test/t/lock.test:
  Don't write warnings when initializing test
mysql-test/t/lock_multi.test:
  Don't write warnings when initializing test
mysql-test/t/lowercase_table.test:
  Don't write warnings when initializing test
mysql-test/t/merge.test:
  Don't write warnings when initializing test
  cleaned up test
mysql-test/t/multi_update.test:
  Don't write warnings when initializing test
mysql-test/t/myisam.test:
  Don't write warnings when initializing test
mysql-test/t/null.test:
  Don't write warnings when initializing test
mysql-test/t/null_key.test:
  Don't write warnings when initializing test
mysql-test/t/odbc.test:
  Don't write warnings when initializing test
mysql-test/t/olap.test:
  Don't write warnings when initializing test
mysql-test/t/order_by.test:
  Don't write warnings when initializing test
mysql-test/t/order_fill_sortbuf.test:
  Don't write warnings when initializing test
mysql-test/t/query_cache.test:
  Don't write warnings when initializing test
mysql-test/t/raid.test:
  Don't write warnings when initializing test
mysql-test/t/range.test:
  Don't write warnings when initializing test
mysql-test/t/rename.test:
  Don't write warnings when initializing test
mysql-test/t/repair.test:
  Don't write warnings when initializing test
mysql-test/t/replace.test:
  Don't write warnings when initializing test
mysql-test/t/rollback.test:
  Don't write warnings when initializing test
mysql-test/t/row.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000001.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000002.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000004.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000005.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000006.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000008-slave.opt:
  Don't write warnings when initializing test
mysql-test/t/rpl000008.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000009-slave.opt:
  Don't write warnings when initializing test
mysql-test/t/rpl000009.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000010.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000011.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000012.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000013.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000015.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000017.test:
  Don't write warnings when initializing test
mysql-test/t/rpl000018.test:
  Don't write warnings when initializing test
mysql-test/t/rpl_alter.test:
  Don't write warnings when initializing test
mysql-test/t/rpl_empty_master_crash.test:
  Don't write warnings when initializing test
mysql-test/t/rpl_redirect.test:
  Don't write warnings when initializing test
mysql-test/t/rpl_replicate_do.test:
  Don't write warnings when initializing test
mysql-test/t/rpl_rotate_logs.test:
  Don't write warnings when initializing test
mysql-test/t/rpl_skip_error.test:
  Don't write warnings when initializing test
mysql-test/t/rpl_temporary.test:
  Don't write warnings when initializing test
mysql-test/t/sel000033.test:
  Don't write warnings when initializing test
mysql-test/t/sel000100.test:
  Don't write warnings when initializing test
mysql-test/t/select.test:
  Don't write warnings when initializing test
mysql-test/t/select_found.test:
  Don't write warnings when initializing test
mysql-test/t/select_safe.test:
  Don't write warnings when initializing test
mysql-test/t/show_check.test:
  Don't write warnings when initializing test
mysql-test/t/status.test:
  Don't write warnings when initializing test
mysql-test/t/subselect.test:
  Don't write warnings when initializing test
mysql-test/t/symlink.test:
  Don't write warnings when initializing test
mysql-test/t/tablelock.test:
  Don't write warnings when initializing test
mysql-test/t/temp_table.test:
  Don't write warnings when initializing test
mysql-test/t/truncate.test:
  Don't write warnings when initializing test
mysql-test/t/type_blob.test:
  Don't write warnings when initializing test
mysql-test/t/type_date.test:
  Don't write warnings when initializing test
mysql-test/t/type_datetime.test:
  Don't write warnings when initializing test
mysql-test/t/type_decimal.test:
  Don't write warnings when initializing test
mysql-test/t/type_enum.test:
  Don't write warnings when initializing test
mysql-test/t/type_float.test:
  Don't write warnings when initializing test
mysql-test/t/type_ranges.test:
  Don't write warnings when initializing test
mysql-test/t/type_set.test:
  Don't write warnings when initializing test
mysql-test/t/type_time.test:
  Don't write warnings when initializing test
mysql-test/t/type_timestamp.test:
  Don't write warnings when initializing test
mysql-test/t/type_uint.test:
  Don't write warnings when initializing test
mysql-test/t/type_year.test:
  Don't write warnings when initializing test
mysql-test/t/union.test:
  Don't write warnings when initializing test
mysql-test/t/update.test:
  Don't write warnings when initializing test
mysql-test/t/user_var.test:
  Don't write warnings when initializing test
mysql-test/t/varbinary.test:
  Don't write warnings when initializing test
mysql-test/t/variables.test:
  Don't write warnings when initializing test
mysql-test/t/warnings.test:
  Don't write warnings when initializing test
mysys/my_vsnprintf.c:
  Safety fix
readline/terminal.c:
  Removed compiler warnings
sql/ha_berkeley.cc:
  Indentation changes
sql/mysql_priv.h:
  Change store_warning -> push_warning_printf
sql/sql_db.cc:
  Change store_warning -> push_warning_printf
sql/sql_error.cc:
  Change store_warning -> push_warning_printf
sql/sql_table.cc:
  Change store_warning -> push_warning_printf

Added rename table for BDB. This fixes a bug in ALTER TABLE with BDB tables.


BUILD/SETUP.sh:
  Enabled uninitalized warnings for debug builds.
Build-tools/Do-compile:
  Added options --no-mysqltest and --no-benchmarks
  Log time before each stage
  Removed warnings on some OS (at least hpux11)
acinclude.m4:
  Fixed call to wrong function
configure.in:
  Don't use -O3 as compiler option with aCC
innobase/include/univ.i:
  Removed compiler warning (on Hpux11)
innobase/os/os0file.c:
  Removed compiler warning (on Hpux11)
innobase/trx/trx0sys.c:
  Removed compiler warning (on Hpux11)
innobase/trx/trx0trx.c:
  Removed compiler warning (on Hpux11)
innobase/ut/ut0ut.c:
  Removed compiler warning (with gcc)
myisam/mi_check.c:
  Added missing 'static'
myisam/mi_test1.c:
  Added missing 'static'
mysys/my_getopt.c:
  Added missing 'static'
sql/ha_berkeley.cc:
  Added rename table. This fixes a bug in ALTER TABLE with BDB tables.
  Fixed compilation problem on OSF1
sql/ha_berkeley.h:
  Added rename table. This fixes a bug in ALTER TABLE with BDB tables.
sql/mini_client.cc:
  Added reinterpret cast to avoid some warnings.
sql/sql_parse.cc:
  Added reinterpret cast to avoid some warnings.
  Removed usage of strnlen() as this gave portability problems.
sql/sql_union.cc:
  Added reinterpret cast to avoid some warnings.
sql/table.cc:
  Added reinterpret cast to avoid some warnings.
tools/mysqlmanager.c:
  Added missing 'static'

  fixes


sql/share/charsets/Index.xml:
  fixes

  typo fix


sql/share/charsets/Index.xml:
  typo fix

  debug code has been removed
  ,


mysys/charset.c:
  debug code has been removed
  ,

  Comments
Index.xml:
  Languages for cp1256 have been added
.del-win1251ukr.conf~dc3540b3635ed226:
  Delete: sql/share/charsets/win1251ukr.conf
.del-win1251.conf~b6bb6681f02917b6:
  Delete: sql/share/charsets/win1251.conf
.del-win1250.conf~ea4cecf79a9a2b57:
  Delete: sql/share/charsets/win1250.conf
.del-usa7.conf~7907e7e49aad1374:
  Delete: sql/share/charsets/usa7.conf
.del-swe7.conf~adc4138b9b597e76:
  Delete: sql/share/charsets/swe7.conf
.del-pclatin2.conf~2e905fa7381fd785:
  Delete: sql/share/charsets/pclatin2.conf
.del-macromancsas.conf~cb7d2383e8e4105d:
  Delete: sql/share/charsets/macromancsas.conf
.del-macromancias.conf~c3061c0b22a0a3cb:
  Delete: sql/share/charsets/macromancias.conf
.del-macromanciai.conf~ea8974f393a79edd:
  Delete: sql/share/charsets/macromanciai.conf
.del-macromanbin.conf~b9dcdb2797fbae67:
  Delete: sql/share/charsets/macromanbin.conf
.del-macroman.conf~ee6a39463223b952:
  Delete: sql/share/charsets/macroman.conf
.del-maccecsas.conf~5f1b2bfecf71fa0:
  Delete: sql/share/charsets/maccecsas.conf
.del-maccecias.conf~8a71c3a534e70fdd:
  Delete: sql/share/charsets/maccecias.conf
.del-macceciai.conf~a4b13482b0d7a5c5:
  Delete: sql/share/charsets/macceciai.conf
.del-maccebin.conf~b2b9eab235e1a1ae:
  Delete: sql/share/charsets/maccebin.conf
.del-macce.conf~aa8efe8ce8393c31:
  Delete: sql/share/charsets/macce.conf
.del-latvian1.conf~6c7c5b2a4c896567:
  Delete: sql/share/charsets/latvian1.conf
.del-latvian.conf~a7f7110785a5ff4d:
  Delete: sql/share/charsets/latvian.conf
.del-latin5.conf~be23bc5cf8489338:
  Delete: sql/share/charsets/latin5.conf
.del-latin2.conf~c45310f353a74d9:
  Delete: sql/share/charsets/latin2.conf
.del-latin1csas.conf~e8c5219976bde66b:
  Delete: sql/share/charsets/latin1csas.conf
.del-latin1cias.conf~85465c4ba30e76d8:
  Delete: sql/share/charsets/latin1cias.conf
.del-latin1bin.conf~76f38a539b7dfa9f:
  Delete: sql/share/charsets/latin1bin.conf
.del-latin1.conf~b3d65fc96f2ce181:
  Delete: sql/share/charsets/latin1.conf
.del-koi8_ukr.conf~ce11d6ff8ffc4434:
  Delete: sql/share/charsets/koi8_ukr.conf
.del-koi8_ru.conf~334df7402af862c8:
  Delete: sql/share/charsets/koi8_ru.conf
.del-keybcs2.conf~db3e18f91b2075be:
  Delete: sql/share/charsets/keybcs2.conf
.del-hungarian.conf~3b343f4ff7919cd:
  Delete: sql/share/charsets/hungarian.conf
.del-hp8.conf~4620f2afc37ae747:
  Delete: sql/share/charsets/hp8.conf
.del-hebrew.conf~94ba65846b69f5b7:
  Delete: sql/share/charsets/hebrew.conf
.del-greek.conf~68f2c5692866226d:
  Delete: sql/share/charsets/greek.conf
.del-german1.conf~765a04d69683cefe:
  Delete: sql/share/charsets/german1.conf
.del-estonia.conf~e78f662de664f3ac:
  Delete: sql/share/charsets/estonia.conf
.del-dos.conf~5a4357d3335ba812:
  Delete: sql/share/charsets/dos.conf
.del-dec8.conf~d882c1e5e4566b87:
  Delete: sql/share/charsets/dec8.conf
.del-croat.conf~fb40a3e77604268e:
  Delete: sql/share/charsets/croat.conf
.del-danish.conf~90ffe76b3fa5dd46:
  Delete: sql/share/charsets/danish.conf
.del-cp866.conf~a70093f2be0a509:
  Delete: sql/share/charsets/cp866.conf
.del-cp1257ltlvcsas.conf~2e55f43377962ede:
  Delete: sql/share/charsets/cp1257ltlvcsas.conf
.del-cp1257ltlvcias.conf~883d366fc6aa24a1:
  Delete: sql/share/charsets/cp1257ltlvcias.conf
.del-cp1257ltlvciai.conf~f47460f62dace37e:
  Delete: sql/share/charsets/cp1257ltlvciai.conf
.del-cp1257bin.conf~a34eda136d4d93b0:
  Delete: sql/share/charsets/cp1257bin.conf
.del-cp1257.conf~a47298b64ba2dfc1:
  Delete: sql/share/charsets/cp1257.conf
.del-cp1256.conf~92e4a7b31184387b:
  Delete: sql/share/charsets/cp1256.conf
.del-cp1251csas.conf~9c4b69407a10a136:
  Delete: sql/share/charsets/cp1251csas.conf
.del-cp1251cias.conf~6e9b6b7ebafd497c:
  Delete: sql/share/charsets/cp1251cias.conf
.del-cp1251bin.conf~a7bf1f052611ca00:
  Delete: sql/share/charsets/cp1251bin.conf
.del-cp1251.conf~dfafe742142570:
  Delete: sql/share/charsets/cp1251.conf
.del-armscii8.conf~e612e5fb63e34cd4:
  Delete: sql/share/charsets/armscii8.conf


BitKeeper/deleted/.del-armscii8.conf~e612e5fb63e34cd4:
  Delete: sql/share/charsets/armscii8.conf
BitKeeper/deleted/.del-cp1251.conf~dfafe742142570:
  Delete: sql/share/charsets/cp1251.conf
BitKeeper/deleted/.del-cp1251bin.conf~a7bf1f052611ca00:
  Delete: sql/share/charsets/cp1251bin.conf
BitKeeper/deleted/.del-cp1251cias.conf~6e9b6b7ebafd497c:
  Delete: sql/share/charsets/cp1251cias.conf
BitKeeper/deleted/.del-cp1251csas.conf~9c4b69407a10a136:
  Delete: sql/share/charsets/cp1251csas.conf
BitKeeper/deleted/.del-cp1256.conf~92e4a7b31184387b:
  Delete: sql/share/charsets/cp1256.conf
BitKeeper/deleted/.del-cp1257.conf~a47298b64ba2dfc1:
  Delete: sql/share/charsets/cp1257.conf
BitKeeper/deleted/.del-cp1257bin.conf~a34eda136d4d93b0:
  Delete: sql/share/charsets/cp1257bin.conf
BitKeeper/deleted/.del-cp1257ltlvciai.conf~f47460f62dace37e:
  Delete: sql/share/charsets/cp1257ltlvciai.conf
BitKeeper/deleted/.del-cp1257ltlvcias.conf~883d366fc6aa24a1:
  Delete: sql/share/charsets/cp1257ltlvcias.conf
BitKeeper/deleted/.del-cp1257ltlvcsas.conf~2e55f43377962ede:
  Delete: sql/share/charsets/cp1257ltlvcsas.conf
BitKeeper/deleted/.del-cp866.conf~a70093f2be0a509:
  Delete: sql/share/charsets/cp866.conf
BitKeeper/deleted/.del-danish.conf~90ffe76b3fa5dd46:
  Delete: sql/share/charsets/danish.conf
BitKeeper/deleted/.del-croat.conf~fb40a3e77604268e:
  Delete: sql/share/charsets/croat.conf
BitKeeper/deleted/.del-dec8.conf~d882c1e5e4566b87:
  Delete: sql/share/charsets/dec8.conf
BitKeeper/deleted/.del-dos.conf~5a4357d3335ba812:
  Delete: sql/share/charsets/dos.conf
BitKeeper/deleted/.del-estonia.conf~e78f662de664f3ac:
  Delete: sql/share/charsets/estonia.conf
BitKeeper/deleted/.del-german1.conf~765a04d69683cefe:
  Delete: sql/share/charsets/german1.conf
BitKeeper/deleted/.del-greek.conf~68f2c5692866226d:
  Delete: sql/share/charsets/greek.conf
BitKeeper/deleted/.del-hebrew.conf~94ba65846b69f5b7:
  Delete: sql/share/charsets/hebrew.conf
BitKeeper/deleted/.del-hp8.conf~4620f2afc37ae747:
  Delete: sql/share/charsets/hp8.conf
BitKeeper/deleted/.del-hungarian.conf~3b343f4ff7919cd:
  Delete: sql/share/charsets/hungarian.conf
BitKeeper/deleted/.del-keybcs2.conf~db3e18f91b2075be:
  Delete: sql/share/charsets/keybcs2.conf
BitKeeper/deleted/.del-koi8_ru.conf~334df7402af862c8:
  Delete: sql/share/charsets/koi8_ru.conf
BitKeeper/deleted/.del-koi8_ukr.conf~ce11d6ff8ffc4434:
  Delete: sql/share/charsets/koi8_ukr.conf
BitKeeper/deleted/.del-latin1.conf~b3d65fc96f2ce181:
  Delete: sql/share/charsets/latin1.conf
BitKeeper/deleted/.del-latin1bin.conf~76f38a539b7dfa9f:
  Delete: sql/share/charsets/latin1bin.conf
BitKeeper/deleted/.del-latin1cias.conf~85465c4ba30e76d8:
  Delete: sql/share/charsets/latin1cias.conf
BitKeeper/deleted/.del-latin1csas.conf~e8c5219976bde66b:
  Delete: sql/share/charsets/latin1csas.conf
BitKeeper/deleted/.del-latin2.conf~c45310f353a74d9:
  Delete: sql/share/charsets/latin2.conf
BitKeeper/deleted/.del-latin5.conf~be23bc5cf8489338:
  Delete: sql/share/charsets/latin5.conf
BitKeeper/deleted/.del-latvian.conf~a7f7110785a5ff4d:
  Delete: sql/share/charsets/latvian.conf
BitKeeper/deleted/.del-latvian1.conf~6c7c5b2a4c896567:
  Delete: sql/share/charsets/latvian1.conf
BitKeeper/deleted/.del-macce.conf~aa8efe8ce8393c31:
  Delete: sql/share/charsets/macce.conf
BitKeeper/deleted/.del-maccebin.conf~b2b9eab235e1a1ae:
  Delete: sql/share/charsets/maccebin.conf
BitKeeper/deleted/.del-macceciai.conf~a4b13482b0d7a5c5:
  Delete: sql/share/charsets/macceciai.conf
BitKeeper/deleted/.del-maccecias.conf~8a71c3a534e70fdd:
  Delete: sql/share/charsets/maccecias.conf
BitKeeper/deleted/.del-maccecsas.conf~5f1b2bfecf71fa0:
  Delete: sql/share/charsets/maccecsas.conf
BitKeeper/deleted/.del-macroman.conf~ee6a39463223b952:
  Delete: sql/share/charsets/macroman.conf
BitKeeper/deleted/.del-macromanbin.conf~b9dcdb2797fbae67:
  Delete: sql/share/charsets/macromanbin.conf
BitKeeper/deleted/.del-macromanciai.conf~ea8974f393a79edd:
  Delete: sql/share/charsets/macromanciai.conf
BitKeeper/deleted/.del-macromancias.conf~c3061c0b22a0a3cb:
  Delete: sql/share/charsets/macromancias.conf
BitKeeper/deleted/.del-macromancsas.conf~cb7d2383e8e4105d:
  Delete: sql/share/charsets/macromancsas.conf
BitKeeper/deleted/.del-pclatin2.conf~2e905fa7381fd785:
  Delete: sql/share/charsets/pclatin2.conf
BitKeeper/deleted/.del-swe7.conf~adc4138b9b597e76:
  Delete: sql/share/charsets/swe7.conf
BitKeeper/deleted/.del-usa7.conf~7907e7e49aad1374:
  Delete: sql/share/charsets/usa7.conf
BitKeeper/deleted/.del-win1250.conf~ea4cecf79a9a2b57:
  Delete: sql/share/charsets/win1250.conf
BitKeeper/deleted/.del-win1251.conf~b6bb6681f02917b6:
  Delete: sql/share/charsets/win1251.conf
BitKeeper/deleted/.del-win1251ukr.conf~dc3540b3635ed226:
  Delete: sql/share/charsets/win1251ukr.conf
sql/share/charsets/Index.xml:
  Languages for cp1256 have been added
sql/share/charsets/cp1251.xml:
  Comments
sql/share/charsets/latin5.xml:
  Comments

  koi8_ru -> koi8_r
  koi8_ukr -> koi8_u
  usa7 -> ascii


strings/ctype.c:
  koi8_ru -> koi8_r
  koi8_ukr -> koi8_u
  usa7 -> ascii

charset.conf -> charset.xml
bug fix


mysql-test/r/ctype_many.result:
  koi8_ru -> koi8_r
mysql-test/t/ctype_many.test:
  koi8_ru -> koi8_r
mysys/charset.c:
  charset.conf -> charset.xml
sql/share/Makefile.am:
  charset.conf -> charset.xml
strings/ctype-simple.c:
  Bug fix

  PRIMARY flag for built-in charsets


strings/ctype-big5.c:
  PRIMARY flag for built-in charsets
strings/ctype-bin.c:
  PRIMARY flag for built-in charsets
strings/ctype-euc_kr.c:
  PRIMARY flag for built-in charsets
strings/ctype-gb2312.c:
  PRIMARY flag for built-in charsets
strings/ctype-gbk.c:
  PRIMARY flag for built-in charsets
strings/ctype-sjis.c:
  PRIMARY flag for built-in charsets
strings/ctype-tis620.c:
  PRIMARY flag for built-in charsets
strings/ctype-ujis.c:
  PRIMARY flag for built-in charsets
strings/ctype-utf8.c:
  PRIMARY flag for built-in charsets
strings/ctype.c:
  PRIMARY flag for built-in charsets

  new file
Index.xml:
  these names look more standard


sql/share/charsets/Index.xml:
  these names look more standard

  new file

  new file

  new file

  new file
Index.xml:
  usa7 -> ascii


sql/share/charsets/Index.xml:
  usa7 -> ascii

  new file
Index.xml:
  win1250 -> cp1250


sql/share/charsets/Index.xml:
  win1250 -> cp1250

  cp1250_czech
  ,


strings/ctype-win1250ch.c:
  cp1250_czech
  ,

  new file
Index.xml:
  pclatin1


sql/share/charsets/Index.xml:
  pclatin1

  new file

  new file

  new file

  win1251ukr has been added


sql/share/charsets/cp1251.xml:
  win1251ukr has been added

  new file

  new file

  new file

  charset name was empty


sql/share/charsets/latin1.xml:
  charset name was empty

  new file

  charset name was wrong


sql/share/charsets/MacRoman.xml:
  charset name was wrong

  new file