which occured because we were not lowering case of file names 
for temporary tables altough handler assumes so if 
lower_case_table_names==2. Now we are lowering case for them.


sql/sql_select.cc:
  Now we are lowering case of file names for temporary tables.
sql/sql_table.cc:
  Now we are lowering case of file names for temporary tables.

into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into eagle.mysql.r18.ru:/home/vva/work/TASK_ALTER_INFO/mysql-4.1


sql/sql_table.cc:
  Auto merged

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

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


libmysqld/lib_sql.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-macosx

The code in mysql_create_table() code assumes that if lower_case_names==2 then table alias 
should contain unchanged table name, and this was not true for temporary tables which
had 'tmp-table' constant as alias. Now we are using table name as alias for such tables.


sql/sql_lex.cc:
  Removed tmp_table_alias constant which is no longer used.
sql/sql_lex.h:
  Removed tmp_table_alias constant which is no longer used.
sql/sql_yacc.yy:
  Let us use table name instead of 'tmp-table' as alias for table being created by 
  CREATE TEMPORARY TABLE statement. This fixes failing temp_table.test on Darwin 7.3 
  since mysql_create_table() code assumes that if lower_case_names==2 then table alias 
  should contain unchanged table name (and now this assumtion is true but it were false
  for temporary tables before...).

Remove compiler warnings
Update windows project files


VC++Files/innobase/innobase.dsp:
  Update project files after merge
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Update project files after merge
VC++Files/libmysqld/libmysqld.dsp:
  Update project files after merge
VC++Files/myisamchk/myisamchk.dsp:
  Update project files after merge
VC++Files/myisamlog/myisamlog.dsp:
  Update project files after merge
VC++Files/myisampack/myisampack.dsp:
  Update project files after merge
VC++Files/mysqldemb/mysqldemb.dsp:
  Update project files after merge
VC++Files/sql/mysqld.dsp:
  Update project files after merge
VC++Files/strings/strings.dsp:
  Update project files after merge
innobase/include/data0data.ic:
  Fix compiler warning
innobase/include/mem0pool.h:
  Remove reference to not existing variable (after merge fix)
innobase/srv/srv0srv.c:
  Remove reference to not existing variable (after merge fix)
libmysqld/libmysqld.def:
  Add function used by test programs
mysql-test/r/func_str.result:
  After merge fixes
mysql-test/r/variables.result:
  After merge fixes
mysql-test/t/variables.test:
  After merge fixes
sql/discover.cc:
  Remove not used lable
sql/opt_range.cc:
  Removed compiler warnings
strings/ctype-tis620.c:
  After merge fixes

client/mysqlbinlog.cc:
  Added missing backslash that prevented building of mysqlbinlog.

into deer.(none):/home/hf/work/mysql-4.1.3691


sql/sql_db.cc:
  Auto merged

but database is created)
handling of CREATE DATABASE errors changed


sql/sql_db.cc:
  now we check my_stat errors in mysql_create_db

It causes mysqlbinlog to not stop after the end of the requested binlog, and instead read
until the end of the last binlog of mysqld (beware of endless loops if you pipe this
into the same mysqld).
I.e. it enables back (at customer's request) what we considered (and I still do)
as BUG#3204, but now with an option instead of being the default behaviour.
The default behaviour is still to stop after the end of the requested binlog,
whether --read-from-remote-server or not.


client/mysqlbinlog.cc:
  New option --to-last-log

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

(as of mi_compare_text) words with different lengths.
bug #3835

names to lower case using latin1 instead of utf-8 in sql_acl.cc if lower_case_table_names 
was on. Also replaced in other such places system_charset_info with files_charset_info
for consistency.


sql/handler.cc:
  Replaced system_charset_info with files_charset_info in places where we are converting 
  names to lower case because of lower_case_table_names for consistency.
sql/sql_acl.cc:
  We should use files_charset_info when converting db/table names to lower case because they
  could be in utf-8 and not in latin1!
sql/sql_cache.cc:
  Added clarifying comments in tricky place after discussion with Sanja.
  Replaced system_charset_info with files_charset_info in places where we 
  are converting names to lower case because of lower_case_table_names for 
  consistency.
sql/sql_db.cc:
  Replaced system_charset_info with files_charset_info in places where we are converting 
  names to lower case because of lower_case_table_names for consistency.
sql/sql_show.cc:
  Replaced system_charset_info with files_charset_info in places where we are converting 
  names to lower case because of lower_case_table_names for consistency.
sql/sql_table.cc:
  Replaced system_charset_info with files_charset_info in places where we are converting 
  names to lower case because of lower_case_table_names for consistency.

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bcut

into deer.(none):/home/hf/work/mysql-4.1.3744


client/mysql.cc:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bcut

to make list of parameters in mysql_alter_table shorted
to avoid warning in MSVC (windows) building 


sql/mysql_priv.h:
  Introduced parameter object "ALTER_INFO" for mysql_alter_table
  - changed declaration of mysql_alter_table
  - changed declaration of mysql_drop_index 
    (replaced List<Alter_drop> by ALTER_INFO)
sql/sql_lex.h:
  Introduced parameter object "ALTER_INFO" for mysql_alter_table
  - declared struct ALTER_INFO
  - added ALTER_INFO alter_info; into LEX
  - removed fields which were added into ALTER_INFO from LEX
sql/sql_parse.cc:
  Introduced parameter object "ALTER_INFO" for mysql_alter_table
  - changed invotaions of mysql_alter_table
  - replaced cleaning fields in SQLCOM_OPTIMIZE by ALTER_INFO::reset
  - changed invocation of mysql_drop_index (replaced lex->drop_list by &lex->alter_info)
  - changed definition of mysql_create_index and mysql_drop_index to use ALTER_INFO
sql/sql_table.cc:
  Introduced parameter object "ALTER_INFO" for mysql_alter_table
  - changed definition of mysql_alter_table
sql/sql_yacc.yy:
  Introduced parameter object "ALTER_INFO" for mysql_alter_table
  - replaced using of removed from LEX fields my fields of LEX::alter_info

errormsg.sys)
Cleanups added


client/mysql.cc:
  my_end(0) added to do all the necessary cleanups
  glob_buffer.realloc() moved beneath the mysql_server_init

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

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

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

ndb/src/kernel/ndb-main/Main.cpp:
  Only install signalhandlers up to SIGRTMIN
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/item.cc:
  assigning max_length/decimal parameter for Item_param
tests/client_test.c:
  layout fixed
  test suite for bug

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3728

innobase/include/ut0ut.h:
  Remove unused functions ut_sprintf() and ut_fprintf()
innobase/ut/ut0ut.c:
  Remove unused functions ut_sprintf() and ut_fprintf()

VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/dbug/dbug.dsp:
  Auto merged
VC++Files/heap/heap.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/isam/isam.dsp:
  Auto merged
VC++Files/isamchk/isamchk.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39:
  Auto merged
VC++Files/libmysqltest/myTest.dsp:
  Auto merged
VC++Files/merge/merge.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisam/myisam.dsp:
  Auto merged
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  Auto merged
VC++Files/myisammrg/myisammrg.dsp:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Auto merged
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/pack_isam/pack_isam.dsp:
  Auto merged
VC++Files/perror/perror.dsp:
  Auto merged
VC++Files/regex/regex.dsp:
  Auto merged
VC++Files/replace/replace.dsp:
  Auto merged
VC++Files/test1/test1.dsp:
  Auto merged
VC++Files/thr_test/thr_test.dsp:
  Auto merged
VC++Files/vio/vio.dsp:
  Auto merged
VC++Files/zlib/zlib.dsp:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
include/m_string.h:
  Auto merged
include/mysql_embed.h:
  Auto merged
include/mysql_version.h.in:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/mem/mem0pool.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
VC++Files/bdb/bdb.dsp:
  Merge with 4.0
VC++Files/client/mysql.dsp:
  Merge with 4.0
VC++Files/client/mysqlclient.dsp:
  Merge with 4.0
VC++Files/comp_err/comp_err.dsp:
  Merge with 4.0
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Merge with 4.0
VC++Files/libmysqld/libmysqld.dsp:
  Merge with 4.0
VC++Files/myisamchk/myisamchk.dsp:
  Merge with 4.0
VC++Files/myisamlog/myisamlog.dsp:
  Merge with 4.0
VC++Files/myisampack/myisampack.dsp:
  Merge with 4.0
VC++Files/mysqldemb/mysqldemb.dsp:
  Merge with 4.0
VC++Files/mysqlserver/mysqlserver.dsp:
  Merge with 4.0
VC++Files/sql/mysqld.dsp:
  Merge with 4.0
VC++Files/strings/strings.dsp:
  Merge with 4.0
libmysqld/lib_sql.cc:
  Merge with 4.0
libmysqld/libmysqld.def:
  Merge with 4.0
mysql-test/r/func_str.result:
  Merge with 4.0
mysql-test/r/handler.result:
  auto
mysql-test/r/variables.result:
  Merge with 4.0
mysql-test/t/func_str.test:
  auto
mysql-test/t/handler.test:
  auto
mysql-test/t/variables.test:
  Merge with 4.0
scripts/make_win_src_distribution.sh:
  auto
scripts/mysql_install_db.sh:
  Use original file
sql/Makefile.am:
  Merge with 4.0
sql/ha_innodb.cc:
  auto
sql/item_strfunc.cc:
  Merge with 4.0
sql/mysql_priv.h:
  auto
sql/mysqld.cc:
  Merge with 4.0
sql/set_var.cc:
  Merge with 4.0
sql/slave.cc:
  auto
sql/sql_class.h:
  auto
sql/sql_handler.cc:
  Merge with 4.0
strings/ctype-tis620.c:
  Merge with 4.0

into mysql.com:/dbdata/psergey/mysql-4.0-root

sql/sql_union.cc:
  describe should go until the end

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


mysql-test/r/func_encrypt.result:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged

mysql-test/r/derived.result:
  explain of hidden subselect changed according to review
mysql-test/r/subselect.result:
  explain of hidden subselect changed according to review
mysql-test/r/union.result:
  explain of hidden subselect changed according to review
sql/sql_class.h:
  we bo not need sign for now
sql/sql_lex.h:
  we do not need sign for now

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


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

rpl_relayrotate.test to innodb.test since this test requires innodb support.


mysql-test/t/innodb-master.opt:
  Rename: mysql-test/t/rpl_relayrotate-master.opt -> mysql-test/t/innodb-master.opt

Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.


VC++Files/bdb/bdb.dsp:
  Small, automatic changes
VC++Files/client/mysql.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqladmin.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlclient.dsp:
  Removed files that should only be used with mysql command line client
VC++Files/client/mysqldump.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlimport.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlshow.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/comp_err/comp_err.dsp:
  Automatic changes
VC++Files/dbug/dbug.dsp:
  Automatic changes
VC++Files/heap/heap.dsp:
  automatic changes
VC++Files/innobase/innobase.dsp:
  Automatic changes
VC++Files/isam/isam.dsp:
  Automatic changes
VC++Files/isamchk/isamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysql/libmysql.dsp:
  Automatic changes
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Add missing files
VC++Files/libmysqld/libmysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysqltest/myTest.dsp:
  Automatic changes
VC++Files/merge/merge.dsp:
  Automatic changes
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisam/myisam.dsp:
  automatic changes
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  automatic changes
VC++Files/myisamchk/myisamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisamlog/myisamlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisammrg/myisammrg.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisampack/myisampack.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysql.dsw:
  Automatic changes
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqldemb/mysqldemb.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlserver/mysqlserver.dsp:
  Automatic changes
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Automatic changes
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Automatic changes
VC++Files/mysys/mysys.dsp:
  Automatic changes
VC++Files/pack_isam/pack_isam.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/perror/perror.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/regex/regex.dsp:
  Automatic changes
VC++Files/replace/replace.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/sql/mysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/strings/strings.dsp:
  Removed duplicate code for strnlen
VC++Files/test1/test1.dsp:
  Automatic changes
VC++Files/thr_test/thr_test.dsp:
  Automatic changes
VC++Files/vio/vio.dsp:
  Automatic changes
VC++Files/zlib/contrib/asm386/zlibvc.dsp:
  Automatic changes
VC++Files/zlib/zlib.dsp:
  Automatic changes
extra/my_print_defaults.c:
  Fixed bug in --verbose
include/m_string.h:
  Portability fix
include/mysql_embed.h:
  Better setting of server_version variable
include/mysql_version.h.in:
  Better license text handling
innobase/pars/pars0lex.l:
  Remove compiler warnings
innobase/trx/trx0sys.c:
  Remove compiler warnings
libmysqld/lib_sql.cc:
  Better setting of server_version variable
libmysqld/libmysqld.def:
  Add functions needed for mysql command line client
myisam/myisam_ftdump.c:
  Remove compiler warnings
mysys/sha1.c:
  Remove compiler warnings
scripts/make_win_src_distribution.sh:
  Safety fix
scripts/mysql_install_db.sh:
  Backport from 4.1 to allow make_win_src_distribution create the privilege tables
sql/Makefile.am:
  Add new file mysqld_suffix.h
  Remove not used file sql_olap.h
sql/ha_innodb.cc:
  Remove not used variable
sql/mysqld.cc:
  Better setting of server_version variable
sql/set_var.cc:
  Fixed bug when showing lower_case_file_system
strings/ctype-tis620.c:
  Remove compiler warnings

into mysql.com:/home/mysql_src/mysql-4.0


sql/set_var.cc:
  Auto merged

(fix by our Harrison Fisk): when one does SET GLOBAL SERVER_ID=x, we must set
server_id_supplied to 1.


sql/mysql_priv.h:
  server_id_supplied must be here to be visible in set_var.cc
sql/mysqld.cc:
  rephrasing warnings when server id is not set explicitely.
sql/set_var.cc:
  when one does SET GLOBAL SERVER_ID=x; it should be considered as explicitely setting
  the server id, so do server_id_supplied=1.
sql/slave.cc:
  Correcting wrong comment

Made the combination of INTO and FROM DUAL work, e.g.
SELECT 1 INTO @x FROM DUAL.
As a consequence, DUAL is made a reserved word. It would work to not have
it reserved, but it was deemed to be confusing as a user defined table by
the same name then must be qualified with a db (schema).


sql/sql_yacc.yy:
  Made the combination of INTO and FROM DUAL work, e.g.
  SELECT 1 INTO @x FROM DUAL.
  As a consequence, DUAL is made a reserved word. It would work to not have
  it reserved, but it was deemed to be confusing as a user defined table by
  the same name then must be qualified with a db (schema).