mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53898 commits 2785 branches 343 tags 1.6 GiB
Commit graph

53898 commits

This branch
This branch
All branches
Author SHA1 Message Date
thek@kpdesk.mysql.com
f932e51b45 Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1 
into  kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
 2008-04-14 12:58:53 +02:00
kostja@dipika.(none)
e4d011c603 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
 2008-04-08 20:32:29 +04:00
kostja@dipika.(none)
84de43cda6 Remove dead code. 2008-04-08 20:31:40 +04:00
thek@adventure.(none)
38effd5603 Merge error between two patches caused error out-of-bounds assignment. 2008-04-08 15:57:44 +02:00
thek@adventure.(none)
4f15839f66 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2008-04-08 09:20:53 +02:00
kostja@dipika.(none)
a9fff11f49 Fix a compilation warning (unused variable). 2008-04-07 23:57:47 +04:00
kostja@dipika.(none)
63944ed537 A fix for Bug#32724 "innodb_mysql.test fails randomly". 
Enable back the disabled test case.
 2008-04-07 15:42:32 +04:00
dlenev@mockturtle.local
44fe33f011 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-symlink
 2008-04-07 13:46:56 +04:00
kostja@dipika.(none)
968b1a0810 Review and update WL#4165 and WL#4166 test coverage. 2008-04-07 13:35:42 +04:00
thek@adventure.(none)
27b6c17d94 Bug#34183 Missing DBUG_RETURN in alloc_root 
DBUG_RETURN was missing form an exit path in 5.1 branch of alloc_root
 2008-04-07 11:29:45 +02:00
dlenev@mockturtle.local
15fd42b7dd Fix for bug #35733 "main.symlink.test fails". 
The problem was that symlink.test failed due to debug assertions or
due to errors emitted for wrong statements (in non-debug builds)
if 6.0 version of server was run with --thread-handling=pool-of-threads
option.

The above problems were caused by that on the one hand code mi_create()
which handles case when error is returned relies on my_errno being set
to appropriate non-0 value, but on the other it has not done this
in case when error was emitted due to discovery that share for table
which we are going to create is already present in the list of open
shares. Running server with pool-of-threads option just exposed this
bug since in this scheduler mode my_errno is reset to 0 when connection
(THD) is reattached to the "real" thread.

This fix ensures that code in mi_create() properly sets my_errno in
the case described above.

Since original reason that caused this bug to be exposed in 6.0 tree
might also under very special conditions lead to incorrect behavior
of earlier versions of server (i.e. to errors emitted for wrong
statements) this patch is also being pushed into 5.1 tree.

No test case is present as this code is already covered by a test
case + pushbuild options combination in 6.0.
 2008-04-07 12:59:57 +04:00
mkindahl@dl145h.mysql.com
013fd23675 Post-merge fixes. 2008-04-01 18:50:35 +02:00
thek@adventure.(none)
e392f406f5 Bug#26208 a typo (wrong variable name) in mysql_prepare_update function's source code? 
This is a code clean up.
Removed redundant (and unused) TABLE_LIST variable intended as an IN-
parameter for setup_order.
 2008-04-01 14:41:13 +02:00
mkindahl@dl145h.mysql.com
46af329848 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-04-01 12:36:20 +02:00
mkindahl@dl145h.mysql.com
edc7090a5a Post-merge fixes. 2008-04-01 12:29:53 +02:00
mkindahl@dl145h.mysql.com
3f174f66e2 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-04-01 11:54:25 +02:00
thek@adventure.(none)
052d0426f4 Merge adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2008-04-01 11:21:09 +02:00
thek@adventure.(none)
1cc64d4eab Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2008-04-01 10:44:56 +02:00
mkindahl@dl145h.mysql.com
354f4d4cf6 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-04-01 08:45:24 +02:00
mkindahl@dl145h.mysql.com
fb9e8ed5e8 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-04-01 08:43:15 +02:00
kent/mysqldev@mysql.com/production.mysql.com
3cfd16da53 Raise version number after cloning 5.1.24-rc 2008-03-31 19:05:18 +02:00
mkindahl@dl145h.mysql.com
b9f860f3e6 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-03-31 16:34:52 +02:00
mkindahl@dl145h.mysql.com
6c8a0887cc Removing race conditions from rpl_packet causing test to fail. 2008-03-31 16:32:45 +02:00
davi@endora.local
ad6d59e9b2 Merge mysql.com:/Users/davi/mysql/bugs/ps-cleanup-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2008-03-31 09:54:36 -03:00
gkodinov/kgeorge@magare.gmz
2d7104e0c0 merge 5.1-main to 5.1-bugteam 2008-03-31 14:13:42 +03:00
kostja@dipika.(none)
ad4113f72f Remove some unused code. 2008-03-31 14:52:41 +04:00
gkodinov/kgeorge@magare.gmz
69b7c5fee9 Merge bk-internal:/home/bk/mysql-5.1-bugteam 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
 2008-03-31 12:38:01 +03:00
mats@mats-laptop.(none)
8642b248f4 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
 2008-03-31 11:31:53 +02:00
mats@mats-laptop.(none)
540247f3e9 Updating commit.inc since the number of commits done for non-transactional 
tables is not zero any more. For row-based logging, there is an extra commit
for sending rows changed by the statement to the binary log.
 2008-03-31 11:29:03 +02:00
gkodinov/kgeorge@magare.gmz
0463ba57a5 Merge bk-internal:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
 2008-03-31 11:57:18 +03:00
mkindahl@dl145h.mysql.com
5134d443a1 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-03-31 09:59:22 +02:00
mkindahl@dl145h.mysql.com
a7fe4abc55 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-03-31 09:57:29 +02:00
gkodinov/kgeorge@magare.gmz
dd17571b83 Merge bk-internal:/home/bk/mysql-5.1-build 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
 2008-03-31 10:41:26 +03:00
gkodinov/kgeorge@magare.gmz
dd62320d0e Merge bk-internal:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
 2008-03-31 10:40:39 +03:00
iggy@amd64.(none)
6a272aecc8 Merge amd64.(none):/src/bug26243/my50-bug26243 
into  amd64.(none):/src/bug26243/my51-bug26243
 2008-03-30 15:47:44 -04:00
iggy@amd64.(none)
f13f6eaff3 Bug#26243 - Cleanup Valgrind error 2008-03-30 15:46:37 -04:00
aelkin/andrei@mysql1000.(none)
c7447a25c6 Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-30 14:12:27 +03:00
aelkin/andrei@mysql1000.(none)
ba7b1a7e55 Bug #35675 reset master finds assert if a binlog file can not be deleted 
If a binlog file is manually replaced with a namesake directory the internal purging did
not handle the error of deleting the file so that eventually
a post-execution guards fires an assert.

Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error 
at an attempt to delete it.
The same applied to the index file deletion.

The cset carries pieces of manual merging.
 2008-03-30 00:54:08 +02:00
gkodinov/kgeorge@macbook.gmz
e73c5dd63f Merge macbook.gmz:/Users/kgeorge/mysql/work/pb-5.0-bugteam 
into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam
 2008-03-29 17:56:33 +02:00
gkodinov/kgeorge@macbook.gmz
fd9993db87 fixed warnings from the fix of 26243 2008-03-29 17:50:46 +02:00
gkodinov/kgeorge@macbook.gmz
1d2515ecdf Merge macbook.gmz:/Users/kgeorge/mysql/work/pb-5.0-bugteam 
into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam
 2008-03-29 16:15:06 +02:00
gkodinov/kgeorge@macbook.gmz
84f761daaf fixes for warnings and compile errors for the fix of bug 26243 2008-03-29 16:12:23 +02:00
aelkin/andrei@mysql1000.(none)
d3d0a00635 Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-29 15:00:12 +02:00
aelkin/andrei@mysql1000.(none)
22536fc53e Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-29 14:19:53 +02:00
aelkin/andrei@mysql1000.(none)
c4813ae343 Fixing rpl suite disabled.def: rpl_stm_extraColmaster_ndb does not exist in the suite. 2008-03-29 14:01:56 +02:00
gkodinov/kgeorge@macbook.gmz
0e911c09a6 Merge macbook.gmz:/Users/kgeorge/mysql/work/pb-5.0-bugteam 
into  macbook.gmz:/Users/kgeorge/mysql/work/pb-5.1-bugteam
 2008-03-29 10:02:54 +02:00
gkodinov/kgeorge@macbook.gmz
7cb4b7c19d fixed warnings and compile errors from the fix for bug 26243 2008-03-29 09:52:16 +02:00
iggy@amd64.(none)
7f0cf72679 Merge amd64.(none):/src/bug26243/my50-bug26243 
into  amd64.(none):/src/bug26243/my51-bug26243
 2008-03-28 17:08:38 -04:00
iggy@amd64.(none)
a52c9abe51 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  amd64.(none):/src/bug26243/my51-bug26243
 2008-03-28 17:06:04 -04:00
anozdrin/alik@quad.opbmk
ce225e7339 Fix manual merge. 2008-03-29 00:05:20 +03:00