Commit graph

26241 commits

Author SHA1 Message Date
igor@rurik.mysql.com
19192328f2 sql_select.cc:
Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.
olap.test, olap.result:
  Added test case for bug #12885.
2005-09-08 12:37:16 -07:00
jimw@mysql.com
06e44486d3 Merge mysql.com:/home/jimw/my/mysql-5.0-12550
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-08 12:33:14 -07:00
andrey@lmy004.
1a46ea1057 fix for bug #12651 (item of a prepared query allocated on non-permanent
are thus dangling later)
2005-09-08 21:30:05 +02:00
timour@mysql.com
13d8179157 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486
2005-09-08 21:02:19 +03:00
patg@radha.local
4cb63e6b8b BUG #9056 Changes to patch #2 per Serg's review 2005-09-08 19:45:25 +02:00
tulin@dl145c.mysql.com
0f4bb8e6ff SignalSender.cpp:
fixed compile error
2005-09-08 19:27:37 +02:00
timour@mysql.com
818e2a3e89 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486
2005-09-08 19:52:47 +03:00
mronstrom@mysql.com
cd0ae9967c Merge mikael@ndb.mysql.com:/home/mikael/bug12594
into  mysql.com:/Users/mikron/mysql-4.1
2005-09-08 18:30:13 +02:00
petr@mysql.com
b5583947df Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usersnfs/pchardin/mysql-5.0
2005-09-08 18:27:05 +02:00
petr@mysql.com
4a28ddac1c fix for Bug #12849 Stored Procedure: Crash on procedure call with CHAR type 'INOUT' parameter
(recommit with the right Bug#)
2005-09-08 18:25:42 +02:00
mronstrom@mysql.com
43c2bc2f34 Bug #12594: A few fixes 2005-09-08 18:24:42 +02:00
konstantin@mysql.com
8d0dd7a45a Remove an obsolete comment and an unused variable. 2005-09-08 18:51:36 +04:00
tomas@poseidon.ndb.mysql.com
ffea32c6f3 corrected type 2005-09-08 16:51:35 +02:00
tomas@poseidon.ndb.mysql.com
98a52fa9a4 corrected typo 2005-09-08 16:47:27 +02:00
tomas@poseidon.ndb.mysql.com
b75340e70d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-08 16:44:54 +02:00
tomas@poseidon.ndb.mysql.com
4d534ae24e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-09-08 15:59:06 +02:00
tomas@poseidon.ndb.mysql.com
a6c9ebba47 corrected printouts in backup test 2005-09-08 15:43:46 +02:00
tomas@poseidon.ndb.mysql.com
3979938c51 corrected prev fix for bug #13054
so that _only_ backup master replies to API
2005-09-08 15:24:21 +02:00
jan@hundin.mysql.fi
2097f1427b Fix compiler errors on InnoDB offline checksum tool innochecksum. 2005-09-08 15:47:21 +03:00
msvensson@neptunus.(none)
9c7d9c8fbb Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
2005-09-08 12:55:36 +02:00
hf@deer.(none)
4c6fb59243 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12938
2005-09-08 15:55:35 +05:00
joerg@mysql.com
3e11aa9fff Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-09-08 12:26:20 +02:00
msvensson@neptunus.(none)
815941fd46 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
2005-09-08 12:18:09 +02:00
joerg@mysql.com
1db297fc2d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-09-08 12:14:39 +02:00
msvensson@neptunus.(none)
08200d85ae Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug12987/my50-bug12987
2005-09-08 11:55:01 +02:00
mronstrom@mysql.com
6dbca02827 Bug #12594:
Added debug info to all log page headers
2005-09-08 11:53:17 +02:00
joerg@mysql.com
a88553ac55 Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0 2005-09-08 11:36:22 +02:00
msvensson@neptunus.(none)
60e3c3be0b yassl fix for ia64 + icc 2005-09-08 11:36:12 +02:00
tomas@poseidon.ndb.mysql.com
0634542458 Bug #13054 start backup command return may be interrpted 2005-09-08 11:34:55 +02:00
hf@deer.(none)
9ccb36049b Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12938
2005-09-08 14:34:01 +05:00
joerg@mysql.com
e240f59091 Merge mysql.com:/M40/clone-4.0 into mysql.com:/M41/merge-4.1 2005-09-08 11:12:05 +02:00
timour@mysql.com
7fc6216e73 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-2486
2005-09-08 11:32:14 +03:00
timour@mysql.com
912aef9579 Fix for BUG#12977. 2005-09-08 11:29:52 +03:00
osku@127.(none)
1fd3dd53c3 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
into  127.(none):/home/osku/mysql/5.0/clean
2005-09-08 11:28:54 +03:00
osku@127.(none)
08126a3688 Merge 127.(none):/home/osku/mysql/5.0/clean
into  127.(none):/home/osku/mysql/5.0/12084
2005-09-08 11:27:13 +03:00
SergeyV@selena.
95b5f7de0f Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#12517-mysql-4.1
2005-09-08 12:12:21 +04:00
SergeyV@selena.
668f0e10fa Modified test case for bug #12517 2005-09-08 12:09:30 +04:00
stewart@mysql.com
e55a6e7319 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug11607
2005-09-08 15:11:56 +10:00
stewart@mysql.com
055a96814a Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607
2005-09-08 15:06:01 +10:00
igor@rurik.mysql.com
04f3b5513a item_sum.cc, item_sum.h:
Post-merge fix.
2005-09-07 21:38:27 -07:00
igor@rurik.mysql.com
6daec8eb6c Manual merge 2005-09-07 18:07:51 -07:00
kent@mysql.com
c364baff71 configure.in:
Flag -DHAVE_DARWIN_THREADS not needed for darwin9
2005-09-08 03:06:49 +02:00
igor@rurik.mysql.com
80484114d4 Manual merge 2005-09-07 18:06:14 -07:00
igor@rurik.mysql.com
1e6736b543 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-09-07 16:33:12 -07:00
hartmut@mysql.com
1e2088b6d4 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-4.0
into  mysql.com:/home/hartmut/projects/mysql/dev/4.0
2005-09-08 01:08:02 +02:00
hartmut@mysql.com
052e9262ee Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into  mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-08 00:57:02 +02:00
hartmut@mysql.com
1e1872464b Merge mysql.com:/home/hartmut/projects/mysql/dev/4.0
into  mysql.com:/home/hartmut/projects/mysql/dev/4.1
2005-09-08 00:50:03 +02:00
serg@serg.mylan
c3137816ee Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-09-08 00:03:05 +02:00
aivanov@mysql.com
9c51a97e90 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/mysql-5.0
2005-09-07 23:44:23 +04:00
aivanov@mysql.com
7cc0639f59 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/mysql-4.1
2005-09-07 23:39:49 +04:00