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


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

into beethoven.site:/home/georg/work/mysql/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged

ndb/src/common/util/NdbSqlUtil.cpp:
  remove stupid check

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


BUILD/SETUP.sh:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/my_decimal.cc:
  Auto merged
sql/my_decimal.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

Lots of small fixes to multi-precision-math path
Give Note for '123.4e'
Added helper functions type 'val_string_from_real()
Don't give warnings for end space for string2decimal()
Changed storage of values for SP so that we can detect length of argument without strlen()
Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer



BUILD/SETUP.sh:
  with-bdb ->with-berkeley-db
include/decimal.h:
  Make string2decimal and string2decimal_fixed inline
mysql-test/r/func_group.result:
  More tests (to find bugs in precision math fixes)
mysql-test/r/func_set.result:
  Test to cover more Item_func_field::val_xxx() code
mysql-test/r/ps_6bdb.result:
  update results
mysql-test/r/type_decimal.result:
  New tests
  Give note for '123.4e'
mysql-test/r/type_newdecimal.result:
  Number of decimal changes (probably right, but hard to verify)
mysql-test/t/func_group.test:
  More tests (to find bugs in precision math fixes)
mysql-test/t/func_set.test:
  Test to cover more Item_func_field::val_xxx() code
mysql-test/t/type_decimal.test:
  New tests to cover more cases in decimal.c
sql/item.cc:
  Added helper functions type 'val_string_from_real()'
  Use new interfase to str2my_decimal()
  Moved nr_of_decimals() here (and made it static)
sql/item.h:
  Added helper functions type 'val_string_from_real()'
sql/item_func.cc:
  Style fixes
  Trivial optimizations
  Ensure null_value is set if my_decimal_add/sub/mul/div returns error
  Remove not needed Item_func_int_div::val_str()
  Join Item_func_signproc and Item_func_neg
  Fix that FIELD() works when first argument is NULL or one if it's arguments are NULL
  new str2my_decimal interface
sql/item_func.h:
  Make Item_func_int_div inherit from Item_int_func (allows us to remove some virtual functions)
  Join Item_func_signproc & Item_func_neg
sql/item_strfunc.cc:
  Move nr_of_decmails() to Item.cc (as it was only used here)
sql/item_sum.cc:
  Style fixes
  Change a lot of code to use new helper converter functions in item.cc
  Moved Item_sum::val_decimal() to Item_sum_int::val_decimal()
  Fixed calls to wrong functions (Item_sum_num::val_int())
  Ensure that all hybrid functions checks hybrid_type in val_xxx() (As there is no gurantee that they are called in the right context)
  Simplify key_length allocation in Item_sum_sum_distinct()
  Simplified create_tmp_field() and reset_field()
  Fixed potential error in Item_sum_hybrid::reset_field()
  Optimize Item_sum_avg::update_field()
  Item_std_field() functions musted be fully coded becasue Item_variance_field::val_xxx functions called helper functions
  Coded missing Item_sum_ufd_xxx::val_decimal() functions
sql/item_sum.h:
  Moved Item_sum::val_decimal() to Item_sum_int::val_decimal()
  Added missing Item_sum_ufd_xxx::val_decimal() functions
  Removed not used scale() function.
  Fixed that Item_std_field() works with decimal arguments
  Fixed that CREATE ... STD() will create a REAL field
sql/log_event.cc:
  Ensure that we use same format for all types
sql/my_decimal.cc:
  Don't give warnings for end space for string2decimal()
  Added dbug_print_decimal()
sql/my_decimal.h:
  Style fixes
  Prototypes for new functions
  New interface for str2my_decimal()
sql/mysql_priv.h:
  Made nr_of_decimals() static
sql/protocol.cc:
  Simplify code (by assume that decimal can't be bigger than DECIMAL_MAX_STR_LENGTH]
sql/protocol_cursor.cc:
  Changed storage of values for SP so that we can detect length of argument without strlen()
sql/sp_head.cc:
  Simplify code for decimal handling by letting item handling conversion to decimal
sql/sp_rcontext.cc:
  Use new method to get length of arguments
sql/sql_analyse.cc:
  if -> switch
  Increase 'empty' if decimal value=0
  Remove usage of strcat()
sql/sql_base.cc:
  Remove unnecessary checks
sql/sql_class.cc:
  Remove not needed 'else'
  Removed not used variables
sql/sql_select.cc:
  remove test for impossible condtion
strings/decimal.c:
  Made two trivial functions macros
  Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer
  This safer than before as we don't require an end \0 anymore (old code gave wrong answers in MySQL for some internals strings that where not \0 terminated)
  Detect error numbers of type '12.55e'
  str2dec() will now set 'to' to zero in case of errors

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

sql/examples/ha_tina.cc:
  make tina to compile (wasn't catched with -max build)
sql/sql_yacc.yy:
  fix compilation errors --without-geometry

into mysql.com:/home/pem/work/mysql-5.0


sql/sp_head.cc:
  Auto merged

  BUG#6642: Stored procedure crash if expression with set function
  BUG#7013: Stored procedure crash if group by ... with rollup
  BUG#7743: 'Lost connection to MySQL server during query' on Stored Procedure
  BUG#7992: SELECT .. INTO variable .. within Stored Procedure crashes
            the server
  BUG#8116: calling simple stored procedure twice in a row results
            in server crash

Rolling back the item change list after each substatement in a procedure
fixed the failing assert().


mysql-test/r/sp.result:
  New test cases for BUG#6642, 7013, 7743, 7992 and 8116.
mysql-test/t/sp.test:
  New test cases for BUG#6642, 7013, 7743, 7992 and 8116.
sql/sp_head.cc:
  Roll back the item change list after each sub statement.

VC++Files/libmysqld/libmysqld.dsp:
  added sql/my_decimal.cc
VC++Files/sql/mysqld.dsp:
  added my_decimal.cpp
VC++Files/strings/strings.dsp:
  added decimal.c
sql/field.cc:
  conversion fixes for windows compilation
sql/item.h:
  fix for windows compilation
sql/item_func.cc:
  fixed conversion for windows (cast from ulonglong to double 
  is not supported)
sql/item_sum.cc:
  typecast fix for windows compilation
sql/sp_head.cc:
  typecast fix fo windows compilation
sql/sql_cache.cc:
  typecast fix for windows compilation

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

sql/ha_federated.h:
  copy-paste fix
sql/sql_parse.cc:
  after-merge fix

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

mysql-test/r/ndb_cache2.result:
  Decreased ndb_cache_check_time to avoid timing related problem on aix52-64bit and octane2
mysql-test/t/ndb_cache2.test:
  Decreased ndb_cache_check_time to avoid timing related problem on aix52-64bit and octane2

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa

into mysql.com:/usr/home/bar/mysql-5.0.fresh


include/my_base.h:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged

Backporting Monty's fix for 5.0 into 4.1.

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


sql/mysqld.cc:
  Auto merged

Added NULL initilizers for commit_by_xid and rollback_by_xid in hton struct. Changed back table->in_use to current_thd.

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

Some variable wasn't moved to the initial state during mysql_server_end


myisam/ft_stopwords.c:
  resetting ft_stopword_file
sql/mysqld.cc:
  free_charsets() call added

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa


configure.in:
  Auto merged
mysql-test/r/drop_temp_table.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583


BitKeeper/etc/logging_ok:
  auto-union

 - the variable MASTER_MY_PORT1 was used from the script, but it was not set to the port where the second server was started


mysql-test/mysql-test-run.sh:
  Export the variable MASTER_MY_PORT1 from the place where the second master is started

config/ac-macros/character_sets.m4


mysys/charset-def.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged

into mysql.com:/usr/home/bar/mysql-5.0.fresh


mysql-test/mysql-test-run.pl:
  Auto merged

in the grant tables case-insensitive and updating test results.


scripts/mysql_create_system_tables.sh:
  Fix collation of procs_priv.proc_priv
scripts/mysql_fix_privilege_tables.sql:
  Fix enum fields to have case-insensitive collation
mysql-test/r/information_schema.result:
  Update results
mysql-test/r/system_mysql_db.result:
  Update results
mysql-test/r/lowercase_table_grant.result:
  Update results

BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Update results
scripts/mysql_create_system_tables.sh:
  Merge fix for Bug #7617, making enum fields in grant tables
  case-insensitive.
scripts/mysql_fix_privilege_tables.sql:
  Merge fix for Bug #7617, and fix additional enum/set columns.
sql/sql_acl.cc:
  Hand-merge due to whitespace change
sql/sql_lex.cc:
  Hand-merge bug fix.

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

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

into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3

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

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


scripts/mysql_create_system_tables.sh:
  Auto merged