lars@mysql.com
ad809c6b15
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-19 13:30:54 +02:00
lars@mysql.com
67e476f29f
BUG#17201 Changed to other database (BUG#20531 hinders usage of 'test' database)
2006-06-19 13:23:13 +02:00
lars@mysql.com
5937422a53
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-19 12:09:24 +02:00
pekka@clam.ndb.mysql.com
35416445da
ndb - bug#19285 minor fixes
2006-06-17 13:00:17 +02:00
lars@mysql.com
70214ffd5b
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-15 15:54:50 +02:00
lars@mysql.com
1d1c42e0a7
BUG#17201: Removed version number from test case output
2006-06-15 11:55:53 +02:00
tomas@poseidon.ndb.mysql.com
01046bb756
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-06-14 20:25:51 +02:00
tomas@poseidon.ndb.mysql.com
47271c6bb1
Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
...
- correction of backport error
2006-06-14 20:22:03 +02:00
tomas@poseidon.ndb.mysql.com
2fcf737feb
Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
...
- make sure to disable bulk insert when check for duplicate key is needed
2006-06-14 20:16:32 +02:00
pekka@clam.ndb.mysql.com
a66d94b702
ndb - bug#19285 : document and check what blob ops are allowed
2006-06-14 13:58:51 +02:00
tomas@poseidon.ndb.mysql.com
88373a025a
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-06-14 13:00:15 +02:00
tomas@poseidon.ndb.mysql.com
7e2323ed7e
Bug #18595 repeated create, insert, drop can cause MySQL table definition cache to
...
corrupt
- add infinite retry on drop table temporary error
2006-06-14 12:54:28 +02:00
gkodinov@mysql.com
df358201e8
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B20363
2006-06-12 18:28:04 +03:00
gkodinov@mysql.com
eb693dcc7b
Bug #20363 : Create view on just created view is now denied
...
There was a wrong determination of the DB name (witch is
not always the one in TABLE_LIST because derived tables
may be calculated using temp tables that have their db name
set to "").
The fix determines the database name according to the type
of table reference, and calls the function check_access()
with the correct db name so the correct set of grants is found.
2006-06-12 18:15:08 +03:00
mskold@mysql.com
69d52db924
Added order by
2006-06-12 15:36:12 +02:00
mskold@mysql.com
4242beb31d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-12 15:36:10 +02:00
tomas@poseidon.ndb.mysql.com
a590e5dc82
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-12 15:36:09 +02:00
tomas@poseidon.ndb.mysql.com
8d8081ff3d
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-12 13:11:37 +02:00
tomas@poseidon.ndb.mysql.com
ccd0b3e3ca
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-06-12 13:08:04 +02:00
tomas@poseidon.ndb.mysql.com
697db8f043
Bug #20336 CLUSTERLOG commands have no effect
...
- always calculate max log level on node start
- send event subscribe uncond
2006-06-12 13:06:56 +02:00
mskold@mysql.com
d17c3d3c7c
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans
2006-06-12 10:40:56 +02:00
mskold@mysql.com
58f686f985
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan
2006-06-12 10:22:32 +02:00
mskold@mysql.com
b93ba41e68
Merge mysql.com:/home/marty/MySQL/mysql-4.1
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-12 09:42:20 +02:00
mskold@mysql.com
e7c1a57f3d
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes
2006-06-12 09:37:19 +02:00
mskold@mysql.com
b89f17912c
Added lock test on index scan
2006-06-12 09:28:27 +02:00
mskold@mysql.com
030f63fdab
Moved back comment to correct method
2006-06-12 09:27:04 +02:00
ingo@mysql.com
76f066aa32
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-amerge
2006-06-10 12:24:44 +02:00
igor@rurik.mysql.com
60620b31fe
Post-merge fixes
2006-06-09 19:29:39 -07:00
igor@rurik.mysql.com
940fe6fea6
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-06-09 17:56:08 -07:00
kent@mysql.com
a5bc38a0d3
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/mysqldev/my/mysql-5.0
2006-06-09 22:34:21 +02:00
joerg@trift2.mysql.com
4b9a1a8bbb
Merge trift2.mysql.com:/M50/bug20303-5.0
...
into trift2.mysql.com:/M50/mysql-5.0
2006-06-09 14:13:01 +02:00
mskold@mysql.com
22fea185bd
Merge mysql.com:/home/marty/MySQL/mysql-4.1
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-09 12:07:04 +02:00
joerg@mysql.com
1cd78f7a2b
Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0
2006-06-08 19:57:26 +02:00
joerg@mysql.com
a26c9c31a1
mysql-test/mysql-test-run.pl : Output the usage error if one is given. (Found when fixing bug#20303)
2006-06-08 19:55:22 +02:00
joerg@mysql.com
47f37f4d45
Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0
2006-06-08 19:32:25 +02:00
tomas@poseidon.ndb.mysql.com
b9d43d7400
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-08 17:57:55 +02:00
tomas@poseidon.ndb.mysql.com
a6294a33cf
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-06-08 17:55:44 +02:00
tomas@poseidon.ndb.mysql.com
50bb4b6cb0
Bug #20336 CLUSTERLOG commands have no effect
2006-06-08 17:26:56 +02:00
mskold@mysql.com
597e1444aa
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked
2006-06-08 16:12:38 +02:00
joerg@mysql.com
5091df1333
mysql-test/mysql-test-run.pl : A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument"
2006-06-08 14:52:33 +02:00
svoj@may.pils.ru
9b3fdd0b4c
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into may.pils.ru:/home/svoj/devel/mysql/BUG19192/mysql-5.0
2006-06-07 19:57:48 +05:00
msvensson@neptunus.(none)
e4d3341d35
Import from yaSSL to fix bild problems on AIX(already fixed but was lost during last import)
2006-06-07 14:46:10 +02:00
svoj@may.pils.ru
d14e190ce8
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into may.pils.ru:/home/svoj/devel/mysql/BUG19192/mysql-5.0
2006-06-07 13:58:23 +05:00
kent@mysql.com
c73ca30d71
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/mysqldev/my/mysql-5.0
2006-06-06 22:12:14 +02:00
aivanov@mysql.com
b6d1fcd00a
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss609
2006-06-06 23:56:48 +04:00
aivanov@mysql.com
c46b17a731
Applied innodb-5.0-ss609 snapshot.
...
Fixed BUG#19727 "InnoDB crashed server and crashed tables
are not recoverable".
2006-06-06 23:37:42 +04:00
aivanov@mysql.com
3d18c46372
Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss31
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss609
Null merge.
2006-06-06 23:08:11 +04:00
aivanov@mysql.com
21f23fb76f
Applied innodb-4.1-ss31 snapshot.
...
Fixed BUG#19727 "InnoDB crashed server and crashed tables
are not recoverable".
2006-06-06 23:05:10 +04:00
igor@rurik.mysql.com
950a000503
Fixed some problems for Windows build
2006-06-06 09:59:45 -07:00
gluh@eagle.intranet.mysql.r18.ru
8acb6eeb80
Bug#18035 Information Schema: Output is not Sorted
...
added 'order by' to avoid result order difference
2006-06-06 12:57:50 +05:00