msvensson@neptunus.(none)
5f5b0e9b39
Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-import
...
into neptunus.(none):/home/msvensson/mysql/yassL-import/my51-yassL-import
2007-02-06 17:34:06 +01:00
msvensson@neptunus.(none)
38fa3ed693
Bug#25988 openssl_1 Test Case Fails
...
- Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
an extension that allow's the email adress of the cert holder.
- Imported patch for yaSSL "add email to DN output"
2007-02-06 16:28:36 +01:00
cmiller@zippy.cornsilk.net
522d6fb0cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:24:28 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:23:05 -05:00
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@ramil.myoffice.izhnet.ru
ee56d2be9f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b19690/b19690.5.1
2007-01-31 14:28:52 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
30f904eb2d
Merge mysql.com:/home/ram/work/b19690/b19690.5.0
...
into mysql.com:/home/ram/work/b19690/b19690.5.1
2007-01-31 12:53:36 +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
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)
03b346fce3
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2007-01-29 18:33:23 +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
baker@bk-internal.mysql.com
bf7efc3ce3
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-28 00:48:11 +01:00
baker@bk-internal.mysql.com
b64060f70d
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-27 00:36:40 +01:00
brian@zim.(none)
08e93132c4
Two things:
...
1) Two small windows cleanups for Archive.
2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world.
2007-01-26 15:36:39 -08:00
brian@zim.(none)
8820333ec3
For performance reasons we remove the ability in unique indexes on autoincrements to remove the ability to insert key lower then the current autoincrement value.
2007-01-26 14:17:45 -08:00
brian@zim.(none)
24d9d866c2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-26 12:49:20 -08:00
brian@zim.(none)
6829b2a5a6
This fixes a bug in show create table displaying auto_increment field when it should not.
...
It also refactors the test case for Archive (removed two bad tests).
2007-01-26 11:15:16 -08:00
gluh@eagle.(none)
67db27537b
Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1
2007-01-26 16:46:01 +04:00
gluh@mysql.com/eagle.(none)
45f61a06fb
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2007-01-26 16:36:50 +04:00
dlenev@mockturtle.local
631d3c9c1f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 14:58:45 +03:00
jani/jamppa@bk-internal.mysql.com
dd6292d6d1
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-01-25 12:28:00 +01:00
dlenev@mockturtle.local
8b69d169d4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-merge
2007-01-25 11:26:18 +03:00
dlenev@mockturtle.local
c06a385916
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 11:26:07 +03:00
sergefp@mysql.com
4908cf0772
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
2007-01-25 02:28:53 +03:00
svoj@april.(none)
3efc296508
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-01-25 01:44:30 +04:00
svoj@mysql.com/april.(none)
ea7fe60fbc
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-01-25 01:26:57 +04:00
sergefp@pylon.mylan
5bc7d596cc
Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12
...
into mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
2007-01-24 22:28:28 +03:00
sergefp@mysql.com
cced625508
BUG#24127: merge fixes: If subselect is a union, dont allocate several
...
identical pushed_cond_guards arrays. Allocate only one always.
2007-01-24 22:23:50 +03:00
dlenev@mockturtle.local
81c908f200
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-24 22:15:14 +03:00
dlenev@mockturtle.local
37110aad7f
Disabling back im_daemon_life_cycle.test, which was temporarily enabled in
...
the team tree for additional investigation.
2007-01-24 22:11:27 +03:00
dlenev@mockturtle.local
c762789096
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-merge
2007-01-24 19:33:06 +03:00
dlenev@mockturtle.local
86f36eb089
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-24 19:26:06 +03:00
sergefp@mysql.com
e2f0f4dbd3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
2007-01-24 19:13:28 +03:00
gluh@eagle.(none)
0e949c6ada
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-24 20:12:32 +04:00
gluh@mysql.com/eagle.(none)
a548a54c61
after merge fix
2007-01-24 20:11:36 +04:00
gluh@eagle.(none)
7b291e36cf
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-24 19:54:40 +04:00
gluh@mysql.com/eagle.(none)
a7acea61de
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-01-24 19:24:16 +04:00
istruewing@chilla.local
0dc064536f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-24 15:52:19 +01:00
istruewing@chilla.local
b9b3120580
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-24 15:47:04 +01:00
kaa@polly.local
e914eb690c
Merge polly.local:/tmp/maint/bug6774/my51-bug6774
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-01-24 17:34:31 +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
kaa@polly.local
866ab1c205
Merge polly.local:/tmp/maint/bug6774/my50-bug6774
...
into polly.local:/tmp/maint/bug6774/my51-bug6774
2007-01-24 17:12:42 +03:00
gkodinov/kgeorge@macbook.gmz
7fd3cd9e41
Merge bk-internal:/home/bk/mysql-5.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
2007-01-24 15:57:58 +02:00
gkodinov/kgeorge@macbook.gmz
13238b0e3d
merge of 5.0-opt -> 5.1-opt
2007-01-24 15:55:16 +02: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
istruewing@chilla.local
1417840cb9
Merge chilla.local:/home/mydev/mysql-5.0-bug24607
...
into chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-24 13:32:36 +01:00
istruewing@chilla.local
050ddb2032
Merge chilla.local:/home/mydev/mysql-4.1-bug24607
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-24 13:26:06 +01:00
istruewing@chilla.local
928d672c46
Bug#24607 - MyISAM pointer size determined incorrectly
...
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
2007-01-24 13:17:01 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
8190cfca85
bug #22682 Test fails --without-geometry
...
geometry dependent parts moved to proper .test files
2007-01-24 14:49:36 +04:00