mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26076 commits 2791 branches 343 tags 1.7 GiB
Commit graph

26076 commits

This branch
This branch
All branches
Author SHA1 Message Date
andrey@lmy004.
b7440b7a55 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 09:46:13 +02:00
andrey@lmy004.
f93c54205d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 09:10:56 +02:00
sergefp@mysql.com
eac4388caf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12943
 2005-09-09 10:08:46 +04:00
igor@rurik.mysql.com
871ac087c3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-09-08 21:22:37 -07:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
f7957c9819 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-09-09 00:22:36 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
2fdea2c26d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-09-08 22:47:41 -04:00
igor@rurik.mysql.com
6bbdd66e89 olap.result, olap.test: 
Added a test case with VIEW for bug #12885.
 2005-09-08 15:45:31 -07:00
jimw@mysql.com
3c47235648 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-09-08 15:08:26 -07:00
konstantin@mysql.com
28d61a05ab Fix -ansi -pedantic compilation failure. 2005-09-09 02:01:04 +04:00
igor@rurik.mysql.com
b2f0f9085f Manual merge 2005-09-08 13:45:49 -07:00
igor@rurik.mysql.com
bcae525685 Manual merge 2005-09-08 13:44:36 -07:00
igor@rurik.mysql.com
3b76329f78 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-09-08 12:44:30 -07:00
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
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
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
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
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
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
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