mskold@mysql.com
47bb569979
Added order by
2006-06-12 15:35:47 +02:00
mskold@mysql.com
049c3e3f69
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/marty/MySQL/mysql-4.1
2006-06-12 15:35:46 +02:00
tomas@poseidon.ndb.mysql.com
9ec2be748c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-12 15:35:45 +02:00
tomas@poseidon.ndb.mysql.com
3996410cfa
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-12 13:09: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
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
kent@mysql.com
3744b46a1d
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/data0/mysqldev/my/mysql-4.1
2006-06-09 22:42:34 +02:00
joerg@trift2.mysql.com
44c0053a44
Merge trift2.mysql.com:/M41/bug20303-4.1
...
into trift2.mysql.com:/M41/mysql-4.1
2006-06-09 14:37:24 +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
tomas@poseidon.ndb.mysql.com
fec7fd18f0
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-08 17:28:01 +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
ramil@mysql.com
fe01874613
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b6880
2006-06-07 14:40:33 +05:00
ramil@mysql.com
0bdae38efb
Fix for bug #6880 : LAST_INSERT_ID() within a statement
2006-06-07 14:01:10 +05:00
igor@rurik.mysql.com
950a000503
Fixed some problems for Windows build
2006-06-06 09:59:45 -07:00
ramil@mysql.com
19e312af08
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b16546
2006-06-06 09:10:28 +05:00
mskold@mysql.com
39b50ce0d2
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table
2006-06-02 07:26:45 +02:00
jonas@perch.ndb.mysql.com
5de580276a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-01 13:07:32 +02:00
jonas@perch.ndb.mysql.com
57bb142920
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-01 08:52:55 +02:00
jonas@perch.ndb.mysql.com
878d56fefb
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-01 08:27:45 +02:00
jonas@perch.ndb.mysql.com
1a6c83f04d
ndb - bug#20185
...
Dont be too aggressive in Dbtc::nodeFailCheckTransaction
let it timeout by 1, so that it does not assert that it has waited too long
old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.
2006-06-01 08:24:05 +02:00
mskold@mysql.com
48a568cef6
Removed dead code that had been commented out
2006-05-31 15:07:11 +02:00
mskold@mysql.com
f838e8a499
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/marty/MySQL/mysql-4.1
2006-05-30 13:20:38 +02:00
igor@rurik.mysql.com
1504abcdd5
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2006-05-30 00:17:50 -07:00
igor@rurik.mysql.com
6051e0f959
Fixed bug #17873 : confusing error message when IGNORE/USE/FORCE INDEX
...
refers to a column name.
2006-05-30 00:08:58 -07:00
kent@mysql.com
4f2e784ac2
make_win_src_distribution.sh:
...
Convert to DOS EOL if dsp/dsw is in package
2006-05-29 20:09:22 +02:00
kent@mysql.com
8719abf753
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-05-29 19:17:55 +02:00
igor@rurik.mysql.com
cb4c6a0ded
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-05-28 14:23:28 -07:00
aelkin@mysql.com
6119b7136e
BUG#14157: utf8 encoding in binlog without set character_set_client
...
refining the test case to exclude problems with koi8r on some platforms.
2006-05-28 19:47:01 +03:00
igor@rurik.mysql.com
377b3e0306
Fixed bug #17873 : confusing error message when IGNORE/USE/FORCE INDEX
...
refers to a column name.
Added a new error message ER_INDEX_DOES_NOT_EXIST.
2006-05-27 23:57:33 -07:00
kent@mysql.com
d0ed239bba
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-05-27 18:09:50 +02:00
kent@mysql.com
f5a443d283
Merge mysql.com:/data0/mysqldev/my/mysql-4.1.20-release
...
into mysql.com:/data0/mysqldev/my/mysql-4.1
2006-05-26 18:31:25 +02:00
acurtis@xiphis.org
6d285f8a29
updated libtool/autoconf files
2006-05-25 11:36:29 -07:00
ramil@mysql.com
bbb991e597
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b16900
2006-05-25 16:05:55 +05:00
aelkin@dl145h.mysql.com
ac158d52b9
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145h.mysql.com:/tmp/andrei/4.1-bug14157-utf8_binlog_testcases
2006-05-24 16:55:04 +02:00
serg@mysql.com
44ec4456b8
Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release
...
into mysql.com:/data0/mysqldev/my/mysql-4.1.20-release
2006-05-24 14:12:19 +02:00
ramil@production.mysql.com
cc1dc76c66
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
2006-05-24 12:31:49 +02:00
kent@mysql.com
7ffc786686
configure.in:
...
Update NDB version as well
2006-05-24 12:30:34 +02:00
kent@mysql.com
eb627531f3
configure.in:
...
Stepped up to 4.1.22
2006-05-24 12:20:17 +02:00
msvensson@neptunus.(none)
dcf9810cb1
Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-24 10:16:31 +02:00
ramil@production.mysql.com
31eadde21a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
2006-05-24 10:08:26 +02:00
kent@mysql.com
3be0495299
configure.in:
...
Updated release number 4.1.16a
2006-05-24 01:05:20 +02:00
kent@mysql.com
97674810b0
don't let bugfix for bug#8303 break the bugfix for bug#8378
...
revert the fix for bug#8303
correct the test for bug#8378
2006-05-24 00:55:53 +02:00
msvensson@neptunus.(none)
7667b271d8
Merge bk-internal:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-23 11:38:05 +02:00
msvensson@neptunus.(none)
cb7958ce1b
Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-05-23 10:34:59 +02:00
msvensson@neptunus.(none)
0144b51445
Add comment for 'kill_server' function
2006-05-23 10:33:53 +02:00
kent@mysql.com
e9d96153e1
make_sharedlib_distribution.sh:
...
Solaris sh don't like {..} in file matching
2006-05-23 00:50:39 +02:00
ramil@mysql.com
71c035fafb
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b18536
2006-05-22 11:49:35 +05:00