1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Commit Graph

42100 Commits

Author SHA1 Message Date
unknown
4dcf4cb981 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my50-bug22555
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my51-bug22555


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/func_group.result:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_sum.cc:
  Manual merge.
2006-12-22 15:59:10 -05:00
unknown
37241dfc0e Merge siva.hindu.god:/usr/home/tim/m/bk/50
into  siva.hindu.god:/usr/home/tim/m/bk/51


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_class.h:
  Auto merged
configure.in:
  Use local
2006-12-22 13:56:39 -07:00
unknown
b4005afb85 Merge siva.hindu.god:/usr/home/tim/m/bk/41
into  siva.hindu.god:/usr/home/tim/m/bk/50


scripts/mysqld_multi.sh:
  Auto merged
2006-12-22 13:55:14 -07:00
unknown
ff509df77c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  siva.hindu.god:/usr/home/tim/m/bk/51


mysql-test/mysql-test-run.pl:
  Auto merged
2006-12-22 13:43:48 -07:00
unknown
c3a63238e6 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  siva.hindu.god:/usr/home/tim/m/bk/50


mysql-test/mysql-test-run.pl:
  Auto merged
2006-12-22 13:41:10 -07:00
unknown
82bd9b6b61 Bug#22555: STDDEV yields positive result for groups with only one row
When only one row was present, the subtraction of nearly the same number 
resulted in catastropic cancellation, introducing an error in the 
VARIANCE calculation near 1e-15.  That was sqrt()ed to get STDDEV, the 
error was escallated to near 1e-8.  

The simple fix of testing for a row count of 1 and forcing that to yield 
0.0 is insufficient, as two rows of the same value should also have a
variance of 0.0, yet the error would be about the same.

So, this patch changes the formula that computes the VARIANCE to be one
that is not subject to catastrophic cancellation.

In addition, it now uses only (faster-than-decimal) floating point numbers
to calculate, and renders that to other types on demand.


mysql-test/r/func_group.result:
  Test that the bug is fixed, and that no unexpected behavior arises from the 
  changes.
mysql-test/t/func_group.test:
  Test that the bug is fixed, and that no unexpected behavior arises from the 
  changes.
sql/item_sum.cc:
  Serg's suggestion: Force all VARIANCE calculations to be done with floating-
  point types.  It's faster, and the SQL standard says we may implement these
  functions any way we want.
  
  Additionally, use a form of variance calculation that is not subject to 
  catastrophic cancellation.   
  http://static.flickr.com/108/311308512_5c4e1c0c3d_b.jpg
sql/item_sum.h:
  Remove unused members and add a comment describing the recurrence relation.
2006-12-22 15:37:37 -05:00
unknown
0f462179db Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  siva.hindu.god:/usr/home/tim/m/bk/41
2006-12-22 13:23:12 -07:00
unknown
659a592cf5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge


mysql-test/t/disabled.def:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
2006-12-22 12:23:24 -05:00
unknown
9eac262c4d Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


mysql-test/t/disabled.def:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
2006-12-22 18:04:33 +01:00
unknown
610afd4243 Merge polly.local:/tmp/maint/bug24037/my51-bug24037
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-12-22 17:33:54 +03:00
unknown
dd6c12516e Merge polly.local:/tmp/maint/bug24037/my50-bug24037
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-12-22 17:26:14 +03:00
unknown
8a1ff42fe0 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge


mysql-test/t/disabled.def:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
2006-12-22 08:57:32 -05:00
unknown
368dcac4f8 Merge polly.local:/tmp/maint/bug24037/my41-bug24037
into  polly.local:/home/kaa/src/maint/mysql-4.1-maint
2006-12-22 16:19:45 +03:00
unknown
4dfab457ff Merge polly.local:/tmp/maint/bug24037/my50-bug24037
into  polly.local:/tmp/maint/bug24037/my51-bug24037


strings/ctype-extra.c:
  Auto merged
2006-12-22 16:14:57 +03:00
unknown
48213dd093 Merge polly.local:/tmp/maint/bug24037/my41-bug24037
into  polly.local:/tmp/maint/bug24037/my50-bug24037


strings/conf_to_src.c:
  Auto merged
strings/ctype-extra.c:
  Auto merged
2006-12-22 16:08:10 +03:00
unknown
7d4a5869e9 Add the missing file
mysql-test/include/ndb_not_readonly.inc:
  New BitKeeper file ``mysql-test/include/ndb_not_readonly.inc''
2006-12-22 13:57:33 +01:00
unknown
0fb90c7f63 Wait for mysqld connected to NDB to come out of read only mode 2006-12-22 13:34:23 +01:00
unknown
ee37cf0bb9 Fix for the bug #24037 "Lossy Hebrew to Unicode conversion".
Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:

LEFT-TO-RIGHT MARK (LRM)
RIGHT-TO-LEFT MARK (RLM)


sql/share/charsets/hebrew.xml:
  Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:
  
  LEFT-TO-RIGHT MARK (LRM)
  RIGHT-TO-LEFT MARK (RLM)
strings/conf_to_src.c:
  Added a warning comment in the generated C source file.
strings/ctype-extra.c:
  Re-generated from sql/share/charsets/hebrew.xml
mysql-test/r/ctype_hebrew.result:
  Added the test case for bug #24037 "Lossy Hebrew to Unicode conversion"
mysql-test/t/ctype_hebrew.test:
  Added the test case for bug #24037 "Lossy Hebrew to Unicode conversion"
2006-12-22 15:30:37 +03:00
unknown
5feb49e167 Potential use of NULL pointer in 'plugin_for_each_with_mask', check pointer
before referencing it.


sql/sql_plugin.cc:
  Make sure the plugin being refernced in the plugins array has not been set to NULL already.
2006-12-22 12:35:06 +01:00
unknown
1fe119bcc1 Merge pilot.mysql.com:/home/msvensson/mysql/my51-ndb-gca-my51-m
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2006-12-22 12:33:34 +01:00
unknown
b2f62764c6 Potential use of NULL pointer in 'plugin_for_each_with_mask', check pointer
before referencing it.


sql/sql_plugin.cc:
  Make sure the plugin being refernced in the plugins array has not been set to NULL already.
2006-12-22 12:27:26 +01:00
unknown
12c4def6f7 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-12-22 12:24:07 +01:00
unknown
2c00379dba Merge pilot.mysql.com:/home/msvensson/mysql/my51-ndb-gca-my51-m
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb


sql/sql_plugin.cc:
  Auto merged
2006-12-22 12:14:37 +01:00
unknown
7baaa78156 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061220175325|03033
sql/sql_plugin.cc:
  Exclude
2006-12-22 12:14:12 +01:00
unknown
eec509bd77 Bug#22694 "function plugin_foreach_with_mask() uses an uninitialized pointer"
Fix uninitialized memory.


sql/sql_plugin.cc:
  move my_alloca() call out of nested stack frame.
  ensure that every element of array is initialized.
2006-12-22 12:12:58 +01:00
unknown
948804c8aa BUG#22864 (CREATE-SELECT does not work correctly):
Post-merge fixes.


sql/log.cc:
  Removing HAVE_ROW_BASED_REPLICATION from file.
2006-12-22 12:09:44 +01:00
unknown
2b8775510d Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/rpl_openssl.test:
  Auto merged
2006-12-22 10:20:39 +01:00
unknown
d84b651e34 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061215122345|24188
mysql-test/t/rpl_openssl.test:
  Exclude
2006-12-22 10:20:20 +01:00
unknown
7443fed500 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-12-22 10:00:58 +01:00
unknown
533ce8cf25 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2006-12-22 10:00:12 +01:00
unknown
c537bbf8ef Set default number of masters to 1 2006-12-22 09:59:41 +01:00
unknown
61c7864ced After merge fix 2006-12-22 11:43:04 +04:00
unknown
517e0d31c4 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  mysql.com:/usr/home/bar/mysql-5.1.b17642


mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  After merge fix
2006-12-22 11:20:55 +04:00
unknown
8f3e39bd49 WL #3031
* Various windows errors fixed
* Increased max key length for federated


include/my_time.h:
  WL #3031
  
  Windows compile errors for some platforms. JBalint helped find this fix.
sql/log_event.cc:
  WL #3031
  
  Windows compile errors on some platforms. explicite casting.
sql/sql_servers.cc:
  WL #3031
  
  Add rwlock init to sql_servers to fix hang on windows.
storage/federated/ha_federated.h:
  WL #3031
  
  Increase max key length to innodb's max (Cisco fix)
2006-12-21 22:38:54 -05:00
unknown
8e1f54501a Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into  siva.hindu.god:/usr/home/tim/m/bk/51


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_class.h:
  Auto merged
2006-12-21 18:23:14 -07:00
unknown
ca589a4fc5 Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into  siva.hindu.god:/usr/home/tim/m/bk/50


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_class.h:
  Auto merged
2006-12-21 18:20:09 -07:00
unknown
454b7d0f52 Merge siva.hindu.god:/usr/home/tim/m/bk/g41
into  siva.hindu.god:/usr/home/tim/m/bk/41


scripts/mysqld_multi.sh:
  Auto merged
2006-12-21 18:18:27 -07:00
unknown
8fb853ca50 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
2006-12-22 01:13:02 +01:00
unknown
6de718d22a Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2006-12-22 01:12:02 +01:00
unknown
82338d451f Merge neptunus:mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2006-12-22 01:11:27 +01:00
unknown
2218cbb059 Merge neptunus:mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2006-12-22 00:58:32 +01:00
unknown
1acf0e78d7 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


include/mysql_h.ic:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
vio/viossl.c:
  Auto merged
2006-12-22 00:39:08 +01:00
unknown
b461c41cd3 Bug #23125 [patch] trigger test fails when run as root
- Skip tests using chmod when running as root


mysql-test/t/information_schema_chmod.test:
  Use mysqltest builtin "chmode"
mysql-test/t/mysqltest.test:
  Dont run as root - test chmod
mysql-test/t/rpl_rotate_logs.test:
  Use mysqltest builtin "chmode"
  Use 'write_file' and 'chmod' instead of system
mysql-test/t/trigger.test:
  Don't run as root
  Use 'write_file' and 'chmod'
mysql-test/t/varbinary.test:
  Don't run as root
2006-12-22 00:38:34 +01:00
unknown
fd988f5b9a Bug#24148 regression tests hang with SSL enabled
- Don't call SSL_shutdown a second time


vio/viossl.c:
  SSL_shutdown might return 0 indicating that it should be called once
  again for a graceful shutdown. Since the socket are going to be closed
  anyway ther is no need for the second call.
2006-12-22 00:05:40 +01:00
unknown
c3315ccca9 Merge romeo.(none):/home/bk/b22864-mysql-5.1-new-rpl
into  romeo.(none):/home/bk/merge-b22864-myql-5.1-new-rpl


sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/log.cc:
  Merge with mysql-5.1-new-rpl
sql/slave.cc:
  Merge with mysql-5.1-new-rpl
sql/sql_insert.cc:
  Merge with mysql-5.1-new-rpl
2006-12-21 19:36:28 +01:00
unknown
877edc5554 Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Manual merge from 5.0.
2006-12-21 19:04:31 +01:00
unknown
6cd224125c Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
2006-12-21 18:41:01 +01:00
unknown
b717d61625 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-12-21 18:00:42 +01:00
unknown
9ab1a0ee40 Merge bk-internal:/home/bk/mysql-5.1-ndb
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
2006-12-21 17:38:44 +01:00
unknown
16b596bf34 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
2006-12-21 17:13:38 +01:00