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
47945 commits 2785 branches 343 tags 1.6 GiB
Commit graph

47945 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.(none)
6ac2194492 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-27 17:11:35 +02:00
msvensson@pilot.(none)
e86225b908 Move disabling of rpl_invoked_features to suite/rpl/t/disabled.def 
Move tests to their respective suite
 2007-06-27 16:49:32 +02:00
msvensson@pilot.(none)
2238ef2b62 Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-27 14:29:10 +02:00
msvensson@pilot.(none)
8661497e9b WL#3933 Split main test suite to rpl, rpl_ndb and ndb 
- Update mysql-test-run.pl to collect tests from several suites
 - Group test into suites
 - Add suite.opt file
 2007-06-27 14:28:02 +02:00
tnurnberg@sin.intern.azundris.com
1b235fae9c Merge sin.intern.azundris.com:/home/tnurnberg/24924/50-24924 
into  sin.intern.azundris.com:/home/tnurnberg/24924/51-24924
 2007-06-27 14:05:15 +02:00
tnurnberg@sin.intern.azundris.com
ba63d79e14 Bug#24924: shared-memory-base-name that is too long causes buffer overflow 
show that shm communication still works on windows,
and that we can't overflow the base-name.
 2007-06-27 14:04:29 +02:00
tnurnberg@sin.intern.azundris.com
cbdbf5b75a Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-27 13:24:48 +02:00
tnurnberg@sin.intern.azundris.com
3b9e5093a3 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
windows fixies
 2007-06-27 13:23:58 +02:00
tnurnberg@sin.intern.azundris.com
ec22bd2355 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
Windows fixies
 2007-06-27 13:19:28 +02:00
tnurnberg@sin.intern.azundris.com
e62cf05fb1 Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-27 09:51:11 +02:00
tnurnberg@sin.intern.azundris.com
75386b1dde Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-27 09:48:46 +02:00
tnurnberg@sin.intern.azundris.com
cac7c41398 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
 2007-06-27 09:48:37 +02:00
tnurnberg@sin.intern.azundris.com
1b59c87ea1 Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-27 09:47:00 +02:00
tnurnberg@sin.intern.azundris.com
dadc4c7499 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
windows fixies
 2007-06-27 09:31:47 +02:00
tnurnberg@sin.intern.azundris.com
131db8123f Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
windows fixies
 2007-06-27 09:30:29 +02:00
msvensson@pilot.(none)
76a2a818db Merge pilot.(none):/data/msvensson/mysql/bug18415/my51-bug18415 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-27 09:22:01 +02:00
msvensson@pilot.(none)
b44ccd77bf Merge pilot.(none):/data/msvensson/mysql/bug18415/my50-bug18415 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-27 09:21:05 +02:00
msvensson@pilot.(none)
b2b4f13b7b Merge pilot.(none):/data/msvensson/mysql/bug18415/my50-bug18415 
into  pilot.(none):/data/msvensson/mysql/bug18415/my51-bug18415
 2007-06-27 09:20:25 +02:00
msvensson@pilot.(none)
7f22aaea96 Merge pilot.(none):/data/msvensson/mysql/bug29133/my51-bug29133 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-27 09:15:17 +02:00
msvensson@pilot.(none)
2b748a0de5 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-27 08:27:54 +02:00
msvensson@pilot.(none)
cc8cccc71d Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-27 08:24:35 +02:00
tnurnberg@sin.intern.azundris.com
31e98955a5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b29079/b29079.5.0
---
Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB

fix binlog-writing so that end_log_pos is given correctly even
within transactions for both SHOW BINLOG and SHOW MASTER STATUS,
that is as absolute values (from log start) rather than relative
values (from transaction's start).
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
---
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB

end_log_pos data within a transaction are relative to
the start of the transaction rather than absolute.
we fix those groups in situ before writing the log out.

additional comments and handling for groups with very
large single events, as suggested by Guilhem.
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  amd64.(none):/src/bug24732/my50-bug24732
---
Merge maint1.mysql.com:/data/localhome/tsmith/bk/50
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
---
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
 
end_log_pos data within a transaction are relative to
the start of the transaction rather than absolute.
we fix those groups in situ before writing the log out.
 
additional comments and handling for groups with very
large single events, as suggested by Guilhem.
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-27 08:18:24 +02:00
tnurnberg@sin.intern.azundris.com
c9eb25a248 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
 2007-06-27 04:55:37 +02:00
tsmith@maint1.mysql.com
d3ec46f6f5 Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-27 00:01:44 +02:00
tsmith@maint1.mysql.com
e79d06212e Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-26 23:58:48 +02:00
iggy@amd64.(none)
e0ec1bb646 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  amd64.(none):/src/bug24732/my51-bug24732
 2007-06-26 14:35:53 -04:00
iggy@amd64.(none)
0068a37275 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  amd64.(none):/src/bug24732/my50-bug24732
 2007-06-26 14:35:52 -04:00
iggy@amd64.(none)
7dddab867d Bug#24732 Executables do not include Vista manifests 
- Post Merge Fixup
 2007-06-26 14:24:01 -04:00
iggy@amd64.(none)
2437987a23 Merge amd64.(none):/src/bug24732/my50-bug24732 
into  amd64.(none):/src/bug24732/my51-bug24732
 2007-06-26 11:28:16 -04:00
iggy@amd64.(none)
b1827ecb04 Bug#24732 Executables do not include Vista manifests 
- Corrected manifest attributes.
 2007-06-26 11:26:01 -04:00
msvensson@pilot.(none)
058877e05e Bug #29133 mysqld does not exit during shutdown 
- Fix faulty merge by adding back the 'pthread_kill' call that
 wakes up the select thread
 2007-06-26 14:18:53 +02:00
msvensson@pilot.(none)
c126fe0c8d Merge pilot.(none):/data/msvensson/mysql/bug25657/my50-bug25657-new2 
into  pilot.(none):/data/msvensson/mysql/bug25657/my51-bug25657
 2007-06-26 12:28:45 +02:00
msvensson@pilot.(none)
5c3273f19d Bug#25657 mysql-test-run.pl kill itself under ActiveState perl 
- Various fixes for running mysql-test-run.pl on ActiveState perl
   for windows. Reading it's source in win32/win32.c helps...
 2007-06-26 12:26:21 +02:00
msvensson@pilot.(none)
48f111b115 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/bug25657/my50-bug25657-new2
 2007-06-26 11:11:18 +02:00
tnurnberg@sin.intern.azundris.com
874ccf025d Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
end_log_pos data within a transaction are relative to
the start of the transaction rather than absolute.
we fix those groups in situ before writing the log out.

additional comments and handling for groups with very
large single events, as suggested by Guilhem.
 2007-06-25 18:41:17 +02:00
gshchepa/uchum@gleb.loc
39e900e53e Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-25 18:59:09 +05:00
gshchepa/uchum@gleb.loc
5c7b01dc20 Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-25 18:55:06 +05:00
jbruehe/mysqldev@mysql.com/production.mysql.com
5651ce23d4 Raise version number after cloning 5.1.20-beta 2007-06-25 15:04:31 +02:00
tnurnberg@sin.intern.azundris.com
4ca5aabf98 Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
fix binlog-writing so that end_log_pos is given correctly even
within transactions for both SHOW BINLOG and SHOW MASTER STATUS,
that is as absolute values (from log start) rather than relative
values (from transaction's start).
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-06-25 11:37:10 +02:00
tnurnberg@sin.intern.azundris.com
25af844f6f Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
fix binlog-writing so that end_log_pos is given correctly even
within transactions for both SHOW BINLOG and SHOW MASTER STATUS,
that is as absolute values (from log start) rather than relative
values (from transaction's start).
---
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
 2007-06-25 11:34:23 +02:00
holyfoot/hf@hfmain.(none)
0d7168602d Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/27084/my51-27084
 2007-06-25 14:28:30 +05:00
gshchepa/uchum@gleb.loc
47d868c919 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-25 14:14:29 +05:00
gshchepa/uchum@gleb.loc
f8b7669ee9 Merge gleb.loc:/home/uchum/work/bk/4.1-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-06-25 14:13:16 +05:00
gshchepa/uchum@gleb.loc
4e139ed375 Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-06-25 14:12:01 +05:00
gshchepa/uchum@gleb.loc
9e521d1d04 Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-25 14:10:12 +05:00
gshchepa/uchum@gleb.loc
78e900dd92 Merge gleb.loc:/home/uchum/work/bk/4.1 
into  gleb.loc:/home/uchum/work/bk/4.1-opt
 2007-06-25 14:08:53 +05:00
igor@olga.mysql.com
31bd1715db Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-06-24 19:06:09 -07:00
gshchepa/uchum@gleb.loc
0278fa447c rpl_skip_error.result: 
Merge with 5.1.
 2007-06-25 05:35:45 +05:00
gshchepa/uchum@gleb.loc
a1ebc8590c Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-25 03:40:30 +05:00
igor@olga.mysql.com
da41606087 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25602
 2007-06-24 10:50:24 -07:00