Produce an error when a field collation and charset are not compatible


sql/sql_yacc.yy:
  Produce an error when a field collation and charset are not compatible

SELECT latin1_expr COLLATE anpther_charset_collation

so that it has fetched the most from the master's binlog before the master
accidently dies. SCRUM task #756.


sql/slave.cc:
  Replication: give the slave I/O thread a higher priority than the slave SQL thread
  so that it has fetched the most from the master's binlog before the master
  accidently dies.
sql/slave.h:
  Replication: give the slave I/O thread a higher priority than the slave SQL thread
  so that it has fetched the most from the master's binlog before the master
  accidently dies.

Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
Disabling can be safer when the server silently dies & restarts.
This is for SCRUM task #727.


client/client_priv.h:
  Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client
client/mysql.cc:
  Added options reconnect/enable-reconnect/disable-reconnect/skip-reconnect to the 'mysql' command-line client.
  Disabling can be safer when the server silently dies & restarts.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
sql/sql_select.cc:
  Auto merged

Added GeometryCollection type.

  Fix for coercibility of function


sql/item_func.cc:
  Fix for coercibility of function

  Charset conversion function changes coercibility to IMPLICIT


sql/item_strfunc.cc:
  Charset conversion function changes coercibility to IMPLICIT

  _charset cast changes coercibility to implicit
item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT


sql/item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT
sql/sql_yacc.yy:
  _charset cast changes coercibility to implicit

   Coercibility, initial stage
item_func.h:
  Coercibility, initial stage


sql/item_func.h:
  Coercibility, initial stage
sql/item.cc:
   Coercibility, initial stage
sql/item_create.cc:
   Coercibility, initial stage
sql/item_create.h:
   Coercibility, initial stage
sql/item.h:
   Coercibility, initial stage
sql/item_func.cc:
   Coercibility, initial stage
sql/lex.h:
   Coercibility, initial stage
sql/sql_yacc.yy:
   Coercibility, initial stage

cmd-line-utils/libedit/readline.c:
  Portability fix (For IRIX)
include/my_global.h:
  Portability fix (For Tru64)
include/my_xml.h:
  Portability fix (True64)
  ('leave' is already defined)
strings/xml.c:
  Portability fix (True64)

configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/thr_lock.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/log_event.cc:
  merge
sql/mysqld.cc:
  merge

include/config-win.h:
  Removed wrong ;
include/my_global.h:
  Portability fix for AIX

mysql-test/Makefile.am:
  Auto merged

  Added new tests for better coverage of
  min/max optimization code.
func_group.test:
  Added new tests for better coverage of 
  min/max optimization code.
opt_sum.cc:
  Fixed wrong previous manual merge.
  Fixed bugs concerning fields used in min/max
  functions for which there are conditions of
  the form field=const.


sql/opt_sum.cc:
  Fixed wrong previous manual merge.
  Fixed bugs concerning fields used in min/max
  functions for which there are conditions of
  the form field=const.
mysql-test/t/func_group.test:
  Added new test for better coverage of 
  min/max optimization code.
mysql-test/r/func_group.result:
  Added new tests for better coverage of
  min/max optimization code.

Fixed bug in RAND() usage in mysqlbinlog


configure.in:
  Added detection if pthread_attr_getstacksize() exists
include/thr_lock.h:
  Fixed wrong comment
sql/log_event.cc:
  Fixed bug in RAND() usage in mysqlbinlog
sql/mysqld.cc:
  Portablity fix
sql/repl_failsafe.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/slave.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_class.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_insert.cc:
  Set host_or_ip for system threads (to make other code simpler)
sql/sql_show.cc:
  Set host_or_ip for system threads (to make other code simpler)

  set names binary  didn't work
  ,


sql/sql_yacc.yy:
  set names binary  didn't work
  ,

  Two separate functions charset() and collatio()
item_strfunc.h:
  Two separate functions charset() and collation()


sql/item_strfunc.cc:
  Two separate functions charset() and collatio()
sql/item_strfunc.h:
  Two separate functions charset() and collation()
sql/sql_yacc.yy:
  Two separate functions charset() and collatio()

into hundin.mysql.fi:/home/igor/dev/mysql-4.1

  Now all text fields convert data into proper charset before storing


sql/field.cc:
  Now all text fields convert data into proper charset before storing

into hundin.mysql.fi:/home/igor/dev/mysql-4.1

  Added tests for extended max/min optimization
opt_sum.cc:
  Extended min/max optimization


sql/opt_sum.cc:
  Extended min/max optimization
mysql-test/t/func_group.test:
  Added tests for extended max/min optimization
mysql-test/r/func_group.result:
  Added tests for extended max/min optimization

  Insert constants with an explicit character set
ctype_many.result:
  Fix according test change


mysql-test/r/ctype_many.result:
  Fix according test change
mysql-test/t/ctype_many.test:
  Insert constants with an explicit character set

  rename len -> length, to look in common style


sql/field.cc:
  rename len -> length, to look in common style

sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

mysql-test/r/bigint.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/item.h:
  merge (use local copy)
sql/sql_show.cc:
  merge

Don't define crc32 if we are not linking with gzip


cmd-line-utils/libedit/libedit_term.h:
  Rename: cmd-line-utils/libedit/term.h -> cmd-line-utils/libedit/libedit_term.h
BitKeeper/etc/ignore:
  added scripts/make_win_src_distribution
client/connect_test.c:
  Removed wrong include file
  (my_global.h should never be included by an external client)
client/insert_test.c:
  Removed wrong include file
  (my_global.h should never be included by an external client)
client/select_test.c:
  Removed wrong include file
  (my_global.h should never be included by an external client)
cmd-line-utils/libedit/Makefile.am:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/el.h:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/key.h:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/makelist:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/read.c:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/readline.c:
  Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/readline/readline.h:
  Systems that has sys/cdefs may not have __BEGIN_DECLS
cmd-line-utils/libedit/sig.c:
  sig_t is not portable
cmd-line-utils/libedit/sig.h:
  sig_t is not portable
cmd-line-utils/libedit/term.c:
  Portablity fixes
  Fixed core dump when using a terminal without arrow key definitions
heap/_check.c:
  Portability fix
heap/hp_hash.c:
  Portability fix
heap/hp_rkey.c:
  Portability fix
include/my_global.h:
  Portability fixes for HPUX11
libmysql/libmysql.c:
  Removed wrong cast
mysql-test/r/union.result:
  New union tests
mysql-test/t/union.test:
  New union tests
sql/gen_lex_hash.cc:
  Fixed portability bug.
sql/gstream.h:
  Portablity fix
sql/item_create.cc:
  Don't define crc32 if we are not linking with gzip
sql/item_create.h:
  Don't define crc32 if we are not linking with gzip
sql/item_func.cc:
  Don't define crc32 if we are not linking with gzip
sql/item_func.h:
  Don't define crc32 if we are not linking with gzip
sql/lex.h:
  Don't define crc32 if we are not linking with gzip
sql/sql_show.cc:
  Name can't be NULL

regarded as unsigned longlongss, not as floats. This make these values work
similar to values between 10000000000000000000 and 18446744073709551615.


mysql-test/r/bigint.result:
  Fixed results for bigints
mysql-test/t/bigint.test:
  Fixed results for bigints
sql/item.h:
  Mark unsigned big ints as unsigned
sql/sql_lex.cc:
  Returns numbers between 9223372036854775807 and 9999999999999999999 as unsigned 64 bit numbers

sql/sql_show.cc:
  Auto merged

netware/mw/mwenv:
  MW environment for 4.1 (add zlib dir, change path)
netware/nwconfigure:
  with-extra-charsets changed to latin1_de
sql/mysqld.cc:
  Removed duplicate call to pthread_exit(0)

  Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table


sql/ha_innodb.cc:
  Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table

  Add docs to store_lock()


sql/ha_innodb.cc:
  Add docs to store_lock()

Allow NULL geometry fields.


include/mysqld_error.h:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/czech/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/danish/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/dutch/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/english/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/estonian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/french/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/german/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/greek/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/hungarian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/italian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/japanese/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/korean/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/norwegian-ny/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/norwegian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/polish/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/portuguese/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/romanian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/russian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/serbian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/slovak/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/spanish/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/swedish/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"
sql/share/ukrainian/errmsg.txt:
  new error message: "All parts of a SPATIAL KEY must be NOT NULL"