jimw@mysql.com
dee9795b5b
Merge
2005-02-15 12:19:01 -08:00
jimw@mysql.com
dd62343bde
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-14 10:57:47 -08:00
tomas@poseidon.ndb.mysql.com
957312eeb5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-14 16:19:57 +01:00
serg@serg.mylan
10c53ae1e5
remove passwordless remote accounts from windows distro
2005-02-14 11:14:04 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
4957c4850d
Bug#2435
...
Alter handling for UNION syntax
Tests for UNION and parentheses
2005-02-13 22:35:52 +00:00
heikki@hundin.mysql.fi
961d8b0ebf
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-02-13 21:05:18 +02:00
heikki@hundin.mysql.fi
548f7dbada
row0mysql.c:
...
Backport the column prefix memory corruption fix from 5.0
2005-02-13 21:00:07 +02:00
bell@sanja.is.com.ua
539cbc580a
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2005-02-13 11:18:55 +02:00
hf@deer.(none)
21f1b24c29
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-02-13 02:31:33 +04:00
guilhem@mysql.com
40a2e968f9
new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before
...
(protection against destroying uninited mutex in the case where mysqld fails early at startup (before archive_db_init() was called)
and then calls archive_db_end() to clean up).
2005-02-12 19:17:33 +01:00
hf@deer.(none)
1393c8a808
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-02-12 20:12:06 +04:00
hf@deer.(none)
56ea00afbd
Fix for bug #8477 (Embedded query_cache test crashes)
2005-02-12 20:09:40 +04:00
bar@mysql.com
9ba7392306
Bug#8235 Connection collation change & table create with default result in crash
2005-02-12 16:27:22 +04:00
serg@serg.mylan
40da910d4c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 09:38:15 +01:00
serg@serg.mylan
42bb0901a3
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-12 00:10:07 +01:00
serg@serg.mylan
d355174522
make LOAD INDEX to work
2005-02-12 00:05:13 +01:00
igor@rurik.mysql.com
cdb40830d2
Manual merge
2005-02-11 15:00:29 -08:00
igor@rurik.mysql.com
73e44adb59
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-11 14:48:12 -08:00
igor@rurik.mysql.com
1bb04b0642
distinct.result:
...
Adjustment of the result file after the revision of the fix for bug #7520 .
2005-02-11 13:44:54 -08:00
bell@sanja.is.com.ua
8f95f5a595
Fixed mistyping (thnx to Konstantin)
2005-02-11 21:57:37 +02:00
igor@rurik.mysql.com
fca327a131
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2005-02-11 10:50:11 -08:00
igor@rurik.mysql.com
e528a1c777
Manual merge
2005-02-11 10:44:03 -08:00
igor@rurik.mysql.com
634424ca16
select.result:
...
After revision of the fix for bug #7520 .
table.cc:
Revised the fix for bug #7520 .
Made it compliant with 5.0 code where the bug does not exist.
2005-02-11 10:39:26 -08:00
joerg@mysql.com
012312c2f6
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-02-11 11:58:59 +01:00
joerg@mysql.com
cec36217e1
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2005-02-11 11:48:26 +01:00
ingo@mysql.com
987731d8b7
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug8306
2005-02-11 10:51:17 +01:00
joerg@mysql.com
21e3ff0e8a
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1
2005-02-11 10:40:10 +01:00
igor@rurik.mysql.com
a697e5da15
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 23:48:35 -08:00
igor@rurik.mysql.com
4ef431ad55
select.result:
...
Adjusted results of the test case for bug #7520 for 4.1.
2005-02-10 23:47:57 -08:00
igor@rurik.mysql.com
d8b1c40f2b
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2005-02-10 22:55:05 -08:00
igor@rurik.mysql.com
06ff30f6c0
Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-10 22:17:18 -08:00
igor@rurik.mysql.com
8b3d59ad42
select.result, select.test:
...
Added a test case for bug #7520 .
table.cc:
Fixed bug #7520 .
The bug was caused by a wrong calculation of the field max_key_length for
a TABLE structure when there was an index on a blob field.
2005-02-10 22:15:38 -08:00
jimw@mysql.com
5378f6396f
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-10 20:33:05 -08:00
jimw@mysql.com
d6c01b51d0
Merge mysql.com:/home/jimw/my/mysql-4.0-clean
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-10 20:32:35 -08:00
jimw@mysql.com
6daef0229c
Fix extra blank line in emails sent by post-commit trigger.
2005-02-10 20:31:23 -08:00
brian@zim.(none)
29af4dffe6
Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks...
2005-02-10 19:04:38 -08:00
jimw@mysql.com
3d265e9777
Merge commit trigger
2005-02-10 14:32:01 -08:00
jimw@mysql.com
b3d2e434ee
Merge bk-internal:/home/bk/mysql-4.0
...
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-02-10 14:23:05 -08:00
lars@mysql.com
8b9679de0e
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6749-4.1
2005-02-10 21:55:36 +01:00
lars@mysql.com
bef05eda10
BUG#6749: If there is no current database, then nothing should be binlogged if
...
binlog-do-db or binlog-ignore-db are in effect. (In the future 5.1? 5.0? I think
each statement should be verified against the filtering criteria based on the database
it *uses* and not the *current* one. But, right now the *current* database is what
counts according to the semantics of the manual.)
2005-02-10 21:23:48 +01:00
ingo@mysql.com
35f65c5a06
Bug#8391 - "merge" fails on Linux/IA64
...
It was a thread stack overrun.
IA64 had its own stack size section already.
Enlarged its default stack size from 192K to 256K.
2005-02-10 16:56:57 +01:00
konstantin@mysql.com
36c992b264
Follow-up for bug#7990
2005-02-10 18:24:26 +03:00
konstantin@mysql.com
4b2b327dcc
A fix and test case for Bug#7990 "mysql_stmt_close doesn't
...
reset mysql->net.last_error": the solution is to clear
MYSQL->net error before performing COM_CLOSE: if the call
succeeds, the connection is usable for other statements.
More comprehensive fix is to clear MYSQL->net for all
recoverable errors at the time they happen, it will be
implemented in 5.0 as it introduces incompatibility in behavior.
2005-02-10 17:41:54 +03:00
joerg@mysql.com
12db4bf59e
Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0
2005-02-10 14:34:36 +01:00
joerg@mysql.com
a710d10637
Change 'Build-tools/Do-compile' from 'system("rm -f ...");' to 'unlink()' to ensure
...
it also works on file names with special characters.
2005-02-10 14:33:27 +01:00
tomas@poseidon.ndb.mysql.com
69ea046b06
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-10 13:41:26 +01:00
konstantin@mysql.com
016544df22
A fix and test case for Bug#8330 "mysql_stmt_execute crashes" (libmysql).
2005-02-10 14:56:20 +03:00
jimw@mysql.com
845139731b
Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-09 16:36:24 -08:00
bell@sanja.is.com.ua
70797f571f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-02-09 21:14:06 +02:00
bell@sanja.is.com.ua
90c0024217
reverted patch for BUG#7351 (because of performance ussie)
2005-02-09 21:08:08 +02:00