mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 07:44:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53872 commits 2778 branches 343 tags 1.6 GiB
Commit graph

53872 commits

This branch
This branch
All branches
Author SHA1 Message Date
mkindahl@dl145h.mysql.com
70827ee13e Post-merge fixes to make tests pass. 2008-04-02 20:47:16 +02:00
mkindahl@dl145h.mysql.com
5669551ccd Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
 2008-04-02 12:36:38 +02:00
sven@riska.(none)
0a4d373f3d BUG#34541: mysqlbinlog prints 'set;' in stm mode after changing autocommit mode 
Problem: a typo in the code. When autocommit, foreign_key_checks,
sql_auto_is_null, or unique_checks changes, it prints "SET", and then a
comma-separated list of assignments. However, it does not print the
assignment to the @@autocommit variable.
Fix: print the @@autocommit variable.
 2008-04-02 16:49:22 +07:00
mkindahl@dl145h.mysql.com
013fd23675 Post-merge fixes. 2008-04-01 18:50:35 +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
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
gkodinov/kgeorge@magare.gmz
2d7104e0c0 merge 5.1-main to 5.1-bugteam 2008-03-31 14:13:42 +03: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
anozdrin/alik@quad.opbmk
f5c4b91cf7 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-bt-merged
 2008-03-28 23:54:14 +03:00
iggy@amd64.(none)
52da4ab2bb Merge amd64.(none):/src/mysql-5.1-bugteam 
into  amd64.(none):/src/bug26243/my51-bug26243
 2008-03-28 16:48:42 -04:00
iggy@amd64.(none)
d0b1e944f5 Merge amd64.(none):/src/mysql-5.0-bugteam 
into  amd64.(none):/src/bug26243/my50-bug26243
 2008-03-28 16:48:02 -04:00
anozdrin/alik@quad.opbmk
814e2613b0 Fix tree: 
1. Use 'dat' extension, because it is handled in Makefile.am;
  2. Fix typo: the bug id is 35469, not 35649.
 2008-03-28 23:39:47 +03:00
iggy@amd64.(none)
b9877b84ac Merge amd64.(none):/src/mysql-5.0-bugteam 
into  amd64.(none):/src/bug26243/my50-bug26243
 2008-03-28 16:01:05 -04:00
gkodinov/kgeorge@magare.gmz
6916284df0 perror.c: 
fixed warning in 5.1-marvel in fix for bug 25177
 2008-03-28 21:59:20 +02:00
gkodinov/kgeorge@magare.gmz
1a72a8a173 Makefile.am: 
added my_handler_errors.h
 2008-03-28 21:11:07 +02:00
iggy@amd64.(none)
01aa4736f7 Merge amd64.(none):/src/mysql-5.1-bugteam 
into  amd64.(none):/src/bug26243/my51-bug26243
 2008-03-28 15:00:35 -04:00
mats@mats-laptop.(none)
e72113d957 Fixes to eliminate compiler warnings. 2008-03-28 19:57:39 +01:00
anozdrin/alik@quad.opbmk
1e9e009e21 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt
 2008-03-28 21:43:23 +03:00
iggy@amd64.(none)
09a2292d3f Merge amd64.(none):/src/bug26243/my50-bug26243 
into  amd64.(none):/src/bug26243/my51-bug26243
 2008-03-28 14:20:21 -04:00
iggy@amd64.(none)
79e434bc67 Bug#26243 mysql command line crash after control-c 
- Backported the 5.1 DBUG to 5.0.
- Avoid memory cleanup race on Windows client for CTRL-C
 2008-03-28 14:02:27 -04:00
mats@mats-laptop.(none)
78a0706a08 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-28 18:58:22 +01:00