petr@mysql.com
b6b6da9fb9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 14:06:23 +03:00
petr@mysql.com
fe87e3472c
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 13:25:35 +03:00
jonas@perch.ndb.mysql.com
7d34d2f4ba
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 10:19:06 +01:00
jonas@perch.ndb.mysql.com
af875527fa
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 10:11:30 +01:00
jonas@perch.ndb.mysql.com
0c559223ed
merge
2006-02-10 10:10:52 +01:00
jonas@perch.ndb.mysql.com
b8d6434616
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 09:40:56 +01:00
jonas@perch.ndb.mysql.com
7a490207aa
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 09:39:45 +01:00
jonas@perch.ndb.mysql.com
3e312142a1
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-02-10 09:38:10 +01:00
jonas@perch.ndb.mysql.com
088c7d4268
bug#10987 - ndb - unable to find restorable replica
...
Introduce new variable c_newest_restorable_gci
which is set _after_ both GCP_SAVE and COPY_GCI
This variable is used when cutting redo (calcKeepGci)
Also make sure complete GCI is run inbetween LCP's
2006-02-10 09:37:36 +01:00
jonas@perch.ndb.mysql.com
84ed332f67
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-02-10 09:18:50 +01:00
jonas@perch.ndb.mysql.com
d9e402ef52
bug#17295 - ndb - error while reading REDO log
...
fix corruption due to page 0, file 0 gets released
2006-02-10 09:17:53 +01:00
petr@mysql.com
f037d4772e
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 10:56:27 +03:00
ramil@mysql.com
9ea857d058
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-10 10:32:46 +04:00
petr@mysql.com
1c7bc08537
a bunch of IM fixes from the GUI team
2006-02-10 02:15:55 +03:00
ramil@mysql.com
e1dabf65e4
Merge mysql.com:/usr/home/ram/work/4.1.heap
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-02-09 18:23:37 +04:00
bell@sanja.is.com.ua
110ac55e4b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-09 15:13:20 +02:00
msvensson@neptunus.(none)
63aca4de7b
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-09 10:35:47 +01:00
msvensson@neptunus.(none)
35fc3dcc99
Force stop of old cluster
2006-02-09 10:25:14 +01:00
msvensson@neptunus.(none)
74af19958e
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-09 09:57:07 +01:00
msvensson@neptunus.(none)
0e9e1f2c5d
Start cluster only for testcases that really needs it and stop it when
...
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not
need to be contacted for each table to be dropped or created.
Backport from 5.1
2006-02-09 09:40:48 +01:00
bell@sanja.is.com.ua
daaf883f97
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-09 10:26:06 +02:00
tomas@poseidon.ndb.mysql.com
16edce1e5d
Bug #17235 perror prints wrong prefix for ndb error codes
2006-02-08 17:17:27 +01:00
tomas@poseidon.ndb.mysql.com
8d1e578cef
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-08 14:08:45 +01:00
tomas@poseidon.ndb.mysql.com
6295103f96
Bug#17233, disabled test in waiting for bug fix
2006-02-08 14:07:52 +01:00
ramil@mysql.com
34abab41db
Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed').
2006-02-08 16:00:39 +04:00
bell@sanja.is.com.ua
ded01c3b6f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-08 10:36:42 +02:00
ramil@mysql.com
ebe1eed8aa
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-08 10:34:30 +04:00
pekka@mysql.com
14249f23ed
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2006-02-07 21:52:56 +01:00
bell@sanja.is.com.ua
6916a4bfe6
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-07 22:10:44 +02:00
gunnar@mysql.com.
f6590a3b89
Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com.:/data/BK/mysql-5.0
2006-02-07 20:50:28 +01:00
pekka@mysql.com
05353723f0
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2006-02-07 20:04:54 +01:00
pekka@mysql.com
9aa06f3bc1
ndb - bug#15918 fix
2006-02-07 19:57:31 +01:00
pekka@mysql.com
fb0d37bccf
ndb - add option ndbd --foreground for manual debugging
2006-02-07 18:10:42 +01:00
gunnar@mysql.com.
a0b0cb5551
Merge mysql.com.:/data/BK/mysql-5.0
...
into mysql.com.:/data/BK/mysql-5.0_8461_b
2006-02-07 17:15:12 +01:00
pekka@mysql.com
9b25294bb4
ndb - main.cpp: avoid SEGV if fetch_configuration fails before fork
2006-02-07 14:03:25 +01:00
gunnar@mysql.com.
001224c09d
item_func.cc:
...
fix for bug#8461
BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
Changed the integer routine to work on integers only.
This bug affects 4.1, 5.0 and 5.1
Fixing in 4.1 will need to change the routine to handle different types individually.
5.0 did had different routines for different types already just the INTEGER routine was bad.
2006-02-07 13:26:35 +01:00
bell@sanja.is.com.ua
84900213dd
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2006-02-07 14:23:16 +02:00
bell@sanja.is.com.ua
5923d50533
kill.test fixed for kill on Mac OS X (which do not send OK)
2006-02-07 13:45:16 +02:00
svoj@april.(none)
328b59a5ed
Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
2006-02-07 15:30:32 +04:00
svoj@april.(none)
0488462a58
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 14:49:57 +04:00
tomas@poseidon.ndb.mysql.com
6fe11666fd
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-07 11:31:52 +01:00
tomas@poseidon.ndb.mysql.com
06a57659d8
Bug #17081 "LOAD DATA INFILE" may not load all the data
2006-02-07 11:30:42 +01:00
svoj@april.(none)
91296df576
Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 13:49:55 +04:00
svoj@april.(none)
a67d8f9043
Merge april.(none):/home/svoj/devel/mysql/BUG14496/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 13:49:03 +04:00
ramil@mysql.com
221b35783d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-07 12:06:06 +04:00
tomas@poseidon.ndb.mysql.com
c445b29d4d
ndb, transaction should be refgistred even if m_transaction_on is not set
2006-02-07 00:26:47 +01:00
tomas@poseidon.ndb.mysql.com
3f6671d72a
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-07 00:06:28 +01:00
tomas@poseidon.ndb.mysql.com
5bbb5c29b7
Bug #17154 load data infile of char values into a table of char(PK) hangs
...
Bug #17158 load data infile of char values into table of char with no (PK) fails to load
Bug #17081 Doing "LOAD DATA INFILE" directly after delete can cause missing data
2006-02-07 00:03:39 +01:00
igor@rurik.mysql.com
b25b4e9b5e
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-06 11:40:39 -08:00
igor@rurik.mysql.com
3af0eabc7f
Fixed bug #16203 .
...
If check_quick_select returns non-empty range then the function cost_group_min_max
cannot return 0 as an estimate of the number of retrieved records.
Yet the function erroneously returned 0 as the estimate in some situations.
2006-02-06 11:35:13 -08:00