pekka@mysql.com
51553a5af1
ndb - post-merge fixes
2005-02-16 14:59:17 +01:00
pekka@mysql.com
c177f9fc4a
Merge
2005-02-16 13:14:21 +01:00
pekka@mysql.com
7c9a155c4a
ndb - fix old decimal type mysql vs ndb
2005-02-16 12:45:59 +01: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
hf@deer.(none)
d75c9dc1d8
Fix for bug #8534 (Compile errors in Precision Math code on Windows)
2005-02-16 11:44:34 +04: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
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
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
tomas@poseidon.ndb.mysql.com
df3b674c34
MgmtSrvr.cpp:
...
small bugfix "ERROR Message: failed"
2005-02-15 15:09:23 +01:00
monty@mysql.com
44ceb84cdc
Merge with 4.0
2005-02-15 14:49:52 +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
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
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
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
sergefp@mysql.com
c30f7feba1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug8218
2005-02-14 23:49:01 +03:00
sergefp@mysql.com
919f2f2364
Merge mysql.com:/home/psergey/mysql-4.1-bug8218
...
into mysql.com:/home/psergey/mysql-5.0-bug8218
2005-02-14 23:47:31 +03:00
sergefp@mysql.com
021f9849ef
Remove redundant DROP TABLE from test case
2005-02-14 23:45:48 +03:00
svoj@mysql.com
ac7dd8265a
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/mysql-4.1
2005-02-14 23:30:03 +04:00
matthias@three.local.lan
24bd4aea52
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
2005-02-14 18:48:50 +01:00
tomas@poseidon.ndb.mysql.com
495cb18ac1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-14 18:48:49 +01:00
matthias@three.local.lan
d6c5089e92
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
2005-02-14 16:34:36 +01:00
marko@hundin.mysql.fi
e0e87d0c92
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/k/mysql-5.0
2005-02-14 17:23:12 +02:00
heikki@hundin.mysql.fi
01872c239d
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-02-14 17:23:11 +02:00
gluh@gluh.mysql.r18.ru
29510ce029
Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
...
Can't repeat information_schema test failure
Fix for lowercase_table3 only
2005-02-14 18:23:10 +03:00
tomas@poseidon.ndb.mysql.com
35de04dfac
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-14 16:22:00 +01: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
svoj@mysql.com
643b602832
Bug#8351
...
Fix for crash when using a double quote in boolean fulltext query.
2005-02-14 18:54:12 +04:00
heikki@hundin.mysql.fi
67392525e8
ha_innodb.cc:
...
Fix a glitch reported by Guilhem: release the memory allocated for innodb_internal_... if innobase_init() fails; cleanups: in ha_innodb, you should use the InnoDB formatting style for the source code
2005-02-14 16:00:15 +02:00
marko@hundin.mysql.fi
e868711319
InnoDB: Small improvements to earlier patch (fix Bug #7350 better),
...
suggested in review by Heikki.
2005-02-14 15:54:08 +02:00
mleich@mysql.com
cb56fcaa94
Removal of a not needed statement
2005-02-14 14:20:43 +01:00
serg@serg.mylan
10c53ae1e5
remove passwordless remote accounts from windows distro
2005-02-14 11:14:04 +01:00
matthias@three.local.lan
e8bf23c16a
Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-14 10:23:53 +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
heikki@hundin.mysql.fi
71174327df
row0mysql.c:
...
Fix memory corruption bug reported by Georg Richter: if one created a table whose primary key contained at least 2 column prefixes, that could corrupt the memory heap of prebuilt_t
2005-02-13 20:48:02 +02:00
kent@mysql.com
ba3f9acff6
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-13 18:22:38 +01: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
hf@deer.(none)
958456caa3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-13 01:54:24 +04:00
hf@deer.(none)
5b3ea1ab89
Fix for bug 8416 (bigint test fails on PPC)
2005-02-13 01:36:35 +04:00
sergefp@mysql.com
c0c50efdef
Fix for BUG#8218:
...
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up
pointing to the wrong List.
2005-02-12 22:58:54 +03:00