knielsen@mysql.com
b41bbfa564
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-05 23:45:52 +01:00
knielsen@mysql.com
71215d0cbc
Port to Win64/x64 in Visual Studio 2005
2006-01-05 23:39:45 +01:00
jmiller@mysql.com
5e45dc2738
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-05 22:18:43 +01:00
knielsen@mysql.com
e523847e8b
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-05 14:19:02 +01:00
knielsen@mysql.com
46772f0c2f
Some header files were missing from "make dist".
2006-01-05 14:17:05 +01:00
jmiller@mysql.com
a0c4cfd015
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/5.1-new2
2006-01-05 13:07:29 +01:00
knielsen@mysql.com
eed5285e8c
Merge mysql.com:/usr/local/mysql/mysql-5.0-win-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-05 10:54:14 +01:00
konstantin@mysql.com
9bf1e22b4c
Fix -ansi -pedantic compile
2006-01-05 11:18:26 +03:00
konstantin@mysql.com
8e9af5d72a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/opt/local/work/mysql-5.1-merge
2006-01-05 11:05:27 +03:00
jmiller@mysql.com
28dba4c690
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-05 04:08:55 +01:00
jmiller@mysql.com
32b19cd1ec
New rbr blob test requested by Lars
2006-01-05 03:56:22 +01:00
konstantin@mysql.com
f4cc6c4d15
Merge mysql.com:/opt/local/work/mysql-5.0-merge
...
into mysql.com:/opt/local/work/mysql-5.1-merge
2006-01-05 00:38:51 +03:00
paul@snake-hub.snake.net
ebe0b0b8b3
set_var.cc:
...
Fix out of order system variable.
2006-01-04 13:43:21 -06:00
paul@snake-hub.snake.net
da8030ff7a
mysqlbinlog.cc:
...
Put options in standard order: help first, then lexically,
then variables.
2006-01-04 13:37:59 -06:00
konstantin@mysql.com
1938052ba6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-merge
2006-01-04 21:47:00 +03:00
konstantin@mysql.com
4a4b8eacc1
Post-merge fixes.
2006-01-04 21:39:39 +03:00
knielsen@mysql.com
f13dff7a72
EADDRINUSE is not defined on Windows.
2006-01-04 16:38:54 +01:00
lars@mysql.com
a48773b62a
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
2006-01-04 16:27:57 +01:00
lars@mysql.com
9e24aedea5
BUG#16188: Could not compile
2006-01-04 16:24:58 +01:00
knielsen@mysql.com
64f7425ac9
Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxfix
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-04 16:14:49 +01:00
knielsen@mysql.com
d75a9f537e
Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxfix
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-04 16:04:21 +01:00
knielsen@mysql.com
f6b1f10707
Fix QNX test abort in release builds and pushbuild, avoid killing our
...
parent when we are not the process group leader.
2006-01-04 16:02:41 +01:00
konstantin@mysql.com
6502e6bba7
Merge mysql.com:/opt/local/work/mysql-4.1-7209-new
...
into mysql.com:/opt/local/work/mysql-5.0-merge
2006-01-04 17:49:45 +03:00
konstantin@mysql.com
f7d6fa6f17
A fix for Bug#7209 "Client error with "Access Denied" on updates
...
when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.
2006-01-04 17:35:30 +03:00
knielsen@mysql.com
6f6480b064
BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
...
the bug is fixed.
2006-01-04 15:25:51 +01:00
knielsen@mysql.com
85575904fa
BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
...
the bug is fixed.
2006-01-04 15:25:32 +01:00
mats@mysql.com
3377014a3c
Post-merge fixes.
2006-01-04 15:04:36 +01:00
mats@mysql.com
588eee80a8
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/bkroot/mysql-5.1-new
2006-01-04 14:10:34 +01:00
mats@mysql.com
c3d029bde5
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b15924-mysql-5.1-new
2006-01-04 14:05:50 +01:00
mats@mysql.com
e6bd8be4f3
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b15924-mysql-5.1-new
2006-01-04 14:00:35 +01:00
mats@mysql.com
d2277ec43d
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b15942-mysql-5.1-new
2006-01-04 13:57:02 +01:00
knielsen@mysql.com
c2937a3117
Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxtestsock
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-04 10:36:54 +01:00
knielsen@mysql.com
b6faf80f20
Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxtestsock
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-04 10:34:47 +01:00
knielsen@mysql.com
3524b80092
Avoid double slash (//) in socket paths, breaks on QNX.
2006-01-04 10:32:52 +01:00
knielsen@mysql.com
a410de984a
BUG#16167: Disable mysqlslap test case until bug is fixed.
2006-01-03 23:37:29 +01:00
joerg@mysql.com
bfd31faf2f
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/M51/mysql-5.1
2006-01-03 14:46:08 +01:00
joerg@mysql.com
2a29c32908
Test files in new subdirectory "mysql-test/extra" need to be propagated into binary distribution.
2006-01-03 14:36:31 +01:00
gluh@eagle.intranet.mysql.r18.ru
8ce6f3e6ca
Fix for bug#15533 crash, information_schema, function, view
...
enable view prepared mode during getting metedata for I_S table
2006-01-03 14:25:19 +04:00
knielsen@mysql.com
06a49eca23
Fix memory problem: Both the allocation and pointer arithmetics on the
...
head_sptr array was wrong.
2006-01-03 11:09:18 +01:00
mats@mysql.com
23e84337db
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/bkroot/mysql-5.1-new
2006-01-02 14:41:40 +01:00
knielsen@mysql.com
0d58795f7d
Fix mysqlslap problems when running multiple tests in parallel, by setting
...
the mysqlslap lock directory to value of --tmpdir.
2006-01-02 14:14:48 +01:00
mats@mysql.com
19d5515c44
Bug#13115 (CREATE TABLE t2 SELECT a inside SP is not replicated when using RBR):
...
Test passes. Bug was probably fixed in the implementation of WL#2867.
2006-01-02 13:20:17 +01:00
knielsen@mysql.com
0e41800311
Fix compile failure, reapply changeset "05/12/29 15:37:36 sergefp@mysql.com"
...
apparently lost in merge.
2006-01-02 13:19:13 +01:00
brian@zim.(none)
f8d1bc8c79
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2006-01-02 02:24:38 -08:00
knielsen@mysql.com
dca88abf12
Do not use C++ style comments (//) in C source (breaks compilation on aix52).
2006-01-02 09:58:58 +01:00
brian@zim.(none)
4c9d2ff360
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2006-01-01 20:27:24 -08:00
brian@zim.(none)
522a62446c
Cleaned up memory allocation to be a little more staight forward (though I suspect someone will hate my sizeof() increment).
...
Nothing really to see here. Updated comments in code.
More comments are probably needed, but isn't that always the case?
2006-01-01 20:08:45 -08:00
knielsen@mysql.com
62d6f430ee
Do not use C++ style comments (//) in C source (breaks compilation on aix52).
2006-01-02 02:45:26 +01:00
brian@zim.(none)
d4a3fe6e68
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/slap-5.1
2006-01-01 16:47:03 -08:00
brian@zim.(none)
7ce1981bbd
Now uses a single pass testing loop. Dual pass made no sense.
...
Now does averaging when running iterations.
Realligned a bunch of code and continued to remove global variables.
Added CSV output along with printable.
Structures are now provided for print options so adding XML, HTML, ... should now be trivial.
2006-01-01 16:40:02 -08:00