lenz@mysql.com
9efeb56690
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-02-16 14:06:11 +01:00
pekka@mysql.com
c177f9fc4a
Merge
2005-02-16 13:14:21 +01:00
pekka@mysql.com
0d03304294
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a
ndb - fix old decimal type mysql vs ndb
2005-02-16 12:45:59 +01:00
kent@mysql.com
b32f693ee4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-16 12:10:13 +01:00
dean@mysql.com
e7f410a14a
Merge
2005-02-16 04:04:34 -06:00
msvensson@neptunus.homeip.net
e4ad041abf
Fix ndb_autodiscover
2005-02-16 11:02:48 +01:00
gluh@gluh.mysql.r18.ru
c62da2175f
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-02-16 13:02:47 +03:00
gluh@gluh.mysql.r18.ru
638dc7d9e9
Fix for bug#7915: crash,JOIN VIEW, subquery, SELECT .. FROM INFORMATION_SCHEMA.COLUMNS
2005-02-16 13:00:03 +03:00
dean@mysql.com
87718094aa
fulltext.test, fulltext.result:
...
Test case for bug#8522, to test for out of bounds memory access in ft_nlq_find_relevance().
2005-02-16 03:13:29 -06:00
guilhem@mysql.com
8e93873d5b
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-16 10:02:54 +01:00
guilhem@mysql.com
bbcc1464d5
rpl_multi_query.test: disable ps-protocol as PS don't support multi-queries
2005-02-16 10:01:05 +01:00
hf@deer.(none)
d75c9dc1d8
Fix for bug #8534 (Compile errors in Precision Math code on Windows)
2005-02-16 11:44:34 +04:00
lenz@mysql.com
207e87eb87
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-02-16 08:34:23 +01:00
hf@deer.(none)
48ff0f4c5e
Fix - to not to call val_xxx in Item_func_interval twice
2005-02-16 11:19:47 +04:00
igor@rurik.mysql.com
3100f891d2
Manual merge
2005-02-15 21:03:17 -08:00
igor@rurik.mysql.com
d9f66a261b
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2005-02-15 18:48:04 -08:00
igor@rurik.mysql.com
d4779d3534
delete.result, delete.test:
...
Added a test case for bug #8392 .
sql_delete.cc:
Fixed bug #8392 .
The bug caused a crash for a delete statement with ORDER BY
that explicitly referred to the modified table.
2005-02-15 18:45:42 -08:00
dean@mysql.com
ace1d892f0
Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
...
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-15 17:30:40 -06:00
dean@mysql.com
c962d060ac
ft_nlq_search.c:
...
Added bounds check to avoid accessing unallocated FT_DOC array. (BUG #8522 )
2005-02-15 17:27:23 -06:00
jimw@mysql.com
a6afab6a55
Always lowercase database names from 'host' and 'db' grant tables when they
...
are loaded and lower_case_table_names is set, but issue a warning when it is
done. (Bug #7989 )
2005-02-15 13:36:46 -08:00
jimw@mysql.com
dee9795b5b
Merge
2005-02-15 12:19:01 -08:00
joerg@mysql.com
109560c5bf
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-02-15 21:03:59 +01:00
jimw@mysql.com
e2291bdc7e
Only escape the first character in a sequence of bytes that appears to be
...
a multibyte character, but was not a valid multibyte character. Refinement
of fix for Bug #8378 .
2005-02-15 11:31:01 -08:00
dlenev@brandersnatch.localdomain
0a96ef4c90
Temporary disabling part of test which fails in --ps-protocol mode.
2005-02-15 22:17:44 +03:00
dlenev@brandersnatch.localdomain
a3c58bc964
Fixing failing -debug build.
...
Since placement operator delete called only if exception was thrown in
constructor and we don't use exceptions in MySQL, there is no sense to
do anything in String::delete(void *ptr_arg, MEM_ROOT *mem_root).
2005-02-15 22:06:55 +03:00
monty@mysql.com
7bc48798fc
Safety fix
2005-02-15 19:35:28 +02:00
monty@mysql.com
556cf40db1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-15 19:26:30 +02:00
monty@mysql.com
71e4859389
After merge fixes
2005-02-15 19:25:42 +02:00
kent@mysql.com
50fe0ccbea
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 16:13:03 +01:00
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
monty@mysql.com
410e51c854
Fixed failing test cases 'row.test' when running with --ps-protocol
...
Simple optimzations done while reviewing code
2005-02-15 16:45:00 +02:00
marko@hundin.mysql.fi
df0aee432a
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-02-15 16:12:51 +02:00
guilhem@mysql.com
4f41de1cc5
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 15:12:50 +01:00
tomas@poseidon.ndb.mysql.com
df3b674c34
MgmtSrvr.cpp:
...
small bugfix "ERROR Message: failed"
2005-02-15 15:09:23 +01:00
joerg@mysql.com
d7f64e01c8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-02-15 15:07:56 +01:00
joerg@mysql.com
e6b815a92e
1) Tag the 4.1.10 released version: bk tag -r 1.2159.8.1 "mysql-4.1.10"
...
2) Raise the version number to 4.1.11.
2005-02-15 14:13:18 +01:00
guilhem@mysql.com
a8380942bf
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-15 14:12:26 +01:00
monty@mysql.com
44ceb84cdc
Merge with 4.0
2005-02-15 14:49:52 +02:00
marko@hundin.mysql.fi
c4ff270284
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-02-15 14:42:14 +02:00
monty@mysql.com
788a2658a3
Better bug fix for #5569 : "Incorrect "Access Denied" error with SAME login DIFFERENT host"
...
This fixes also the reverse lookup bug introduced by the previous patch
2005-02-15 14:42:13 +02:00
lenz@mysql.com
efabada4a1
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-02-15 12:17:22 +01:00
ramil@mysql.com
9a042c81e7
A fix. "(int) var" type cast doesn't work correctly for uint32 var
...
on some 64-bit platforms (e.g. IRIX, non-debug build).
2005-02-15 15:01:20 +04:00
marko@hundin.mysql.fi
a1a78bbc4a
InnoDB: Create temporary files in the MySQL tmpdir instead of $TMPDIR.
...
(Bug #5822 )
2005-02-15 11:16:17 +02:00
lenz@mysql.com
635255ee9d
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-02-15 07:19:50 +01:00
igor@rurik.mysql.com
889ffaaabc
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-02-14 20:44:07 -08:00
jimw@mysql.com
3d7a384d00
Allow hostnames that are IP addresses with a netmask even when
...
running with --skip-name-resolve. (Bug #8471 )
2005-02-14 20:33:14 -08:00
kent@mysql.com
3f061ed18b
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-15 04:11:57 +01:00
igor@rurik.mysql.com
e6b22e6f82
Manual merge
2005-02-14 19:00:38 -08:00
konstantin@mysql.com
f7512e756f
Fix signatures of placement operator delete in places where placement
...
delete is declared. As we don't use exceptions placement delete is never
called and the fix only affects numerous warnings when
compiling with MS Visual C++.
For more info see http://www.gotw.ca/gotw/010.htm .
2005-02-15 03:55:44 +03:00