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.

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/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  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

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

into  trift2.:/MySQL/M41/mysql-4.1

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


sql/sql_parse.cc:
  Auto merged

into  trift2.:/MySQL/M41/push-4.1

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


sql/item_func.cc:
  Auto merged

into  trift2.:/MySQL/M40/mysql-4.0

into  mysql.com:/data0/mysqldev/my/mysql-4.0-15815

into  trift2.:/MySQL/M40/mysql-4.0

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysys/mf_iocache.c:
  Auto merged
mysys/my_seek.c:
  Auto merged

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysys/mf_iocache.c:
  Auto merged

into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint


mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  Auto merged

into  naruto.:C:/cpp/mysql-4.1-maint

  Reverted change for bug#13859, applied smaller patch from Marko


innobase/buf/buf0buf.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/dict/dict0dict.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/fil/fil0fil.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/ha/ha0ha.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/ha/hash0hash.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/include/hash0hash.h:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/lock/lock0lock.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/log/log0recv.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/thr/thr0loc.c:
  Reverted change for bug#13859, applied smaller patch from Marko

- When cache memory can't be allocated size is recaclulated using 3/4 of
  the requested memory. This number is rounded up to the nearest 
  min_cache step. 
  However with the previous implementation the new cache size might
  become bigger than requested because of this rounding and thus we get
  an infinit loop.
- This patch fixes this problem by ensuring that the new cache size
  always will be smaller on the second and subsequent iterations until
  we reach min_cache.


mysys/mf_iocache.c:
  - Added mask to cachesize to ensure that algorithm always produce a 
    smaller cache size than current, until we reach 'min_cache' size.

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

into  trift2.:/MySQL/M41/push-4.1


VC++Files/mysql.dsw:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/libmysqld/libmysqld.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/mysqldemb/mysqldemb.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/mysqlserver/mysqlserver.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/sql/mysqld.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/sql/mysqldmax.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0

into  trift2.:/MySQL/M41/push-4.1


mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Null merge, because "--platform" is already a real argument in 4.1
support-files/MySQL-shared-compat.spec.sh:
  Null merge, because the 4.1 version already uses two digits
  for "version40" and "version41".

into  olga.mysql.com:/home/igor/mysql-4.1-opt