into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge


mysys/my_error.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

 * The prepared statement query is put into binary log on execution only if it is an update query.


sql/item_func.cc:
  New, binlog-aware character sets support in SQL Syntax for Prepared statements.
sql/mysql_priv.h:
  New, binlog-aware character sets support in SQL Syntax for Prepared statements.

allow deletion of tablespaces whose names contain "'"


innobase/dict/dict0load.c:
  dict_check_tablespaces_or_store_max_id():
  Dynamically allocate memory for file name
innobase/fil/fil0fil.c:
  Dynamically allocate memory for file names
innobase/os/os0file.c:
  os_file_dirname(): allocate slightly less memory
  os_file_create_subdirs_if_needed(): compare more efficiently
innobase/row/row0mysql.c:
  Allow tablespaces with "'" in their names to be deleted
  Display identifiers with ut_print_name() or dict_index_name_print()

no AM_MAINTAINER_MODE macro in configure.in


BitKeeper/deleted/.del-compile-pentium-maintainer~3747d5c8d7ec49df:
  Delete: BUILD/compile-pentium-maintainer

mode and one should expect better dependencies tracking.

result": new Item_param member for use in val_str()


sql/item.cc:
  Fix for Bug#3796:
  - return str_value_ptr from val_str to prevent modifications of parameter 
  value.
sql/item.h:
  Fix for bug#3796:
  - Item::val_str() method semantics documented
  - new member of Item_param
tests/client_test.c:
  Test case for bug #3796 added. A few compile-time warnings removed.

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

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

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

removed influence of some tests on other tests


mysql-test/r/multi_update.result:
  removed influence on other tests
mysql-test/r/subselect.result:
  if exists should not be used inside test
mysql-test/t/multi_update.test:
  removed influence on other tests
mysql-test/t/subselect.test:
  if exists should not be used inside test
mysql-test/t/system_mysql_db_fix.test:
  removed influence on other tests

  Added include of ndbout


ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Added include of ndbout

  Missing  semicolon


sql/ha_ndbcluster.cc:
  Missing  semicolon

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

Build-tools/Do-compile:
  Auto merged
include/my_global.h:
  Auto merged

Build-tools/Do-compile:
  Added option --config-extra-env
include/my_global.h:
  Cleaned up comment to follow same indentation style as the rest of the code

into neptunus.(none):/home/magnus/mysql-4.1

ndb/src/Makefile:
  Compile newtonapi
ndb/src/newtonapi/dba_schema.cpp:
  Use NdbSchemaCon.hpp from newtonapi

sql/handler.h:
  Remove compiler warnings

  Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater


include/my_global.h:
  Improved a comment about HAVE_BROKEN_PREAD: pread() only works on HP-UX 11.0 if one installs kernel patch PHKL_20349 or greater

mysql-test/r/variables.result:
  update results after merge
strings/int2str.c:
  Portability fix (using 'char' as a parameter may give a warning)

configure.in:
  Auto merged
innobase/os/os0file.c:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysql-test/r/variables.result:
  merge fix

configure.in:
  Ensure that innodb gets system specific CFLAGS and CXXFLAGS
innobase/os/os0file.c:
  Don't use pread/pwrite on systems where these are not working.
  This fixes a bug on HPUX, where InnoDB didn't create the ibdata1 file correctly.

include/config-netware.h:
  Always enable HAVE_COMPRESS on netware
  We can't detect compress in configure on netware because we must use AC_TRY_RUN to detect zlib on other platforms

netware/BUILD/nwbootstrap:
  Auto merged

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

mysql-test/t/fulltext.test:
  After merge fix

VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
myisam/ft_parser.c:
  Keep old code
mysql-test/r/fulltext.result:
  Remove duplicate test from 4.0

netware/BUILD/nwbootstrap:
  Patch from Novell, create the libmysqld.imp file.
netware/mysqld_safe.c:
  Patch from Novell, new option --set-variable.

myisam/ft_boolean_search.c:
  perlify comment

produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.


client/mysql.cc:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
client/mysqladmin.c:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
dbug/dbug.c:
   _dig_vec became _dig_vec_upper.
include/m_string.h:
  _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
  my_itoa()/my_ltoa() functions were removed because they were never used in our code.
  int2str() now has one more argument which controls case of digits it will produce.
include/my_global.h:
  my_itoa()/my_ltoa() functions were removed because they were never used in our code.
isam/isamchk.c:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
libmysql/libmysql.def:
  _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower.
myisam/myisamchk.c:
  Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
  call.
mysys/mf_tempfile.c:
  _dig_vec became _dig_vec_upper.
mysys/my_error.c:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
mysys/my_tempnam.c:
  _dig_vec became _dig_vec_upper.
sql-common/client.c:
  Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str()
  call.
sql/item_strfunc.cc:
  _dig_vec became _dig_vec_upper. Also we don't need hex[] array in this file now because we
  have _dig_vec_lower instead.
sql/mysqld.cc:
  Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str()
  call.
sql/password.c:
  _dig_vec became _dig_vec_upper.
sql/sql_bitmap.h:
  _dig_vec became _dig_vec_upper.
strings/int2str.c:
  Replaced _dig_vec by _dig_vec_upper/_dig_vec_lower pair.
  int2str() now has one more argument which controls case of digits it will produce.
  my_itoa()/my_ltoa() functions were removed because they were never used in our code.
strings/longlong2str-x86.s:
  _dig_vec became _dig_vec_upper.
strings/longlong2str.c:
  _dig_vec became _dig_vec_upper.
strings/my_vsnprintf.c:
  If my_snprintf() is printing %x argument it should produce lower case hexadecimal digits
  to be snprintf() compatible.

Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
Remove (char*) casts of string constants; add const qualifiers
Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP


innobase/btr/btr0cur.c:
  Cast away constness from dfield_get_data() result
innobase/buf/buf0buf.c:
  Enclose a debug assertion in #ifdef UNIV_SYNC_DEBUG
innobase/buf/buf0rea.c:
  Corrected compile error #ifdef UNIV_DEBUG
innobase/dict/dict0boot.c:
  Remove (char*) casts of string constants
innobase/dict/dict0crea.c:
  Remove (char*) casts of string constants
innobase/dict/dict0dict.c:
  Enclosed a debug assertion in #ifdef UNIV_SYNC_DEBUG
  Replaced some debug assertions with preprocessor tests
  Add const qualifiers to string constants
innobase/dict/dict0load.c:
  Remove (char*) casts of string constants
innobase/fil/fil0fil.c:
  Remove (char*) casts of string constants
  Enclose debug assertions in #ifdef UNIV_SYNC_DEBUG
innobase/ha/ha0ha.c:
  Enclose debug assertion in #ifdef UNIV_SYNC_DEBUG
innobase/ibuf/ibuf0ibuf.c:
  Remove (char*) casts of string constants
innobase/include/buf0buf.ic:
  Add const qualifier to string parameter
innobase/include/fil0fil.h:
  Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
innobase/include/log0recv.h:
  Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
  Enclose ibbackup specific code in #ifdef UNIV_HOTBACKUP
innobase/include/mem0dbg.ic:
  Add const qualifiers to string parameters
innobase/include/srv0srv.h:
  Add const qualifiers to string constants
  Enclose srv_arch_dir and srv_log_archive_on #ifdef UNIV_LOG_ARCHIVE
innobase/include/sync0rw.ic:
  Add const qualifier to string parameter
innobase/include/sync0sync.ic:
  Add const qualifier to string parameter
innobase/log/log0log.c:
  Enclose log archiving code in #ifdef UNIV_LOG_ARCHIVE
  Do not cast string constants to (char*)
innobase/log/log0recv.c:
  Enclose ibbackup specific code in #ifdef UNIV_HOTBACKUP
  Enclose disabled log code in #ifdef UNIV_LOG_REPLICATE or UNIV_LOG_ARCHIVE
innobase/mem/mem0dbg.c:
  Add const qualifiers to string parameters
innobase/page/page0page.c:
  Remove (char*) casts of string constants
innobase/pars/pars0pars.c:
  Add const qualifier to string variable
innobase/row/row0ins.c:
  Remove (char*) casts of string constants
  Add const qualifiers to string parameters
  row_ins_foreign_check_on_constraint(): Allocate table_name dynamically
innobase/row/row0mysql.c:
  Remove (char*) casts of string constants
innobase/row/row0sel.c:
  Remove (char*) casts of string constants
innobase/srv/srv0srv.c:
  Remove (char*) casts of string constants
  Disable log archiving variables unless #ifdef UNIV_LOG_ARCHIVE
innobase/srv/srv0start.c:
  Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
  Remove (char*) casts of string constants
innobase/sync/sync0rw.c:
  Remove (char*) casts of string constants
  Add const qualifier to string parameter
innobase/sync/sync0sync.c:
  Remove (char*) cast of string constant
  Add const qualifier to string parameter
innobase/trx/trx0roll.c:
  Remove (char*) cast of string constants
innobase/trx/trx0sys.c:
  Remove (char*) cast of string constants
innobase/trx/trx0trx.c:
  Remove (char*) cast of string constant
sql/ha_innodb.cc:
  Enclose log archiving code in #ifdef UNIV_LOG_ARCHIVE

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

myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/rt_test.c:
  Auto merged
myisam/sp_test.c:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
myisam/mi_range.c:
  merging
myisam/mi_rnext.c:
  merging

innobase/os/os0thread.c:
  Portability fix
myisam/sort.c:
  Fixed wrong variable type (gave compiler warning)

VC++Files/innobase/innobase.dsp:
  Auto merged

Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
netware/Makefile.am:
  Auto merged