jimw@mysql.com
e75a62aeae
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-15 07:36:33 -08:00
jimw@mysql.com
d70c47b2a9
Merge mysql.com:/home/jimw/my/mysql-4.1-16389
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-14 18:12:30 -08:00
aelkin@mysql.com
a744ab78ba
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 21:47:23 +02:00
joerg@mysql.com
678e075ecf
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/rpmspec-4.1
2006-02-13 18:23:08 +01:00
aelkin@mysql.com
0866e4267a
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 19:15:02 +02:00
SergeyV@selena.
b0136378cf
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into selena.:H:/MYSQL/src/#06536-mysql-4.1
2006-02-13 17:29:35 +03:00
knielsen@mysql.com
9025342992
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/mysql/mysql-4.1-fixrace
2006-02-12 00:19:59 +01:00
kent@mysql.com
2619c54bd1
mysql-test-run.{pl,sh}:
...
Give space for second and third slave port
2006-02-11 23:35:23 +01:00
knielsen@mysql.com
43189fd8ad
Fix a race on some platforms in mysql-test-run.pl, where it would sometimes
...
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
2006-02-11 22:50:59 +01:00
kent@mysql.com
d23d02be18
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-02-10 19:18:45 +01:00
tomas@poseidon.ndb.mysql.com
cbac75de91
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2006-02-10 17:53:13 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e
Bug #17249 ndb, delete statement with join where clause fails when table do not have pk
...
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key
change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
2006-02-10 17:40:22 +01:00
joerg@mysql.com
ceaf0017e3
support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for log file evaluation.
2006-02-10 17:40:04 +01:00
aelkin@mysql.com
14ced05e55
BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part.
...
This changeset is assumed to stay in 4.1.
2006-02-10 15:12:27 +02:00
jonas@perch.ndb.mysql.com
1aced6dfe4
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-02-10 09:42:35 +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
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
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
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)
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
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
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
jonas@perch.ndb.mysql.com
78bd6d93af
bug#13966 - ndb
...
better error message on invalid config change
2006-02-06 11:42:44 +01:00
jonas@perch.ndb.mysql.com
155081e425
bug#13965
...
ndb - error while restarting in dict
improve error message when changed config leads to failed restart
2006-02-06 11:30:56 +01:00
pekka@mysql.com
8ed86030b4
ndb - bug#16693 (4.1) test + workaround, analyze later
2006-02-05 22:12:06 +01:00
pekka@mysql.com
c696582df4
ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ]
2006-02-03 15:23:58 +01:00
svoj@april.(none)
7c76ae4c13
BUG#16893: Crash in test 'fulltext_order_by'
...
Fixed that fulltext query + union results in unexpected behaviour.
2006-02-03 14:09:33 +04:00
jimw@mysql.com
970aa54bd6
Fix mysqldump crash when encountering a VIEW (when used against a
...
5.0 or later server, obviously). (Bug #16389 )
2006-02-01 12:28:39 -08:00
andrey@lmy004.
736faf4730
fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)
2006-02-01 20:35:16 +01:00
svoj@april.(none)
332be5bdd9
BUG#14496: Crash or strange results with prepared statement,
...
MATCH and FULLTEXT
Fixed that fulltext query using PS results in unexpected behaviour
when executed 2 or more times.
2006-02-01 20:40:12 +04:00
msvensson@devsrv-b.mysql.com
04d6b7fa54
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my41-bug15302
...
into devsrv-b.mysql.com:/space/magnus/my41-bug15302
2006-01-31 18:51:15 +01:00
msvensson@neptunus.(none)
b758b690a1
Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
...
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
- Change mysqltest to detect when there aren't as many warnings available as was reported.
2006-01-31 12:47:22 +01:00
pekka@mysql.com
7e5108392d
ndb - testBlobs 'perf test' fix
2006-01-31 08:13:42 +01:00
aivanov@mysql.com
f4d76d845a
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb/mysql-4.1-merged
2006-01-30 22:43:51 +03:00
aivanov@mysql.com
c21eaa3085
Fixed BUG#15653, BUG#16582.
...
Applied innodb-4.1-ss20 snapshot.
2006-01-30 22:33:02 +03:00
aivanov@mysql.com
efe8b884e5
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb/mysql-4.1-merged
2006-01-30 15:31:35 +03:00
aivanov@mysql.com
fe518520be
Fixed BUG#16387.
...
Applied innodb-4.1-ss17 snapshot.
Do not mistake TABLENAME_ibfk_0 for auto-generated id.
2006-01-30 15:17:33 +03:00
kent@mysql.com
3a2e8ebeee
mysql-test-run.pl:
...
Aligned the MTR_BUILD_THREAD policy to shell version
2006-01-28 13:04:01 +01:00
kent@mysql.com
f188972456
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-01-28 12:39:25 +01:00
kent@mysql.com
c64727e7c0
mysql-test-run.sh:
...
Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE
2006-01-28 12:35:46 +01:00
msvensson@neptunus.(none)
d18006173f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-01-27 19:11:59 +01:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6ec2bd2a93
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 13:11:58 -05:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
173a8ad4ed
Added comments to specify why no much mutex is needed.
2006-01-27 12:44:33 -05:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a69827f152
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 09:29:59 -05:00
msvensson@neptunus.(none)
9c255c4025
Enable kill test
2006-01-27 13:23:10 +01:00
kent@mysql.com
1318e790bc
configure.in:
...
Cloned off 4.1.18, new release number 4.1.19
2006-01-27 12:10:40 +01:00
kent@mysql.com
4ad32690af
configure.in:
...
Generated "libmysql.ver" will be in \$(top_builddir)
2006-01-27 01:38:05 +01:00