ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
8da5745858
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b19690/b19690.5.0
2007-01-31 14:31:11 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
0bd1c03e7e
after-merge fix.
2007-01-31 11:14:32 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f0f83a36bc
Merge mysql.com:/home/ram/work/b19690/b19690.4.1
...
into mysql.com:/home/ram/work/b19690/b19690.5.0
2007-01-31 10:07:56 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
eb415e4920
fix for bug #19690 : ORDER BY eliminates rows from the result
...
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).
2007-01-31 09:51:05 +04:00
msvensson@pilot.mysql.com
f3add981bc
Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 19:15:26 +01:00
msvensson@pilot.mysql.com
a6fb89a704
Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/work/my50-work
2007-01-29 19:12:22 +01:00
msvensson@neptunus.(none)
d1a7949297
Add result file for ssl_connect.test
2007-01-29 19:09:30 +01:00
msvensson@pilot.mysql.com
8bc890c146
Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 18:52:05 +01:00
msvensson@pilot.mysql.com
26e4f2e506
Bug#25417 "/usr/bin/test" installed from yassl/taocrypt/test
...
- It's good to build the test programs for yaSSL to check for undefined
symbols etc but they should not be installed by "make install"
2007-01-29 18:46:06 +01:00
msvensson@pilot.mysql.com
d87ccc0c83
Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 18:38:12 +01:00
msvensson@neptunus.(none)
8c142aef3f
Add test for making sure there are no spurious connect failures when using SSL
2007-01-29 18:32:45 +01:00
msvensson@pilot.mysql.com
f73164bdfc
Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 17:55:38 +01:00
msvensson@neptunus.(none)
751d00c47e
Import latest version of yaSSL
...
- Replace SawTooth copyright header with MySQL's
- Bug#19209 Test 'rpl_openssl' hangs on Windows
- Spurious "2013 Connection to server lost" errors fixed
yaSSL doesn't close socket anymore, that is left to the application
2007-01-29 16:54:40 +01:00
msvensson@pilot.mysql.com
07df8fd469
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 16:12:12 +01:00
msvensson@pilot.mysql.com
007d170ad2
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
2007-01-29 14:33:53 +01:00
msvensson@pilot.mysql.com
7eaa82ea38
Bug#22943 syscall pruning in libmysql
...
- Set the timeout values only where needed
2007-01-29 14:31:48 +01:00
msvensson@pilot.mysql.com
84947802c1
Merge pilot.mysql.com:/home/msvensson/mysql/bug19474/my50-bug19474
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 12:27:11 +01:00
msvensson@pilot.mysql.com
d42b919a0b
Bug#19474 readline bug: mysql: free(): invalid pointer
...
- Write to uninitialised memory occured since _rl_rapped_lines buffer
was not extended in CHECK_INV_LBREAKS macro
- Patch submitted to bug-readline@gnu.org
2007-01-29 12:24:08 +01:00
cmiller@zippy.cornsilk.net
f74992258a
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-26 14:47:35 -05:00
cmiller@zippy.cornsilk.net
41179e6a8f
Bug #25879 : THD::options isn't set with ulonglong values and \
...
variables
Bits higher than 2**31 were impossible to set on THD::options. It's
probably a remnant from a time when options was a 32-bit integer.
Now, use unsigned long-long constants and variables to set and clear
THD::options.
---
Pulled comments back to column 49.
2007-01-26 14:47:12 -05:00
kaa@polly.local
603475cbf9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-01-25 15:47:19 +03:00
kaa@polly.local
c5a1c578f5
Merge polly.local:/tmp/maint/bug6774/my50-bug6774
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-01-24 17:30:01 +03:00
iggy@recycle.(none)
54ce485557
Merge recycle.(none):/src/bug24496/my50-bug24496
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-24 09:29:50 -05:00
kaa@polly.local
645de0c5d7
Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES"
2007-01-24 16:45:30 +03:00
tsmith@quadxeon.mysql.com
52351353f3
Merge bk://localhost:5556
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-01-23 18:46:55 +01:00
tsmith@siva.hindu.god
9d2b85c221
Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: target
2007-01-23 10:43:21 -07:00
iggy@recycle.(none)
a0c981d254
Bug#24496:Fresh install of mysql on windows has anonymous user with root access.
...
- Add anonymous user with no rights.
2007-01-23 10:01:56 -05:00
tsmith@quadxeon.mysql.com
28e8847ccd
Merge bk://localhost:5556
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-01-23 02:43:57 +01:00
mtaylor@quadxeon.mysql.com
6758b720c0
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/users/mtaylor/mysql-5.0-maint
2007-01-22 18:01:02 +01:00
msvensson@neptunus.(none)
f8623dc703
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-22 17:10:24 +01:00
msvensson@neptunus.(none)
1ebe4850d6
Import yaSSL version 1.5.8
...
- Includes patch for Bug#25189
2007-01-22 16:54:40 +01:00
msvensson@neptunus.(none)
4bb6151a7a
Add define for used type of third argument to 'accept' - Netware uses size_t
2007-01-22 12:34:39 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4e6b8a1d6a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b22026/b22026.5.0
2007-01-22 15:28:42 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a079f20aa8
Fix for bug #22026 : Warning when using IF statement and large unsigned bigint
...
We use INT_RESULT type if all arguments are of type INT for 'if', 'case',
'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
exceed the INT bounds.
2007-01-22 14:52:23 +04:00
msvensson@neptunus.(none)
6db5790c2b
gen_lex_hash does not need to link with odbc32*.lib
2007-01-22 10:41:36 +01:00
msvensson@neptunus.(none)
742af1c2a7
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-22 10:37:59 +01:00
knielsen@ymer.(none)
854ef6b0a3
Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint
...
into ymer.(none):/usr/local/mysql/x/mysql-5.0-maint
2007-01-22 08:59:26 +01:00
tsmith@siva.hindu.god
6cb4282fd8
Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41
...
into siva.hindu.god:/home/tsmith/m/inno/jan20/50
2007-01-21 20:05:21 -07:00
tsmith@siva.hindu.god
70119a1627
Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41
...
into siva.hindu.god:/home/tsmith/m/inno/jan20/50
2007-01-21 20:02:24 -07:00
tsmith@siva.hindu.god
b448b62278
Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
...
Fixes:
- Bug #24299 :
- Bug #25596 :
2007-01-21 19:55:17 -07:00
tsmith@siva.hindu.god
7ce6170cf9
Applied innodb-5.0-ss1230 snapshot
...
Fixes:
- Bug #25596 :
2007-01-21 17:58:02 -07:00
mtaylor@qualinost.(none)
d9366f9743
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-19 17:36:05 -08:00
mtaylor@qualinost.(none)
72a6096eb4
Moving version-script to acinclude.m4
2007-01-19 17:34:47 -08:00
mtaylor@qualinost.(none)
dab88cfaa3
Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb.
2007-01-19 16:54:01 -08:00
mtaylor@qualinost.(none)
8e6f3ab33b
Added libndb.ver to BUILT_SOURCES to force it to get removed during make distclean
2007-01-19 14:26:06 -08:00
mtaylor@qualinost.(none)
8b1fe92d93
missed storage in one more place
2007-01-19 12:27:59 -08:00
mtaylor@qualinost.(none)
4d9abb4a4f
I cut and pasted in the wrong direction I think. We don't have storage until 5.1...
2007-01-19 12:23:06 -08:00
mtaylor@qualinost.(none)
9477996337
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-19 12:00:19 -08:00
mtaylor@qualinost.(none)
a53b50d021
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
2007-01-19 11:50:59 -08:00
iggy@recycle.(none)
205f7a0583
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-19 13:20:52 -05:00