knielsen@mysql.com
d75abf873e
Fix bug in mysql-test-run.pl in ^C signal handler.
2006-03-16 11:21:18 +01:00
ingo@mysql.com
ac287ad34d
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug14980
2006-03-10 22:32:37 +01:00
ingo@mysql.com
d0c6eb885d
Bug#14980 - COUNT(*) incorrect on MyISAM table with certain INDEX
...
For "count(*) while index_column = value" an index read
is done. It consists of an index scan and retrieval of
each key.
For efficiency reasons the index scan stores the key in
the special buffer 'lastkey2' once only. At the first
iteration it notes this fact with the flag
HA_STATE_RNEXT_SAME in 'info->update'.
For efficiency reasons, the key retrieval for blobs
does not allocate a new buffer, but uses 'lastkey2'...
Now I clear the HA_STATE_RNEXT_SAME flag whenever the
buffer has been polluted. In this case, the index scan
copies the key value again (and sets the flag again).
2006-03-10 15:03:04 +01:00
kent@mysql.com
e32054e4a7
mysql-test-run.pl, mtr_cases.pl
...
- Back porting of some changes in later releases
- Corrected valgrind support
- Removed work around for TZ needed in VisualStudio 6
- Don't restart master to add special settings from "<testcase>-master.opt",
if same settngs as running master, feature request in bug#12433
- With --reorder, keep tests with same *-master.opt content together,
to save even more master restarts
2006-03-08 19:15:56 +01:00
msvensson@neptunus.(none)
72f509e228
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug17137/my41-bug17137
2006-03-08 11:20:12 +01:00
msvensson@neptunus.(none)
8162610a39
Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave
...
- Decrease "slave_open_temp_tables" during reopen of truncated table.
- Add test "rpl_trunc_temp"
2006-03-08 10:15:48 +01:00
kent@mysql.com
64ed7f1481
mysql-test-run.pl:
...
Allow space in base directory path, bug#15736
2006-03-08 03:51:59 +01:00
serg@serg.mylan
e7504b3468
merged
2006-03-06 18:34:38 +01:00
serg@serg.mylan
0b2f4ac3be
kill (subquery) - three years old bugfix that never worked
2006-03-06 18:26:39 +01:00
bar@mysql.com
e019d60536
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15949
2006-03-06 14:50:34 +04:00
gluh@eagle.intranet.mysql.r18.ru
f1eaf7e8ec
Fix for bug#14385 GRANT and mapping to correct user account problems
...
Check if the host of table hash record exactly matches host from GRANT command
2006-03-06 14:03:40 +04:00
konstantin@mysql.com
40b368af16
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/opt/local/work/mysql-4.1-root
2006-03-04 22:33:19 +03:00
paul@snake-hub.snake.net
fc7ca83a90
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 18:51:33 -06:00
paul@snake-hub.snake.net
31d7f7b0b5
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 18:38:19 -06:00
paul@snake-hub.snake.net
fe613502af
README:
...
revise README.
2006-03-01 18:37:41 -06:00
paul@snake-hub.snake.net
32bdb2cc72
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0-r1.2173
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-r1.2478
2006-03-01 17:55:41 -06:00
paul@snake-hub.snake.net
be887ea830
README.gcov:
...
Revise README.gcov.
2006-03-01 17:55:10 -06:00
paul@snake-hub.snake.net
7b4f0dc8b0
README:
...
Revise mysql-test README.
2006-03-01 17:37:07 -06:00
joerg@mysql.com
1b698f03e4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/comment-4.1
2006-03-01 17:43:16 +01:00
bar@mysql.com
a6973ceed0
Bug#15949 union + illegal mix of collations (IMPLICIT + COERCIBLE)
...
union.result, union.test:
Adding test case.
item.cc:
Allow safe character set conversion in UNION
- string constant to column's charset
- to unicode
Thus, UNION now works the same with CONCAT (and other string functions)
in respect of aggregating arguments with different character sets.
2006-03-01 17:58:01 +04:00
joerg@mysql.com
38a7f5551a
mysql-test/mysql-test-run.pl : Add a "--comment=<string>" option (backport from 5.1).
2006-03-01 13:15:37 +01:00
joerg@mysql.com
21a57a8f85
Merge mysql.com:/M40/comment-4.0 into mysql.com:/M41/comment-4.1
2006-03-01 13:10:59 +01:00
joerg@mysql.com
0afe7f1987
mysql-test/mysql-test-run.sh : Add a "--comment=<string>" option, to get it logged when the test is run.
2006-03-01 12:21:44 +01:00
paul@snake-hub.snake.net
7f7f5969c0
mysqltest.test:
...
Add real_sleep tests.
2006-02-28 17:54:11 -06:00
paul@snake-hub.snake.net
d6654fe9cb
mysql-test-run.sh:
...
Fix URLs.
README:
Fix URL.
mysqltest.result:
Update test result for real_sleep error message.
mysqltest.c:
Fix do_sleep() to print correct command name for real_sleep.
2006-02-28 15:08:16 -06:00
konstantin@mysql.com
7178f247f5
Remove 'delayed' to make the test deterministic (already
...
fixed in 5.0).
A post-review fix (Bug#13134)
2006-02-23 23:41:15 +03:00
konstantin@mysql.com
442c2ba8af
A fix and a test case for Bug#13134 "Length of VARCHAR() utf8
...
column is increasing when table is recreated with PS/SP":
make use of create_field::char_length more consistent in the code.
Reinit create_field::length from create_field::char_length
for every execution of a prepared statement (actually fixes the
bug).
2006-02-21 19:52:20 +03: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
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
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
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)
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
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)
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
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
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