sql/share/errmsg.txt:
  Removed several erroneous error messages in different languages.

into arthur.local:/my/mysql-5.0-clean

sql/share/errmsg.txt:
  Removed incorrect error messages; Fixed serbian messages.

mysql-test/r/greedy_optimizer.result:
  Adjusted query costs accordingly.
sql/sql_select.cc:
  Someone added this 0.001 cost factor to best_extension_by_limited_search(), but forgot to
  add it to the old version of the optimizer - find_best().

into hundin.mysql.fi:/home/jan/new/mysql-5.0

  My attempt N3


sql/share/errmsg.txt:
  My attempt N3

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6843

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6843

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n

            


sql/sp.cc:
  A fix (Bug #6843: Wrong function name crashes MySQL if mysql.proc table is missi
  We test current_select (in case of error) in the my_message_sql().

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

tests/client_test.c:
  Moved variable declaration to the beginning of the block.
  (It's a C file, not C++)

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

Group item fields are implemented as varstrings nowadays.
Made init_connect.test robust against existing t1.


mysql-test/r/init_connect.result:
  Made init_connect.test robust against existing t1.
mysql-test/t/init_connect.test:
  Made init_connect.test robust against existing t1.
sql/sql_select.cc:
  Enlarged group item key_length by a varstring length field.
  Group item fields are implemented as varstrings nowadays.

include/my_global.h:
  Define UINT_MAX8
libmysql/libmysql.c:
  Replace defines for insteger limits with their custom MySQL versions.

sql/ha_innodb.cc:
  Added support for a CREATE TABLE...AUTO_INCREMENT = x; Note that the new
  value for auto increment field is set if the new values is creater than
  the maximum value in the column.

fixes. Still to do: 
-  deploy my_strtoll10 in limbysql.c
- add mysql_options option to switch MYSQL_DATA_TRUNCATED on and off.


include/my_time.h:
  More calls are shared between client and server (libmysql now performs
  more intelligent date->number and number->date conversions).
  TODO: rename those which are not starting with 'my_'
include/mysql.h:
  MYSQL_BIND:
  - more elaborated comment
  - some of the ex-private members were given public names - 
    it's sometimes convenient to set bind->error to &bind->error_value.
    However Monty questions the idea, so it should be given
    more thought in future.
  - added new members to support data truncation.
  Added new return value of mysql_stmt_fetch, MYSQL_DATA_TRUNCATED.
libmysql/libmysql.c:
  - added support for data truncation during fetch
  - implementation for is_binary_compatible: now conversion functions
    are used less frequently
  - we now use number_to_datetime and TIME_to_ulonglong for date->number and
    number->date conversions
sql-common/my_time.c:
  - added implementation of date->number and number->date calls shared 
    between client and server (moved from time.cc).
sql/field.cc:
  - implemented Field_time::store_time() to better support date->time
    conversions in prepared mode. After-review fixes.
sql/field.h:
  - Field::store_time now returns int
sql/mysql_priv.h:
  - removed date->number and number->date conversion functions headers
    (moved to my_time.h)
sql/time.cc:
  - removed implementation of date->number and number->date conversion
    functions (moved to my_time.c)
tests/client_test.c:
  - added a test case for data truncation; other test cases adjusted.
  - fixed my_process_stmt_result to set STMT_ATTR_UPDATE_MAX_LENGTH (tables
    are now printed out prettier).

into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0

server-tools/instance-manager/thread_registry.h:
  Fix for the problem, encountered by Ramil

into hundin.mysql.fi:/home/jan/new/mysql-5.0

extra/comp_err.c:
  Fixed compile error with -debug for some compilers.

BitKeeper/etc/ignore:
  added extra/created_include_files
extra/Makefile.am:
  Make sure that mysqld_error.h and sql_state.h are not build in the same time.
extra/comp_err.c:
  Fixed segfault bug
libmysqld/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
libmysqld/examples/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
scripts/make_win_src_distribution.sh:
  Windows version fix

BitKeeper/etc/ignore:
  added extra/sql_state.h

BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7:
  Delete: include/mysqld_error.h
BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019:
  Delete: include/sql_state.h
BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a:
  Delete: sql/share/czech/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
  Delete: sql/share/danish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7:
  Delete: sql/share/dutch/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16:
  Delete: sql/share/french/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72:
  Delete: sql/share/estonian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~898865062c970766:
  Delete: sql/share/greek/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d:
  Delete: sql/share/german/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Delete: sql/share/english/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72:
  Delete: sql/share/norwegian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1:
  Delete: sql/share/italian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1:
  Delete: sql/share/korean/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c:
  Delete: sql/share/japanese/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23:
  Delete: sql/share/hungarian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e:
  Delete: sql/share/portuguese/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c:
  Delete: sql/share/polish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06:
  Delete: sql/share/norwegian-ny/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795:
  Delete: sql/share/romanian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
  Delete: sql/share/russian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
  Delete: sql/share/serbian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89:
  Delete: sql/share/slovak/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
  Delete: sql/share/swedish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964:
  Delete: sql/share/spanish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
  Delete: sql/share/ukrainian/errmsg.txt
client/Makefile.am:
  Added pass to mysqld_error.j and sql_state.h
extra/Makefile.am:
  Added rules to create mysqld_error.h and sql_state.h
extra/comp_err.c:
  WL#1051
include/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
libmysql/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
libmysql_r/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
server-tools/instance-manager/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
sql/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
sql/share/Makefile.am:
  Removed unnecessary loop over all languages; addred rule to creat <lang>.sys files
tools/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/ha_innodb.cc:
  Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061).
  It cant be put on commit because ALTER TABLE will commit on every 10000 rows.
  Therefore, this change must be done when a new temporary table is created
  in the ALTER TABLE.

  don't make non-debug builds fail the testsuite


mysql-test/t/flush_read_lock_kill-master.opt:
  don't make non-debug builds fail the testsuite

sql/ha_innodb.cc:
  Fixed a bug no error message for ALTER with InnoDB and AUTO_INCREMENT (Bug #7061).
  If AUTO_INCREMENT is given in the ALTER TABLE, this value is now set
  to the auto increment value of the table if the new value is creater or 
  equal than the current value of the auto increment value. If the new value
  is less than the old value no error message is given and the old value 
  is not changed.

into mysql.com:/home/cps/mysql/trees/autofail/mysql-5.0

server-tools/instance-manager/buffer.cc:
  fix typo
server-tools/instance-manager/commands.cc:
  get rid of compiler warnings
server-tools/instance-manager/guardian.cc:
  fix compiler warning
server-tools/instance-manager/instance.cc:
  fix warnings
server-tools/instance-manager/instance_map.cc:
  fix return value
server-tools/instance-manager/instance_map.h:
  fix problem, caused autobuild failure. Looks like a gcc problem - 
  "friend class <name>" doesn't work if specified before enclosed class
  <name> (this is not present in newer gcc versions)

Added comments (from code review on pull)


mysql-test/r/heap.result:
  Fix results that may change from run to run
mysql-test/r/ps_5merge.result:
  Fix wrong result
mysql-test/t/heap.test:
  Make results predictable
sql/sql_show.cc:
  Add comments
  Fixed typo

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

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n