joreland@mysql.com
3979bd6da7
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-24 16:50:01 +02:00
joreland@mysql.com
66407729fb
ndb - mysqltestrun
...
run ndb_select_all --no-defaults
2005-05-24 16:48:56 +02:00
joreland@mysql.com
7ab84a3deb
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-12 11:14:33 +02:00
joreland@mysql.com
04e72baded
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-12 11:12:04 +02:00
igor@rurik.mysql.com
3351233349
Manual merge
2005-05-10 16:41:47 -07:00
igor@rurik.mysql.com
9d4b228b61
Many files:
...
Fixed bug #8528 .
Representation for single-table views was made similar to
representation for multi-table views.
view.test:
Added test case for bug #8528 .
view.result:
Added test case for bug #8528 . Fixed other test cases.
2005-05-10 16:31:13 -07:00
gbichot@quadita2.mysql.com
3c81444476
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 20:35:12 +02:00
gluh@mysql.com
efaeb069e7
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Devel/mysql-5.0
2005-05-10 18:35:11 +00:00
gluh@mysql.com
75b7fef44f
Bug#10018: use INFORMATION_SCHEMA works, but show tables in it returns error
...
additional fix after review
2005-05-10 18:34:04 +00:00
kent@mysql.com
c82c07dc03
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-10 18:14:45 +02:00
msvensson@neptunus.(none)
4bf24254ab
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-10 17:52:17 +02:00
msvensson@neptunus.(none)
08a48ac2d4
Fix for Ingo
2005-05-10 17:51:29 +02:00
gbichot@quadita2.mysql.com
b6ca1a1485
comment change (post-review of "replication of triggers"). Btw date_formats segfaults with --ps-protocol - not caused by my changes though; I'll file a bug report.
2005-05-10 15:55:22 +02:00
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
bar@noter.(none)
ab41ec313f
ctype-big5.c:
...
additional fix for bug@10493, for sjis
ctype-cp932.c:
additional fix for bug#10493, for cp932
2005-05-10 17:00:54 +05:00
kent@mysql.com
7c65e20e32
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-10 13:56:08 +02:00
kent@mysql.com
faf8f825b5
Makefile.am, configure.in:
...
Enable creation of embedded lib when --with-darwin-mwcc
2005-05-10 13:53:47 +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
bar@mysql.com
70506c67ff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/root/mysql-4.1
2005-05-10 14:24:58 +05:00
bar@noter.(none)
8a5c6502ca
bug#10344: some string function fail for UCS2
...
substr fix
2005-05-10 14:13:58 +05: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
joreland@mysql.com
2043252dab
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-09 20:09:19 +02: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
joreland@mysql.com
f60992def9
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-09 19:12:28 +02: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
fa96cc875a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-09 17:06:05 +02: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