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

  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

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

mysql-test/r/union.result:
  new tests, more correct results for old one
mysql-test/t/union.test:
  new tests, more correct results for old one
sql/field.cc:
  new way to make field types csting
sql/field.h:
  new way to make field types csting
sql/item.cc:
  new way to make field types csting
sql/sql_derived.cc:
  fixed typo
sql/sql_lex.h:
  comment added

mysql-test/r/rpl_change_master.result:
  Updated results

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

Now the I/O thread (in flush_master_info()) flushes the relay log to disk
after reading every event. Slower but provides additionnal safety in case
of brutal crash.
I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
because sometimes flush_master_info() is called when there is no usable
relay log (the relay log's IO_CACHE is not initialized so can't be flushed).


mysql-test/r/rpl_loaddata_rule_m.result:
  avoid a harmless error in the .err file; we don't need a slave in this test
  (even though it's called 'rpl' because it's testing binlog-ignore-db).
mysql-test/t/rpl_loaddata_rule_m.test:
  result update
sql/repl_failsafe.cc:
  update call to flush_master_info() according to new prototype.
sql/slave.cc:
  - Now the I/O thread (in flush_master_info()) flushes the relay log to disk
  after reading every event. Slower but provides additionnal safety in case
  of brutal crash.
  I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
  because sometimes flush_master_info() is called when there is no usable
  relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
  - Update version in message.
  - Remove warning about bug as it's not true anymore (since this changeset).
sql/slave.h:
  new prototype
sql/sql_repl.cc:
  update call to flush_master_info() according to new prototype.

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


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

into mysql.com:/my/mysql-4.1


sql/item_func.cc:
  Auto merged

mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/fulltext_left_join.test:
  Auto merged

Added option --max-record-length=# to myisamchk
Don't try repair twice if doing myisamchk --repair --force
Shared memory handler didn't clean up things on errors or shutdown


VC++Files/libmysqltest/mytest.c:
  Fixed compiler warnings from Intel compiler
include/myisam.h:
  Added option --max-record-length=# to myisamchk
include/mysql_com.h:
  Fixed compiler warnings from Intel compiler
innobase/btr/btr0btr.c:
  Fixed compiler warnings from Intel compiler
innobase/btr/btr0cur.c:
  Fixed compiler warnings from Intel compiler
innobase/include/btr0btr.ic:
  Fixed compiler warnings from Intel compiler
innobase/include/buf0buf.ic:
  Fixed compiler warnings from Intel compiler
innobase/include/row0sel.ic:
  Fixed compiler warnings from Intel compiler
innobase/include/row0upd.ic:
  Fixed compiler warnings from Intel compiler
innobase/include/trx0rseg.ic:
  Fixed compiler warnings from Intel compiler
innobase/pars/pars0opt.c:
  Fixed compiler warnings from Intel compiler
innobase/que/que0que.c:
  Fixed compiler warnings from Intel compiler
myisam/mi_check.c:
  Added option --max-record-length=# to myisamchk
  Better error messages
myisam/myisamchk.c:
  Added option --max-record-length=# to myisamchk
  Don't try repair twice if doing myisamchk --repair --force
mysql-test/r/create.result:
  Updated test results
mysql-test/t/create.test:
  Better initialization
sql/ha_innodb.cc:
  Fixed compiler warnings from Intel compiler
sql/item_func.cc:
  Fixed compiler warnings from Intel compiler
sql/mysqld.cc:
  Fixed compiler warnings from Intel compiler
  Cleaned up handle_connections_shared_memory
  Shared memory handler didn't clean up things on errors or shutdown
strings/bmove512.c:
  Fixed compiler warnings from Intel compiler

mysql-test/r/union.result:
  new results with max union field length detecting
  type conversion tests
mysql-test/t/union.test:
  type conversion tests
sql/field.h:
  field converion support
sql/item.cc:
  fixed printing field of internal temporary table of SELECT (reference from HAVING clause)
  layout fix
  new item for storing field type
sql/item.h:
  new item for storing field type
sql/item_subselect.cc:
  new subquery item length/dec detecting
sql/mysql_priv.h:
  we do not need pre-inited tables and fields
sql/sql_base.cc:
  we do not need double fix_fielding
sql/sql_class.h:
  we do not need double fix_fielding
sql/sql_derived.cc:
  preparing moved before temporary table creation
sql/sql_lex.h:
  we do not need pre-inited tables and fields
  new lists to store fields types and fields of temporary table
sql/sql_parse.cc:
  we do not need pre-inited tables and fields
sql/sql_prepare.cc:
  we do not need pre-inited tables and fields
sql/sql_select.cc:
  we do not need pre-inited tables and fields
  support mysql_select call from derived tables after it preparing (in derived table routing)
  support of crreating temporary table fields from Item_type_holder
sql/sql_select.h:
  we do not need pre-inited tables and fields
sql/sql_union.cc:
  we do not need pre-inited tables and fields
  check of columns number in union moved to prepare()
  prepering of SELECTS moved before temporary table creation, fixed union columns type/length detecting
sql/sql_update.cc:
  we do not need pre-inited tables and fields

into mysql.com:/home/dlenev/src/mysql-4.1-bg1500-2


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged

We treat Item_param whose value is not set as non-const.
This allows us to avoid use of Item_param's value (not yet existing) in 
those fix_fields and fix_length_and_dec that do calculations if their 
Items arguments are const. So we can call fix_fields for such items from
mysql_prepare safely.


sql/item.cc:
  Now Item_param is non-constant (const_item()==FALSE) until its value is set.
sql/item.h:
  Added Item::const_during_execution() method which indicates constants that will be known 
  during execution phase (but they may be not known during preparing phase for example parameters 
  of prep. statements.)
  Made Item_param non-constant until its is value set, so its value won't be requested during 
  prepare statement step.
sql/item_func.cc:
  Fulltext search AGAINST clause now allows prepared statement parameter as its argument.
  Removed duplicate used_tables_cache update in Item_func_match::fix_fields()
  (it is set during Item_func::fix_fields).
tests/client_test.c:
  Added test for bug #1500 "Server crash with mysql_prepare"

into teton.kitebird.com:/home/paul/mysql-4.1


sql/slave.cc:
  Auto merged

into mysql.com:/my/mysql-4.1


sql/ha_innodb.cc:
  Auto merged

Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized


VC++Files/client/mysql.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/comp_err/comp_err.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/innobase/innobase.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/libmysqld.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/myisamchk/myisamchk.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/myisamlog/myisamlog.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/myisampack/myisampack.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/mysqlmanager/MySqlManager.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Updated project files for windows according to suggestions from Intel
VC++Files/mysys/mysys.dsp:
  Updated project files for windows according to suggestions from Intel
libmysql/libmysql.c:
  Removed not used include files (which caused problems on Win64)
mysql-test/r/rpl_change_master.result:
  Made test portable
mysql-test/t/rpl_change_master.test:
  Made test portable
sql-common/client.c:
  Removed not used include files (which caused problems on Win64)
sql/ha_innodb.cc:
  Ensure that mutex is not freed if not initilized
sql/hostname.cc:
  Ensure that mutex is not freed if not initilized
sql/slave.cc:
  Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.

to order used in START SLAVE syntax.


sql/log.cc:
  Change word order.
sql/slave.cc:
  Change word order.

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

sql/ha_isammrg.cc:
  no Bitmap::operator=(ulonglong) present