Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log


Docs/mysqld_error.txt:
  Updated error messages
Makefile.am:
  Added missing SSL library (Should be in source distribution)
configure.in:
  Added missing SSL library
include/sql_common.h:
  Move duplicated prototypes
innobase/os/os0file.c:
  Added comment for line that could be removed
innobase/srv/srv0srv.c:
  Added comment for line that could be removed
innobase/srv/srv0start.c:
  Added comment for line that could be removed
innobase/trx/trx0sys.c:
  Added cast to remove compiler warning
isam/isamchk.c:
  Fixed compiler warning
libmysql/conf_to_src.c:
  Include files in proper order
myisam/mi_check.c:
  Removed else part that caused compiler warning
myisam/mi_delete.c:
  Added cast
myisam/mi_page.c:
  Added cast
myisam/mi_preload.c:
  Added cast
myisam/mi_write.c:
  Added cast
myisam/myisampack.c:
  changed 'byte' to 'current_byte' to avoid compiler warnings
mysql-test/mysql-test-run.sh:
  Removed start-from as test '<' is not portable and this can easily be done from command line
mysys/hash.c:
  Added cast
mysys/mf_wcomp.c:
  Removed not reached line
mysys/my_append.c:
  Fixed include file order to get this more portable
mysys/my_copy.c:
  Fixed include file order to get this more portable
mysys/my_redel.c:
  Fixed include file order to get this more portable
sql-common/client.c:
  More DBUG_PRINT
sql-common/pack.c:
  Added casts becasue Fortre compiler apparently compares (ulonglong) < (longlong) as signed
sql/ha_heap.cc:
  Changed variable names to not cause hidden variables
sql/ha_innodb.cc:
  Changed variable names to not cause hidden variables
sql/item.cc:
  Changed variable names to not cause hidden variables
sql/item.h:
  Changed variable names to not cause hidden variables
sql/item_cmpfunc.h:
  Changed variable names to not cause hidden variables
sql/item_func.cc:
  Changed variable names to not cause hidden variables
sql/item_subselect.cc:
  Changed variable names to not cause hidden variables
sql/item_subselect.h:
  Changed variable names to not cause hidden variables
sql/item_sum.cc:
  Changed variable names to not cause hidden variables
sql/item_timefunc.cc:
  Changed variable names to not cause hidden variables
sql/log.cc:
  Changed variable names to not cause hidden variables
sql/protocol.cc:
  Changed variable names to not cause hidden variables
sql/protocol.h:
  Changed variable names to not cause hidden variables
  Remove function not declared in protocol.cc
sql/protocol_cursor.cc:
  Changed variable names to not cause hidden variables
sql/set_var.cc:
  Added a lot of 'version_xxx' strings
  Changed 'bdb_version' to 'version_bdb'
sql/sql_class.cc:
  Changed variable names to not cause hidden variables
  Add TMP_TABLE_PARAM::init() to allow one to initialize structure several times
sql/sql_class.h:
  Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
sql/sql_derived.cc:
  Avoid copying TMP_TABLE_PARAM (Use class version instead)
sql/sql_error.cc:
  More DBUG
sql/sql_help.cc:
  Fixed compiler warning
sql/sql_lex.cc:
  Changed variable names to not cause hidden variables
sql/sql_list.h:
  Changed variable names to not cause hidden variables
sql/sql_parse.cc:
  Changed variable names to not cause hidden variables
sql/sql_select.cc:
  Changed variable names to not cause hidden variables
  Ensure that you don't send NULL to printf() for %s
  Fixed problem with printing sub selects to debug log
sql/sql_select.h:
  Changed variable names to not cause hidden variables
sql/sql_union.cc:
  Changed variable names to not cause hidden variables
  Don't use local copy of TMP_TABLE_PARAM (Caused core dump on Solaris)
sql/sql_update.cc:
  Indentation cleanup
sql/sql_yacc.yy:
  Remove warning
strings/conf_to_src.c:
  Fixed include file order

include/mysql_version.h.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into mysql.com:/my/mysql-4.0

This makes it possible to check origin of binary from the output of 'show variables'


include/mysql_version.h.in:
  Added MYSQL_COMPILATION_COMMENT
sql/mysqld.cc:
  Added compilation comment to mysqld --version
sql/set_var.cc:
  Added compilation comment to 'show variables'

into mysql.com:/my/mysql-4.1

into mysql.com:/my/mysql-4.1

  Fixed a bug: missing semicolon.


sql/sql_union.cc:
  Fixed a bug: missing semicolon.

into rurik.mysql.com:/home/igor/mysql-4.1

into rurik.mysql.com:/home/igor/mysql-4.1

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


mysql-test/r/create.result:
  Auto merged

temporary table BLOB now is longblob


mysql-test/r/create.result:
  blob size changed for safety
mysql-test/r/type_blob.result:
  blob size changed for safety
mysql-test/r/type_ranges.result:
  blob size changed for safety
mysql-test/r/union.result:
  blob size changed for safety
  new tests of UNION types merging
mysql-test/t/union.test:
  new tests of UNION types merging
sql/field.h:
  blob size changed for safety
sql/item.cc:
  processing of collation added
  added comment
sql/item.h:
  joining of UNION fields may failed now, because of incompatibility of collations
sql/sql_union.cc:
  joining of UNION fields may failed now, because of incompatibility of collations

into mysql.com:/my/mysql-4.1


mysql-test/r/rpl_change_master.result:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged

myisam/mi_extra.c:
  Fix comment
mysql-test/r/rpl_change_master.result:
  new results

  Added resize key cache test.


tests/fork_big2.pl:
  Added resize key cache test.

into rurik.mysql.com:/home/igor/dev/mysql-4.1-2

  ibbackup --apply-log must be able to rename a table based only on the space id


innobase/fil/fil0fil.c:
  ibbackup --apply-log must be able to rename a table based only on the space id
innobase/include/fil0fil.h:
  ibbackup --apply-log must be able to rename a table based only on the space id

into mysql.com:/home/kostja/mysql/mysql-4.1-root

Makefile.am:
  spurious space (from a bad merge) deleted
mysql-test/r/rpl_change_master.result:
  test results updated

into hundin.mysql.fi:/home/heikki/mysql-4.1

  Fix for the resize key cache operation.


include/keycache.h:
  Fix for the resize key cache operation.
mysys/mf_keycache.c:
  Fix for the resize key cache operation.

  Changes needed for ibbackup directory scanning fault tolerance


innobase/os/os0file.c:
  Changes needed for ibbackup directory scanning fault tolerance
innobase/include/os0file.h:
  Changes needed for ibbackup directory scanning fault tolerance

Docs/Makefile.am:
  Auto merged

Docs/Makefile.am:
  Auto merged

Docs/Makefile.am:
   - Removed COPYING.LIB from txt_files target

Docs/Makefile.am:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/rpl_change_master.result:
  merged - ul

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

   after it was removed from manual.texi (where it was automatically
   generated from).


Docs/Makefile.am:
   - don't create COPYING.LIB anymore (was removed from manual.texi)
Makefile.am:
   - Removed COPYING.LIB from the source distribution
scripts/make_binary_distribution.sh:
   - Removed COPYING.LIB from the binary distribution
scripts/make_win_src_distribution.sh:
   - Removed COPYING.LIB from the windows source distribution
support-files/mysql.spec.sh:
   - Removed COPYING.LIB from the Server RPM

It can appear as a result of manual modifications with INSERT/UPDATE/DELETE

This script converts privilege table to the state that could be created
with GRANT commands only (with the exception of the short password)

This is necessary for 5.0

"You can always mysql_real_query a query with placeholders 
after mysql_prepare()"


sql/sql_class.cc:
  prepare_command removed
sql/sql_class.h:
  prepare_command removed
sql/sql_prepare.cc:
  prepare_command removed
sql/sql_yacc.yy:
  prepare_command removed
tests/client_test.c:
  added test for bug #1946: "You can always
  mysql_real_query a query with placeholders after mysql_prepare()"

libexec support in install_test_db
--start-from in mysql-test-run


mysql-test/install_test_db.sh:
  libexec support in install_test_db
mysql-test/mysql-test-run.sh:
  --start-from in mysql-test-run

  Marko's patch: check the position of some system table columns already at C compile time


innobase/dict/dict0boot.c:
  Marko's patch: check the position of some system table columns already at C compile time

   confuses RPM's Perl module dependency checking (it adds a bogus
   requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)


scripts/mysqlaccess.sh:
   - Rephrased option help text so it does not start with "use" as this 
     confuses RPM's Perl module dependency checking (it adds a bogus
     requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)
sql-bench/bench-init.pl.sh:
   - Rephrased option help text so it does not start with "use" as this 
     confuses RPM's Perl module dependency checking (it adds a bogus
     requirement to "Perl(the)", as "use" is a Perl keyword). (BUG#1931)

into mysql.com:/space/my/mysql-4.0-build

(see fulltext.test)

into mysql.com:/my/mysql-4.1

did not call get_one_option().

did not call get_one_option().

into mysql.com:/my/mysql-4.1