mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26096 commits 2779 branches 343 tags 1.6 GiB
Commit graph

26096 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
42a433853f Comment why lex->result is ignored if EXPLAIN 2005-09-09 16:23:12 +04:00
unknown
708553e069 aftermerge 2005-09-09 12:47:57 +02:00
unknown
1a33135002 merged 2005-09-09 12:43:25 +02:00
unknown
ec16a3d6be aftermerge 2005-09-09 12:15:25 +02:00
unknown
7d512b157c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 11:27:21 +02:00
unknown
d44ed34762 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-merge


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
 2005-09-09 12:57:41 +04:00
unknown
fa3c6c76f2 Post-merge fixes 2005-09-09 12:57:00 +04:00
unknown
cc17a69af6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
 2005-09-09 10:49:09 +02:00
unknown
be71e4e99f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 10:27:58 +02:00
unknown
0ef988ada3 Post-merge fixes 
client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2005-09-09 11:50:38 +04:00
unknown
89e95985df 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
unknown
5facb89827 merged 
sql/item_cmpfunc.h:
  Auto merged
 2005-09-09 09:44:58 +02:00
unknown
f32088a941 Post-merge fixes. Call sp_cache_clear in THD::cleanup. 2005-09-09 11:43:26 +04:00
unknown
d3f2e6afdb Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651


sql/sql_base.cc:
  Auto merged
 2005-09-09 09:10:56 +02:00
unknown
20994fec52 Merge 4.1->5.0 
client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2005-09-09 10:54:59 +04:00
unknown
ee7f419264 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-09 08:34:21 +02:00
unknown
5ed7e97310 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12943


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2005-09-09 10:08:46 +04:00
unknown
65ba93fda9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_class.cc:
  Auto merged
 2005-09-08 21:22:37 -07:00
unknown
1266ccc899 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


ndb/src/ndbapi/SignalSender.cpp:
  Merge
 2005-09-09 00:22:36 -04:00
unknown
a49e23ad84 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


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_class.cc:
  SCCS merged
 2005-09-08 22:47:41 -04:00
unknown
213fa9cbc2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-09-09 01:04:54 +02:00
unknown
2eaee052bc olap.result, olap.test: 
Added a test case with VIEW for bug #12885.


mysql-test/t/olap.test:
  Added a test case with VIEW for bug #12885.
mysql-test/r/olap.result:
  Added a test case with VIEW for bug #12885.
 2005-09-08 15:45:31 -07:00
unknown
1d003c52d2 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
unknown
2b17f75073 Fix -ansi -pedantic compilation failure. 2005-09-09 02:01:04 +04:00
unknown
5a49a63290 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_cmpfunc.h:
  Auto merged
 2005-09-08 23:11:15 +02:00
unknown
afbdcd413a BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache 2005-09-08 22:57:27 +02:00
unknown
1e5069703a Manual merge 2005-09-08 13:45:49 -07:00
unknown
10349b118f Manual merge 
mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2005-09-08 13:44:36 -07:00
unknown
17ec83fc01 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
unknown
91d2150dd6 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.


mysql-test/r/olap.result:
  Added test case for bug #12885.
mysql-test/t/olap.test:
  Added test case for bug #12885.
sql/sql_select.cc:
  Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.
 2005-09-08 12:37:16 -07:00
unknown
cd4d340ba1 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
unknown
f257163824 fix for bug #12651 (item of a prepared query allocated on non-permanent 
are thus dangling later)


mysql-test/r/ps.result:
  test for bug #12651
  (data allocated on thd's arena but not on permanent arena)
mysql-test/t/ps.test:
  test for bug #12651
  (data allocated on thd's arena but not on permanent arena)
sql/sql_base.cc:
  if there is tree transformation then backup the current arena
  and use permanent one (for PS) otherwise the data will be deallocated
  after the prepare process is finished.
  this bug was introduced with the recent natural join patch
 2005-09-08 21:30:05 +02:00
unknown
5ae2ca2197 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
unknown
91d05c5234 SignalSender.cpp: 
fixed compile error


ndb/src/ndbapi/SignalSender.cpp:
  fixed compile error
 2005-09-08 19:27:37 +02:00
unknown
1cb413830d 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
unknown
996d4c455e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usersnfs/pchardin/mysql-5.0


sql/sp_head.cc:
  Auto merged
 2005-09-08 18:27:05 +02:00
unknown
1b15f430d6 fix for Bug #12849 Stored Procedure: Crash on procedure call with CHAR type 'INOUT' parameter 
(recommit with the right Bug#)


mysql-test/r/sp.result:
  result file modified to reflect new test
mysql-test/t/sp.test:
  added test for the bug
sql/item.cc:
  protect Item_splocal value from modification by CONCAT() et al
sql/item.h:
  added a buffer to save Item_splocal string pointer
sql/sp_head.cc:
  don't employ reuse mechanism to save var into itself
 2005-09-08 18:25:42 +02:00
unknown
824750a9ed Remove an obsolete comment and an unused variable. 
sql/sp_head.cc:
  Remove an obsolete comment (recursion in SP is disabled)
sql/sql_select.h:
  Remove an unused variable.
 2005-09-08 18:51:36 +04:00
unknown
e61d56a985 corrected type 2005-09-08 16:51:35 +02:00
unknown
110230beec corrected typo 2005-09-08 16:47:27 +02:00
unknown
48e97a16c7 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
unknown
66d6ae2c90 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
 2005-09-08 15:59:06 +02:00
unknown
9c5dd6a233 corrected printouts in backup test 
ndb/src/kernel/blocks/backup/Backup.hpp:
  missed this file in prev commit
ndb/test/src/NdbBackup.cpp:
  corrected printouts in backup test
 2005-09-08 15:43:46 +02:00
unknown
ef0a284a4c corrected prev fix for bug #13054 
so that _only_ backup master replies to API
 2005-09-08 15:24:21 +02:00
unknown
fc3c0de414 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
unknown
dd1fd086ea 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
unknown
f7b7ced602 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
unknown
0246d3c8c2 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
unknown
8e2cc50100 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
unknown
728b9be6d3 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