mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47927 commits 2794 branches 343 tags 1.5 GiB
Commit graph

47927 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
7766c0d4d9 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-22 13:13:32 +02:00
tsmith@maint1.mysql.com
764a7a911c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-22 11:30:17 +02:00
tsmith@maint1.mysql.com
9f23427499 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-22 11:23:12 +02:00
tsmith@maint1.mysql.com
5b13cc5a30 binlog_innodb.result: 
post-merge fix
 2007-06-22 11:22:29 +02:00
holyfoot/hf@hfmain.(none)
287f3485af Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/28839/my50-28839
 2007-06-22 10:12:15 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
38991f3e80 merging fix 2007-06-22 09:59:23 +05:00
holyfoot/hf@hfmain.(none)
faa251305c Merge mysql.com:/home/hf/work/28839/my50-28839 
into  mysql.com:/home/hf/work/28839/my51-28839
 2007-06-22 09:33:03 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
78c53ea32e rpl_skip_error.test fixed 2007-06-22 09:28:38 +05:00
dkatz@damien-katzs-computer.local
0d84133a4c Merge damien-katzs-computer.local:/Users/dkatz/50_kill 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-06-21 22:08:14 -04:00
dkatz@damien-katzs-computer.local
a393b215fb Bug #29138 'kill' fails in pushbuild 
The reason the "reap;" succeeds unexpectedly is because the query was completing(almost always) and the network buffer was big enough to store the query result (sometimes) on Windows, meaning the response was completely sent before the server thread could be killed.

Therefore we use a much longer running query that doesn't have a chance to fully complete before the reap happens, testing the kill properly.
 2007-06-21 21:39:52 -04:00
tsmith@maint1.mysql.com
8a946f5596 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-22 01:43:57 +02:00
igor@olga.mysql.com
802dcc7a45 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29104
 2007-06-21 15:25:23 -07:00
tsmith@maint1.mysql.com
28242f775c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-21 22:10:40 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
5847f02846 Disabled new test cases that are not 100% stable yet 2007-06-21 22:07:21 +02:00
tsmith@maint1.mysql.com
8ee2c2b04e Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-21 20:55:37 +02:00
tsmith@maint1.mysql.com
1349671c5f Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/41 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-21 20:12:35 +02:00
tsmith@maint1.mysql.com
b8881ebfd4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-21 20:09:04 +02:00
tsmith@maint1.mysql.com
2c0b7d0428 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-rpl 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
 2007-06-21 19:48:05 +02:00
tsmith@maint1.mysql.com
3ae37d30de Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-21 18:58:31 +02:00
iggy@amd64.(none)
08cb616544 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  amd64.(none):/src/bug27029/my51-bug27029
 2007-06-21 12:53:03 -04:00
iggy@amd64.(none)
1378e94aa0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  amd64.(none):/src/bug27029/my50-bug27029
 2007-06-21 12:52:20 -04:00
iggy@amd64.(none)
adcf736687 Merge amd64.(none):/src/bug27029/my50-bug27029 
into  amd64.(none):/src/bug27029/my51-bug27029
 2007-06-21 12:47:55 -04:00
iggy@amd64.(none)
39416f50a5 Bug#27029 alter table ... enable keys crashes mysqld on large table 
- When creating an index for the sort, the number of rows plus 1 is used 
to allocate a buffer.  In this test case, the number of rows 4294967295 
is the max value of an unsigned integer, so when 1 was added to it, a 
buffer of size 0 was allocated causing the crash.
- Create new test suite for this bug's test suite as per QA.
 2007-06-21 12:45:56 -04:00
tsmith@maint1.mysql.com
f1e600a78e Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-21 18:28:52 +02:00
lars/lthalmann@dl145k.mysql.com
6e2ef9a6fa Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-06-21 17:23:13 +02:00
lars/lthalmann@dl145k.mysql.com
5c667b6fa5 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-06-21 17:13:02 +02:00
lars/lthalmann@dl145j.mysql.com
d0e786b8e9 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-06-21 17:10:35 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
c1f2050087 merge rpl 5.0->5.1 2007-06-21 17:09:19 +02:00
lars/lthalmann@dl145k.mysql.com
1fb2aa8205 Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-06-21 17:04:33 +02:00
msvensson@pilot.(none)
8e65f66378 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-21 16:58:22 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
fcd859ac77 Test fix 2007-06-21 16:55:52 +02:00
msvensson@pilot.(none)
840344589e Add name of test that generated the warning to "warnings" file 2007-06-21 16:37:13 +02:00
msvensson@pilot.(none)
9ece930cd4 Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-21 15:19:28 +02:00
msvensson@pilot.(none)
c021fc9a92 Merge pilot.(none):/data/msvensson/mysql/bug28769/my50-bug28769 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-21 15:14:00 +02:00
mats@kindahl-laptop.dnsalias.net
7438faa16b Test case fix to replication team tree. 2007-06-21 14:39:40 +02:00
msvensson@pilot.(none)
896faea0d3 Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-21 14:14:36 +02:00
msvensson@pilot.(none)
f3f1c8c18e Merge pilot.(none):/data/msvensson/mysql/bug28742/my50-bug28742 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-21 14:10:35 +02:00
holyfoot/hf@hfmain.(none)
372c5e23bd Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/28839/my50-28839
 2007-06-21 15:28:19 +05:00
holyfoot/hf@hfmain.(none)
caa38fc80d Merge mysql.com:/home/hf/work/28839/my50-28839 
into  mysql.com:/home/hf/work/28839/my51-28839
 2007-06-21 15:27:12 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
a5b37d95ff rpl_skip_error test fixed 2007-06-21 15:25:28 +05:00
joerg@trift2.
9fc05a5860 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-21 11:09:33 +02:00
joerg@trift2.
2a03eaf8e7 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-21 10:45:54 +02:00
joerg@trift2.
1d696ef869 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-21 10:40:24 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
03d657f60e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b28772/b28772.5.1
 2007-06-21 13:26:17 +05:00
mats@kindahl-laptop.dnsalias.net
e6f7d608e5 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl
 2007-06-21 09:35:47 +02:00
mats@kindahl-laptop.dnsalias.net
201a254788 Fixing result mismatch in rpl_deadlock_innodb result file. 2007-06-21 09:31:19 +02:00
holyfoot/hf@hfmain.(none)
56be687ce8 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28839/my51-28839
 2007-06-21 12:07:52 +05:00
holyfoot/hf@hfmain.(none)
8a6b7f7cca Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/28839/my50-28839
 2007-06-21 12:04:13 +05:00
df@pippilotta.erinye.com
c4b53b218c Steal part of fix for bug#25621 from monty for 5.0.44. 2007-06-21 08:58:39 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
67fcb4c3e2 merging 2007-06-21 11:48:01 +05:00