into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged

into  pilot.mysql.com:/home/msvensson/mysql/bug24805/my51-bug24805


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge

- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test


mysql-test/mysql-test-run.pl:
  Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin 
  Don't pass mysqld --binlog-format=s if --skip-log-bin
mysql-test/t/disabled.def:
  Enable flush2
mysql-test/t/flush2-master.opt:
  Use --skip-log-bin in flush2 to test flush without bin logging

into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938


sql/item_timefunc.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug23938/my50-bug23938


sql/item_timefunc.cc:
  Auto merged
mysql-test/r/cast.result:
  SCCS merged
mysql-test/t/cast.test:
  SCCS merged

into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798


sql/slave.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798


sql/slave.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798


sql/slave.cc:
  Auto merged

into  mysql.com:/usr/home/ram/work/bug10798/my50-bug10798


sql/slave.cc:
  merging

into  mysql.com:/home/ram/work/b26012/b26012.5.0


sql/field.h:
  Auto merged

into  mysql.com:/home/ram/work/b26012/b26012.5.1

into  mysql.com:/home/ram/work/b26012/b26012.5.1


sql/field.h:
  Auto merged

into  mysql.com:/home/ram/work/b26012/b26012.5.0


sql/field.h:
  Auto merged

As we have Field_double::not_fixed we must have Field_double::size_of().


sql/field.h:
  Fix for bug #26012: missed Field_double::size_of()
    - Field_double::size_of() added.

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

Reworked a section of code that caused valgrind errors (and that partitioning was not happy about). 


storage/archive/ha_archive.cc:
  Put checks around the code

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


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/string.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


BitKeeper/etc/collapsed:
  auto-union

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


BitKeeper/etc/collapsed:
  auto-union

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341


BitKeeper/etc/collapsed:
  auto-union
support-files/mysql.server.sh:
  Auto merged

Thirty five seconds is entirely too short of a period to wait for a server 
to exit.  Instead, make a valliant effort to make sure it exits, and only
give up after a very long period (arbitrarily chosen as 15 minutes).

In addition, if we're being asked to restart the server, then don't try
to start again if trying to stop the server failed.
---
Return zero by default, when the script exits.
---
Set return-/exit-value based on whether we successfully dealt with the 
PID-file.
---
Don't wait that long if the program we're waiting on exits.  It 
should only exit if the server is not going to be started.


support-files/mysql.server.sh:
  Raise timeout to a pessimistic value, 15 minutes.  We should only be willing
  to give up and exit after an extraordinary effort.
  ---
  Return zero by default, when the script exits.
  ---
  Set return-/exit-value based on whether we successfully dealt with the 
  PID-file.
  ---
  Don't wait that long if the program we're waiting on exits.  It 
  should only exit if the server is not going to be started.

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


sql/mysql_priv.h:
  Auto merged

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

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


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

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


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

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


mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/init.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/field.h:
  merging
sql/item_sum.cc:
  merging
sql/sql_select.cc:
  merging

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


mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/field.h:
  merging
sql/init.cc:
  merging
sql/item_cmpfunc.cc:
  merging
sql/mysql_priv.h:
  merging
sql/sql_select.cc:
  merging

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  zim.(none):/home/brian/mysql/archive-newformat-5.1

Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached. 


client/client_priv.h:
  More options
client/mysqlslap.c:
  Extended the auto-sql in the following ways:
  1) You can now specify a load type of either "mixed", "read", or "write". Not great, but a definite improvement.
  2) A new option allows you to specify how many rows are inserted for the "read" load. 
  
  I also fixed a bug where limit was not being reached by running threads.
mysql-test/r/mysqlslap.result:
  Updated results

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint

 - Reorganize include file order to avoid problem with gcc 2.95.3
 - Compiler is confused by forward class declarations


server-tools/instance-manager/command.cc:
  Reorganize include file order to avoid problem with gcc 2.95.3
server-tools/instance-manager/instance.cc:
  Reorganize include file order to avoid problem with gcc 2.95.3

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

into  pilot.mysql.com:/home/msvensson/mysql/work/my51-work

into  pilot.mysql.com:/home/msvensson/mysql/work/my50-work