Commit graph

22707 commits

Author SHA1 Message Date
gbichot@quadita2.mysql.com
0fe9b5474a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 14:04:02 +02:00
jani@ibmlab.site
e7c02801a0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ibmlab.site:/home/my/bk/mysql-5.0
2005-05-10 13:34:17 +03:00
joreland@mysql.com
0d2cb6c8e4 Merge 2005-05-10 12:34:16 +02:00
gbichot@quadita2.mysql.com
d6e1e5b417 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 11:31:46 +02:00
msvensson@neptunus.(none)
f3890e9440 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-10 10:49:50 +02:00
msvensson@neptunus.(none)
689cb24b5b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-10 10:45:49 +02:00
msvensson@neptunus.(none)
7133dc5a22 Remove testcode 2005-05-10 10:45:16 +02:00
jani@ibmlab.site
0b5cedca79 Fixed Bug#10232: update with subquery, precision math,
another column gets rotten value.
2005-05-10 09:25:25 +03:00
sergefp@mysql.com
b580a12d47 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug10095
2005-05-10 00:43:18 +02:00
sergefp@mysql.com
d1e9d9b981 Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available 2005-05-10 00:40:41 +02:00
holyfoot@mysql.com
32024bfc43 Merge mysql.com:/home/hf/work/mysql-4.1.ssj
into mysql.com:/home/hf/work/mysql-5.0.clean
2005-05-10 02:59:28 +05:00
holyfoot@mysql.com
d63df3a3d5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/hf/work/mysql-4.1.ssj
2005-05-10 02:54:49 +05:00
holyfoot@hf-ibm.(none)
1851a38b2f Fix for bug #10493 (SJIS fields are not correctly saved) 2005-05-10 02:15:59 +05:00
msvensson@neptunus.(none)
46b935d085 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 22:43:09 +02:00
msvensson@neptunus.(none)
7366c21839 Add compiler settings for Pentium M 2005-05-09 21:59:03 +02:00
jimw@mysql.com
cde9f56b45 Merge 2005-05-09 11:28:57 -07:00
joreland@mysql.com
5c4da6aa4d merge 2005-05-09 20:28:55 +02:00
joreland@mysql.com
ba4ac5874a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-09 20:28:54 +02:00
gluh@mysql.com
2ae1faaf4b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
2005-05-09 18:28:53 +00:00
gluh@mysql.com
639f7ccba2 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
2005-05-09 18:20:24 +00:00
gluh@mysql.com
828237909f after merge fix 2005-05-09 18:18:59 +00:00
gluh@mysql.com
a7e0794813 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
2005-05-09 17:24:34 +00:00
gluh@mysql.com
03234c48cf manual merge 2005-05-09 17:21:44 +00:00
gluh@mysql.com
12085567de Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries 2005-05-09 16:22:49 +00:00
kent@mysql.com
2f9a28b4cc configure.in:
Bumped up version number to indicate 4.1.12 was branched off
2005-05-09 18:14:10 +02:00
bar@noter.(none)
c783cb3d7e SUBSTR with negative argument didn't work
with multi-byte strings, length() instead
of numchars() where used in a mistake.
2005-05-09 20:55:06 +05:00
joreland@mysql.com
b01b904cc5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-09 16:05:52 +02:00
joreland@mysql.com
64408825a6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-09 16:04:38 +02:00
ramil@mysql.com
ac22187955 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/ram/work/mysql-4.1
2005-05-09 18:50:57 +05:00
antony@ltantony.mysql.com
ddf6225def Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733
2005-05-09 14:50:56 +01:00
joreland@mysql.com
82c1cb24b4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-09 15:37:09 +02:00
ramil@ram-book.(none)
8d30d30073 a fix (bug #10438: Raid stopped working because of change in atomic add detection). 2005-05-09 18:33:21 +05:00
jimw@mysql.com
fee81b6d97 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-09 06:33:20 -07:00
antony@ltantony.mysql.com
cc3bfc6ff1 Bug#8733 - server accepts malformed query (multiply mentioned distinct)
Detect conflicting options in SELECT
2005-05-09 14:31:46 +01:00
dlenev@mysql.com
fa8bf7bc09 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-05-09 17:26:59 +04:00
joreland@mysql.com
b15797bbaa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-09 15:15:25 +02:00
dlenev@mysql.com
feb8a43c4d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-05-09 17:01:23 +04:00
mwagner@ultrafly.mysql.com
cc29d0a234 Merge bk-internal:/home/bk/mysql-5.0
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-5.0
2005-05-09 14:59:57 +02:00
joreland@mysql.com
f2edd8069f bug#10471 - ndb - potential inconsistent backup
whith some multi update scenarios

  Make sure to init GCI on correct operation before firering operation
2005-05-09 14:59:49 +02:00
mwagner@ultrafly.mysql.com
58409db4c9 make_binary_distribution.sh:
- Add --machine override
2005-05-09 14:57:45 +02:00
msvensson@neptunus.(none)
82e6d15be5 Fixes after review 2005-05-09 14:49:27 +02:00
jimw@mysql.com
3591b93874 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-09 05:30:11 -07:00
dlenev@mysql.com
e7f29e1904 Manual merge of fix for bug #9913 into 5.0 tree. 2005-05-09 16:21:57 +04:00
holyfoot@mysql.com
8d12a8b124 Merge mysql.com:/home/hf/work/mysql-5.0.clean
into mysql.com:/home/hf/work/mysql-5.0.emb
2005-05-09 17:11:37 +05:00
holyfoot@hf-ibm.(none)
5ddaf35c26 Fix for bug #9632 (strict.test fails in -embedded-server mode) 2005-05-09 16:26:06 +05:00
msvensson@neptunus.(none)
1e889f3beb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 12:48:32 +02:00
msvensson@neptunus.(none)
891b64fd84 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 12:16:59 +02:00
joreland@mysql.com
c1f04bf083 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-09 12:16:58 +02:00
ramil@mysql.com
ef02e6fa4d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/ram/work/5.0
2005-05-09 15:07:29 +05:00
mwagner@ultrafly.mysql.com
6078fccbf9 Merge bk-internal:/home/bk/mysql-5.0
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-5.0
2005-05-09 12:07:28 +02:00