into neptunus.(none):/home/msvensson/mysql/bug9626

ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Don't use length when comparing column names

This fixes a compilation failure in mysql_com.h, which doesn't have
'uint' alias visibile. Maybe worth while changing to unsigned int, but
the rest of functions that work with defaults files return int.


include/my_sys.h:
  Change the return type back to int (modify_defaults_file).
include/mysql_com.h:
  Change the return type back to int (modify_defaults_file).
mysys/default_modify.c:
  Change the return type back to int (modify_defaults_file).

into mysql.com:/usr/home/ram/work/5.0.b6961

sql/item_func.cc:
  a fix (bug #10599: Numeric function 'abs' make server crash).
  Item_func_abs::decimal_op() and Item_func_neg::decimal_op()
  now return 0 if NULL.
  Trivial optimization - get rid of an extra jump for common situations.

into mysql.com:/usr/home/ram/work/5.0.b6961

  Increment to next version.


configure.in:
  Increment to next version.

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

sql/sp.cc:
  Simpe fix to avoid reference to unallocated memory (only opened was needed, but I reset both to make things safer and simpler)

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

into mysql.com:/home/jimw/my/mysql-5.0-clean


mysys/default.c:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged

sql/item.cc:
  Revert changes
sql/item.h:
  Revert changes
sql/sp_head.cc:
  Revert changes
sql/sp_rcontext.cc:
  Revert changes

client/mysqldump.c:
  Temporarily disable unused (and broken) code.
mysql-test/r/group_min_max.result:
  Update results
mysql-test/r/mysqldump.result:
  Update results
mysql-test/r/subselect.result:
  Update results
mysql-test/t/group_min_max.test:
  Ignore number of rows in output of most explain results
sql/sql_insert.cc:
  Fix reference to max_unique_length

mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/handler.h:
  Resolve merge
sql/table.cc:
  Resolve merge

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

ndb/include/kernel/ndb_limits.h:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysys/thr_alarm.c:
  Manual merge

 - Fix valgrind warnings
 - Remove static db, schema and table name buffers from Ndb.cpp


mysys/thr_alarm.c:
  Initialise sact to zero
ndb/include/kernel/ndb_limits.h:
  Set MAX_ATTR_NAME_SIZE to NAME_LEN which is tha maximum in MySQL
ndb/include/kernel/signaldata/GetTabInfo.hpp:
  Clean up
ndb/include/ndbapi/Ndb.hpp:
  Remove NDB_MAX_INTERNAL_NAME_LENGTH and all char buffers for schema, db and tablename.
  Made them dynamic and moved to NdbImpl.hpp
ndb/include/ndbapi/ndbapi_limits.h:
  Remove the static length's of attr, db, schema and table name.
ndb/src/common/transporter/Packer.cpp:
  Set theSignalId to ~0 when unpacking signal
ndb/src/ndbapi/Ndb.cpp:
  Moved schema, database and tablename to NdbImpl.hpp
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add NdbIndexImpl::init and NdbEventImpl::init
  Init all vars in NdbIndexImpl, NdbEventImpl, NdbTableImpl and NdbIndexImpl
  Delete the pseudo column NDB$RANGE_NO
  Copy tablename to internal buff in NdbDictInterface to get proper alignment.
  Convert length of table name from bytes words, when setting sz of LinearSectionPtr
  Set LinearSectionPtr array size to number of LinearSections used - save some stack.
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Add NdbEventImpl::init and NdbIndexImpl::init
  Remove clearNewProperties and copyNewProperties, it's easier to check if all vars are initied if it's done in the same func.
  Add buffer for tabname ti NdbDictInterface, memset it to 0 in initializer.
ndb/src/ndbapi/NdbImpl.hpp:
  Use BaseString for table, schema and db names.
ndb/src/ndbapi/Ndbinit.cpp:
  Move schema and db name to NdbImpl and use BaseString
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Destroy ndb_global_event_buffer_mutex and ndb_print_state_mutex
sql/ha_ndbcluster.cc:
  Check if pTrans is not null before calling closeTransaction
  Remove NDB_MAX_ATTR_NAME_SIZE
  Remove truncation of attr names. When attr name length is same in NDB as in MySQL this will be checked in functin check_column_name

sql/mysqld.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
client/mysqldump.c:
  Resolve merge
mysql-test/r/myisam.result:
  Resolve merge
mysql-test/r/mysqldump.result:
  Resolve merge
mysql-test/r/olap.result:
  Resolve merge
mysql-test/r/subselect.result:
  Resolve merge
mysql-test/t/myisam.test:
  Resolve merge
mysql-test/t/mysqldump.test:
  Resolve merge
mysql-test/t/olap.test:
  Resolve merge
mysql-test/t/range.test:
  Resolve merge
mysql-test/t/subselect.test:
  Resolve merge
ndb/src/common/util/version.c:
  Resolve merge
ndb/src/ndbapi/ndberror.c:
  Resolve merge
sql/item.cc:
  Resolve merge
sql/item_strfunc.h:
  Resolve merge
sql/sql_select.cc:
  Resolve merge
sql/sql_yacc.yy:
  Resolve merge

into mysql.com:/home/mydev/mysql-4.1-4100

After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().


mysql-test/r/merge.result:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  The test result.
mysql-test/t/merge.test:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  The test case does not in all cases show the problem
  without the bugfix. The improper memory allocation
  might get through undetected in many cases.
sql/ha_myisammrg.h:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Set a table_flag for the MERGE engine telling that any index
  might be unique without being specified as such.
sql/handler.h:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Added a new table_flag telling that any index
  might be unique without being specified as such.
sql/sql_insert.cc:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Changed the freeing of the memory to be symmetric to its
  allocation (my_safe_alloc -> my_safe_afree).
  This is not directly related to the bug.
sql/table.cc:
  Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
  Added a condition for MERGE tables. These do not have unique
  indexes. But every key could be a unique key on the underlying
  MyISAM table. So get the maximum key length for MERGE tables
  instead of the maximum unique key length. This is used for
  buffer allocation in write_record().

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

into mysql.com:/opt/local/work/mysql-5.0-root


include/my_dbug.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

include/my_dbug.h:
  Fix conflicting declaration and definition of db_output.
sql/mysqld.cc:
  Fix a compilation failure.

Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.


include/my_sys.h:
  Changed function name.
include/mysql_com.h:
  New function, modify_defaults_file()
libmysql/Makefile.shared:
  New file, default_modify.lo
libmysql/libmysql.def:
  New function, modify_defaults_file() and fixed version number.
libmysqld/libmysqld.def:
  New function, modify_defaults_file()
mysys/Makefile.am:
  New file, default_modify.c
mysys/default.c:
  Removed function from default.c. New, corresponding one is in default_modify.c,
  name is modify_defaults_file.
server-tools/instance-manager/commands.cc:
  Changed function name.
sql/mysqld.cc:
  Fixed typo.

mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Fix test to not include version number in results

failure).


include/my_dbug.h:
  Fix conflicting declaration and definition of db_output.

client/mysqldump.c:
  Merge bug fix
mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Merge bug fix

client/mysqldump.c:
  Optimize away a call to strend() by using return value of my_snprintf()

into mysql.com:/opt/local/work/mysql-5.0-root

into mysql.com:/space/pekka/ndb/version/my41

into mysql.com:/media/sda1/mysql/mysql-5.0-libtool

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

Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling


config/ac-macros/misc.m4:
  Remove warnings flags from icc when compiling with -Werror
configure.in:
  Remove warnings flags from icc when compiling with -Werror
extra/replace.c:
  Fix warnings from icc
include/my_dbug.h:
  Fix warnings from icc
sql/gen_lex_hash.cc:
  Fix warnings from icc
sql/mysql_priv.h:
  Add missing variables
sql/mysqld.cc:
  Fix warnings from icc:
  - made a lot of variables static
  - Removing some not used variables
  - Fixed wrong printf()
  - removed extern "C" from some functions
sql/spatial.h:
  Fix warnings from icc
sql/sql_acl.cc:
  Fixed memory leak
sql/sql_lex.cc:
  Fix warnings from icc
sql/sql_lex.h:
  Fix warnings from icc

ndb/src/common/util/version.c:
  allow upgrade 4.1.10->4.1.12

  Add YASSL to Windows source distribution
  Skip .deps, and remove .o files from source dist


scripts/make_win_src_distribution.sh:
  Add YASSL to Windows source distribution
  Skip .deps, and remove .o files from source dist

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