into  mysql.com:/home/ram/work/b19690/b19690.4.1


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

Depending on the queries we use different data processing methods
and can lose some data in case of double (and decimal in 4.1) fields.

The fix consists of two parts:
1. double comparison changed, now double a is equal to double b 
if (a-b) is less than 5*0.1^(1 + max(a->decimals, b->decimals)). 
For example, if a->decimals==1, b->decimals==2, a==b if (a-b)<0.005
2. if we use a temporary table, store double values there as is 
to avoid any data conversion (rounding).


mysql-test/r/type_float.result:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - test result
mysql-test/t/type_float.test:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - test case
sql/field.cc:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - use not_fixed flag instead of dec to check bounds.
sql/field.h:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - Field_Double::not_fixed flag introduced, which is set if dec == NOT_FIXED_DEC
      and is used in the ::store() to check bounds. 
    - new constructor introduced (with not_fixed_arg parameter).
sql/init.cc:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - fill log_01[] array with 0.1 powers.
sql/item_cmpfunc.cc:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - compare_real_fixed() and compare_e_real_fixed() introduced,
      they consider double a == double b if a-b is less than 'precision',
      'precision' is set to 5*0.1^(1 + max(a->decimals, b->decimals)), 
      for example, if a->decimals==1, b->decimals==2, 'precision' is 0.005
    - use the above functions if both arguments are fixed.
sql/item_cmpfunc.h:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - Arg_comparator::presision introduced.
    - Arg_comparator::compare_real_fixed(), Arg_comparator::compare_e_real_fixed() introduced.
sql/mysql_priv.h:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - log_01 array of 0.1 powers added.
sql/mysqld.cc:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - log_01 array of 0.1 powers added.
sql/sql_select.cc:
  fix for bug #19690: ORDER BY eliminates rows from the result
    - if we create double field in a temporary table, set not_fixed flag
      (use proper constructor) to avoid data conversion 
      in the Field_double::store(). Otherwise we can lose some data.

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint


sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

 - Set the timeout values only where needed


sql/mysql_priv.h:
  Add new functions for setting read and write timeout on "net"
sql/mysqld.cc:
  - Move the setting of "read_timeout" to the value of "connect_timeout" to
    just before 'check_connection' which is the function where we want
    to use the different timeout
  - With the new functions to set timeout on "net", there is no need to
    specifically set the default wait_timeout on windows.
sql/net_serv.cc:
  Add new functions for setting read and write timeout of "net, when
  server is compiled not to use alarms it will set the write/read timeout
  directly on connection using 'vio_timeout'(using setsockopt if socket)
sql/repl_failsafe.cc:
  Put unused code within "#if NOT_USED"
sql/set_var.cc:
  Use 'net_set_*_timeout' when adjusting timeout value
  on the current connection
sql/slave.cc:
  The read timeout used when connecting to master server is set
  using 'mysql_options' in 'connect_to_master' function
sql/sql_parse.cc:
  - Set read and write timeout values to "connect_timeout" during
  connect phase
  - Use "read_timeout" value during sslaccept phase, since this is during
  connect phase it implies "connect-timeout"
  - Set read and write timeout value back to default after connect phase
  - Set "read_timeout" to "wait_timeout" while waiting for client.
sql/sql_repl.cc:
  Set "read_timeout" to "wait_timeout" while ask other mysqld to send file
sql-common/client.c:
  Call 'vio_timeout' to set up the read and write timeout's for the
  newly created connection. It only need to be done once at connect time.
vio/vio.c:
  Use 'vio_timeout' for setting timeout also on an SSL connection
  since they both use sockets
vio/viossl.c:
  Remove 'vio_ssl_timeout' function

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41

into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

into  ymer.(none):/usr/local/mysql/x/mysql-4.1-maint

Fixes:
- Bug #24299: 
- Bug #25596: 


innobase/dict/dict0dict.c:
  Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
  
  Revision r36:
  innodb-4.1: Port r1030 from innodb/branches/5.0:
  
  Replace isspace() with a wrapper ib_isspace(), because on
  Win32 isspace(0xa0) appears to hold.  (Bug #24299)
  
  
  Revision r38:
  ib_isspace(c): Check for c being the null character.  (Bug #25596)

into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

files. This helps stability of multiple parallel automated test runs,
avoiding the situation where one bad build fills up disk with 1000s of
core files, causing failures in other test runs.

mysql-test/r/range.result:
  Fix for bug #22533: Traditional: Too-long bit value not rejected.
    - results adjusted.

into  mysql.com:/usr/home/ram/work/bug22533/my41-bug22533

ndb/src/libndb.ver.in:
  BitKeeper file /home/mtaylor/src/mysql-4.1-maint/ndb/src/libndb.ver.in

configure.in:
  Added variables to support ndbclient library versioning.
  Set version to 1.0.0 for 4.1
ndb/src/Makefile.am:
  Making use of new variables. Adding support for versioned libraries.

mysql-test/r/ndb_types.result:
  update results
mysql-test/t/ndb_types.test:
  Sleep a bit longer, to ensure that timestamp changes between:
  set @now = now();
  and:
  insert into/update t1
  
  Test case failed (select timestamp>@now from t1 ==> 0, should be 1), and passed when run again.  This should(?) avoid that fluke.
  
  Clean up test file a bit while I'm here.

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41


sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


configure.in:
  Use local

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41

into  mysql.com:/usr/home/ram/work/bug22533/my41-bug22533


sql/item.cc:
  Auto merged

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


configure.in:
  Use local

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


innobase/buf/buf0buf.c:
  Use local
innobase/buf/buf0flu.c:
  Use local
innobase/buf/buf0lru.c:
  Use local
innobase/include/buf0buf.h:
  Use local
innobase/include/buf0buf.ic:
  Use local
innobase/include/sync0arr.h:
  Use local
innobase/include/sync0rw.h:
  Use local
innobase/include/sync0rw.ic:
  Use local
innobase/include/sync0sync.h:
  Use local
innobase/os/os0sync.c:
  Use local
innobase/sync/sync0arr.c:
  Use local
innobase/sync/sync0rw.c:
  Use local
innobase/sync/sync0sync.c:
  Use local

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


BUILD/check-cpu:
  Auto merged

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

	hyphen in it (like ds-cpl).

convert illegal chars in cpu flags to '_' for variable assignment


BUILD/check-cpu:
  convert illegal chars in cpu flags to '_' for variable assignment

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

by the patch for Bug#4968


sql/sql_parse.cc:
  Fix lowercase_tables2 test failure on powermacg5: table_case_name()
  function needed create_info.alias if lowercase_table_names=2, which
  was not set for the stack copy of HA_CREATE_INFO. Move the
  update of create_info.alias from create_table_precheck to 
  mysql_execute_command, so that it is done on the right object.

myisam/mi_packrec.c:
  Combine the declaration of variable and assignment into one line
  since that is allowed befgore declaring another variable in C.

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint


mysql-test/t/mysqladmin.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/t/backup.test:
  Backport a patch for sporadically failing myisam.test (and now ps.test)
  from 5.0. The cause was in backup.test not cleaning up tables in
  mysqltest-vardir/tmp after itself.
mysql-test/t/ps.test:
  Add additional protection against possible failure in the middle of
  backup.test

sql/sql_parse.cc:
  A post-merge fix (broken alter_table.test): restore Svoj's fix
  for Bug#23404 lost during merge.

into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.

into  bodhi.local:/opt/local/work/mysql-4.1-runtime