mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53886 commits 2781 branches 343 tags 1.6 GiB
Commit graph

53886 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
e39ef7b013 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-03 15:35:33 +02:00
mleich@five.local.lan
9802854c97 Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-02 21:32:31 +02:00
mleich@five.local.lan
3e8657456a Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-02 21:30:48 +02:00
mleich@five.local.lan
d14e25bf7b Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-02 21:29:43 +02:00
mleich@five.local.lan
cf8e6655ab Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
 2008-04-02 20:24:07 +02:00
mleich@five.local.lan
c01918948c Correct the location of the directory for 
"funcs_1" data load
 2008-04-02 19:47:20 +02:00
mleich@five.local.lan
4f4d10da03 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-02 14:55:35 +02:00
mleich@five.local.lan
a36a3fa266 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-02 14:50:29 +02:00
mleich@five.local.lan
79888f09ad Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-01 23:22:48 +02:00
mleich@five.local.lan
bc3b4a2cf9 Merge five.local.lan:/work/merge/mysql-5.1-Bug 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-01 23:19:37 +02:00
mleich@five.local.lan
4822079f0a Merge five.local.lan:/work/merge/mysql-5.0-Bug 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-01 23:03:23 +02:00
mkindahl@dl145h.mysql.com
013fd23675 Post-merge fixes. 2008-04-01 18:50:35 +02:00
joerg@trift2.
738dc9e040 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-01 15:45:41 +02:00
mleich@five.local.lan
414299f4de Post merge fix for 
ChangeSet@1.2583, 2008-03-31
   Merge five.local.lan:/work/merge/mysql-5.0-Bug
   into  five.local.lan:/work/merge/mysql-5.1-Bug
   Addditional manual fixes will be needed.
   MERGE: 1.1810.3667.16

   Which contains
      ChangeSet@1.1810.3667.16, 2008-03-31
      Fix for Bug
        #35335 funcs_1: Some tests fail within load_file during
                        pushbuild runs
   ...
 2008-04-01 13:18:31 +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
mleich@five.local.lan
6a835464e4 Merge five.local.lan:/work/merge/mysql-5.0-Bug 
into  five.local.lan:/work/merge/mysql-5.1-Bug
Addditional manual fixes will be needed.
 2008-03-31 23:39:51 +02:00
kent/mysqldev@mysql.com/production.mysql.com
bf92d91e1e mysql.spec.sh: 
Made Federated and Cluster optional
 2008-03-31 19:48:54 +02:00
mleich@five.local.lan
89ddc0aa52 Fix for 
Bug#35335 funcs_1: Some tests fail within load_file during
                      pushbuild runs
   Solution: 1. Move files with input data used in load_file, 
                load data etc. 
                from suite/funcs_1/<whatever>
                to std_data
             2. Use for testsuite funcs_1 the server option
                --secure-file-priv=<MYSQLTEST_VARDIR>
             3. Outfiles have to be stored under MYSQLTEST_VARDIR 
+ changes according to WL#4304 Cleanup in funcs_1 tests
  - backport of fixes/improvements made in 5.1 to 5.0
    The differences between scripts in 5.0 and 5.1 cause
    much additional and annoying work during any upmerge.
  - replace error numbers with names
  - improved comments
  - improved formatting
  - Unify storage engine names so that result files for
    storage engine variants do not differ (some tests)
  - remove a script no more used (tests are done in other scripts)
 2008-03-31 19:48:02 +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
kent/mysqldev@mysql.com/production.mysql.com
7cd32aa3ec disabled.def: 
Disabled 'rpl_redirect', failure is sporadic and and the test is superfluous
rpl_packet.test, rpl_packet.result:
  Removing race conditions from rpl_packet causing test to fail
 2008-03-31 19:01:56 +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