into krsna.patg.net:/home/patg/mysql-5.0

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/protocol.cc:
  Auto merged

1) If my.cnf is found in datadir and basedir, give a warning and use the
   one in basedir.
2) If my.cnf is found in datadir, use it, but give a warning.
3) No warning if my.cnf is in basedir.

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

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

into mysql.com:/home/timka/mysql/src/5.0-bug-8576

include/config-win.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysys/errors.c:
  Auto merged
include/mysys_err.h:
  Merge from 4.1, attempt#2.

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


sql/sql_class.h:
  Auto merged

into mysql.com:/home/timka/mysql/src/5.0-bug-8576


sql/opt_range.cc:
  Auto merged

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0

into mysql.com:/usr/home/bar/mysql-4.1

  Activate Unicode collations in Windows version.


include/config-win.h:
  Activate Unicode collations in Windows version.

        bug #7215: information_schema: columns are longtext instead of varchar

The problem was in different representations of double variables depending on
platform/compiler/compile options. In some cases double variables are represented by
64 bits (while in memory), or by 80 bits (while in FPU register). As a result equal
values are not considered "==". As many sources point out,  doubles should not be
compared by '==' for this reason. This fix subtracts the scaled minimal double
value X such that 1 + X != 1, to ensure that the inequality holds in any case.


sql/opt_range.cc:
  Do not compare double values with == because they may have different representations.

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

ndb/src/kernel/main.cpp:
  merge

   make sure transporter connections are close early in shutdown


ndb/src/common/logger/LogHandler.cpp:
  removed printout "- Repeated 1 times"
ndb/src/kernel/main.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.cpp:
  make sure transporter connections are close early in shutdown
ndb/src/kernel/vm/Emulator.hpp:
  make sure transporter connections are close early in shutdown

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0

Patch #2, all coding style changes per Kostja's review 
(as requested to keep style changes separate from functionality changes),
as well as changes to the test suit to no longer use hard-coded port 
values in foreign table creation statement


mysql-test/r/federated.result:
  Now using SLAVE_PORT as opposed to hard-coded port value
mysql-test/t/federated.test:
  - changed test to use SLAVE_MYPORT
  - made all standard SQL uppercase
  - made test 80 cols, except blob inserts of text
sql/ha_federated.cc:
  - made sure all comments and style changes were according to Kostja's 
  review 
  - combined parse_url error handling into a 'error:' block, took out 
  triple exclamation points.
  - clarified commented documentation
  - got rid of all trailing spaces

This is the first changeset of suggested changes recommended in Kostja's 
review of my patch, 1.1846, which includes only functionality changes. 
Style changes/Documentation patch to follow.


include/mysql.h:
  removed declaration of cli_fetch_lengths per Kostja's suggestion
libmysql/libmysql.c:
  moved mysql_fetch_lengths to client.c (for server to access) per Kostja's
  suggestion
sql-common/client.c:
  added back 'static' to function definition, added mysql_fetch_lengths
sql/ha_federated.cc:
  changed to use defines as opposed to hardcoded values
sql/ha_federated.h:
  took out duplicate table_flag, fixed a resolve mistake

extra/perror.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Merge change in warning message
sql/sql_parse.cc:
  Hand-merge

mysql-test/t/rpl_charset.test:
  I have no idea why the automatic merge changed these, but now I have changed it back

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

client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_charset.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/t/rpl_charset.test:
  Manual merge
sql/log_event.cc:
  Manual merge

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


sql/sql_acl.cc:
  Auto merged

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


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

into krsna.patg.net:/home/patg/mysql-5.0


sql/handler.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-bug8397


sql/item.cc:
  Auto merged

In Item_cache_decimal::store(item) the call item->val_decimal_result() 
returns NULL if the passed item has an SQL null value. Don't try copying
NULL into Item_cache_decimal::val in this case.


mysql-test/r/type_decimal.result:
  Test for BUG#8397
mysql-test/t/type_decimal.test:
  Test for BUG#8397
sql/item.cc:
  Fix for BUG#8397: In Item_cache_decimal::store(item) the call 
  item->val_decimal_result() returns NULL if the passed item has an SQL null 
  value. Don't try copying NULL into Item_cache_decimal::val in this case.