libmysqld/Makefile.am:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
libmysql/libmysql.c:
  Resolved conflicts
sql/mini_client.cc:
  resolved conflicts
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

mysql-test/r/subselect.result:
  fixed subselect test
mysql-test/t/subselect.test:
  fixed subselect test

   compile problems


Docs/Makefile.am:
   - removed all traces of internals.texi to avoid compile problems

Fixed new bug when reading field types


client/mysql.cc:
  Fixed output for -T
libmysql/libmysql.c:
  Filled missing fields in new MYSQL_FIELD structure
  Fixed new bug when reading field types
mysql-test/r/order_by.result:
  Result after new order by optimization
sql/opt_range.cc:
  New ORDER BY optimization
sql/opt_range.h:
  New ORDER BY optimization
sql/set_var.cc:
  Speed optimization
sql/sql_select.cc:
  New ORDER BY optimization
  
  This alllows MySQL to change a ref/range index from (a,b) to (a,c) when 'b' was not used to find rows and one did
  ORDER BY a,c or ORDER BY c

into narttu.mysql.fi:/my/mysql-4.1

BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Delete: Docs/internals.texi

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Changes according to CHARSET_INFO structure


strings/conf_to_src.c:
  Changes according to CHARSET_INFO structure

  utf8 was not marked as compiled


sql/share/charsets/Index.xml:
  utf8 was not marked as compiled

sql/mysqld.cc:
  Auto merged

into narttu.mysql.fi:/my/mysql-4.1


sql/field.h:
  Auto merged

sql/sql_delete.cc:
  Comment cleanup
sql/sql_insert.cc:
  Comment cleanup
sql/sql_load.cc:
  Comment cleanup
sql/sql_update.cc:
  Fixed wrong unlock of tables.
  (Unlock must be done after writing to binary log

into mashka.mysql.fi:/home/my/mysql-4.1-narttu

  Remove accidenatlly committed debug printfs when query cache is used
sql_update.cc, sql_load.cc, sql_insert.cc, sql_delete.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.


sql/sql_delete.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
sql/sql_insert.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
sql/sql_load.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
sql/sql_update.cc:
  For the transactional query cache algorithm to work we must invalidate the query cache in INSERT/DELETE/UPDATE before writing to the binlog or calling ha_autocommit_... Note that binlog writing may also call commit. The crucial thing is that the transaction which modified data must not be committed BEFORE the query cache is invalidated.
sql/ha_innodb.cc:
  Remove accidenatlly committed debug printfs when query cache is used

into mashka.mysql.fi:/home/my/mysql-4.1-narttu


sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

 


Docs/internals.texi:
  Updated protocol information
include/mysql.h:
  Added catalog to MYSQL_FIELD
  Added sqlstate handling to protocol
include/mysql_com.h:
  New 4.1 protocol
libmysql/libmysql.c:
  Added sqlstate handling
  Added CLIENT_MULTI_RESULTS
sql/field.cc:
  Indentation cleanup
sql/field.h:
  Indentation cleanup
sql/mysql_priv.h:
  Changed arguments to close_connection()
sql/mysqld.cc:
  Changed arguments to close_connection()
  Added checking of extra arguments to mysqld
sql/protocol.cc:
  Fixed bug in TIME handling
  Added SQLSTATE on errors
  Removed net_send_error()
sql/protocol.h:
  Removed net_send_error()
sql/repl_failsafe.cc:
  Fixed arguments to close_connection()
sql/sql_parse.cc:
  New 4.1 protocol

ctype_ucs2 and ctype_ujis were skipped in mistake

  cp1250_czech_ci was displayed even when not compiled-in in mistake.


sql/share/charsets/Index.xml:
  cp1250_czech_ci was displayed even when not compiled-in in mistake.

  Character set in this test results was displayed dispite the fact that the table has the same character set


mysql-test/r/symlink.result:
  Character set in this test results was displayed dispite the fact that the table has the same character set

  c
Index.xml:
  Collation names form lati7 were mixed


sql/share/charsets/Index.xml:
  Collation names form lati7 were mixed
sql/share/charsets/latin7.xml:
  c

BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9:
  Delete: mysql-test/t/ctype_ujis-master.opt

  Bug fix: if latin2_czech_ci is not compiled, loader din't load other latin2 collations


mysys/charset.c:
  Bug fix: if latin2_czech_ci is not compiled, loader din't load other latin2 collations

BitKeeper/deleted/.del-convert.cc~437689acaffb7446:
  Delete: sql/convert.cc

Character set is not displayed in "Type" column anymore
In "Collation" column NULL instead of BINARY is now displayd for for non-character data types


mysql-test/r/alter_table.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/create.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/ctype_collate.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/ctype_recoding.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/gis.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/innodb.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/select.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/show_check.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/type_blob.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/type_float.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
mysql-test/r/type_ranges.result:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
sql/field.cc:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
sql/field.h:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore
sql/sql_show.cc:
  Character set is not displayed in "Type" column of SHOW FIELDS anymore

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

Collation and coercibility tests for string functions


mysql-test/r/func_str.result:
  Collation and coercibility tests for string functions
mysql-test/t/func_str.test:
  Collation and coercibility tests for string functions
sql/item_strfunc.cc:
  Collation and coercibility tests for string functions

into light.hegel.local:C:/mysql-dev/mysql-4.1

sql/share/portuguese/errmsg.txt:
  Translation English -> Portuguese
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

USER(), DATABASE() and VERSION() return in utf8 now

This is because rpl_relayrotate.test uses InnoDB.
Example of a failing sequence:
rpl_relayrotate.test repl_user_variables.test rpl_relayrotate.test
Explaination in the files.
Btw all other tests which use InnoDB (innodb*.test) already have this final
DROP TABLE.
Removed a wrong comment of mine.


mysql-test/r/rpl_relayrotate.result:
  result update
mysql-test/t/rpl_relayrotate.test:
  cleaning DROP TABLE which is important if the tests are run in a certain order.

  default_collation is now displayed correctly in mysqld --help
  mysqld --help now displays default_collation corretly, according to --default-character-set


sql/mysqld.cc:
  default_collation is now displayed correctly in mysqld --help

Fixed that SHOW CHARACTER SET displayed non-dynamic charsets even if they were not really compiled

  Typos fixes


sql/share/charsets/Index.xml:
  Typos fixes