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

47945 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
2e31f40819 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-18 21:48:33 +02:00
joerg@trift2.
0608cafbfb Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-18 21:46:27 +02:00
joerg@trift2.
7e060d76b1 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-18 21:24:54 +02:00
joerg@trift2.
f0d63496b5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-18 21:20:03 +02:00
joerg@trift2.
57853e7dfe Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-18 21:16:09 +02:00
df@pippilotta.erinye.com
09ff8d09d7 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-18 20:30:11 +02:00
df@pippilotta.erinye.com
f52337a6d1 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-18 20:24:47 +02:00
df@pippilotta.erinye.com
03d9ef1f19 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-18 20:23:35 +02:00
joerg@trift2.
4f6b3d107b Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-18 20:22:18 +02:00
df@pippilotta.erinye.com
0ef1abae78 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-18 20:18:58 +02:00
df@pippilotta.erinye.com
dd7185eadd Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-06-18 20:18:32 +02:00
df@pippilotta.erinye.com
1067f08ac9 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
 2007-06-18 20:18:26 +02:00
df@pippilotta.erinye.com
e9387bf5ce Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-18 20:15:27 +02:00
df@pippilotta.erinye.com
94a3e239c5 don't use bk cset in commit e-mails 2007-06-18 20:13:33 +02:00
joerg@trift2.
cf95b9e40e Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-18 19:44:58 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5b22bc3bd5 Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock 
FLUSH LOGS should ignore SET GLOBAL READ_ONLY.
 2007-06-18 22:22:31 +05:00
joerg@trift2.
1d09be3804 Merge trift2.:/MySQL/M41/clone-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-18 19:16:12 +02:00
tomas@whalegate.ndb.mysql.com
55c6e7b142 check for different error message 2007-06-18 17:57:16 +02:00
thek@adventure.(none)
2da91b2316 Bug#28211 RENAME DATABASE and query cache don't play nicely together 
When all table blocks were removed from the query cache the client session
hung in a tight loop waiting on an impossible condition while consuming a lot
of CPU.

This patch also corrects an error which caused valid tables to sometimes be
removed from the query cache.
 2007-06-18 17:46:29 +02:00
pekka@clam.ndb.mysql.com/ndb13.mysql.com
405f6a1681 ndb - bug#29176 missing stack pruning in drop_page 2007-06-18 16:03:41 +02:00
gshchepa/uchum@gleb.loc
9e5ff80218 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-18 18:51:31 +05:00
gshchepa/uchum@gleb.loc
be24ac44cb Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-18 18:48:20 +05:00
gshchepa/uchum@gleb.loc
f015b4332b Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-06-18 18:45:55 +05:00
tomas@whalegate.ndb.mysql.com
7d4467766f correction 2007-06-18 15:41:02 +02:00
tomas@whalegate.ndb.mysql.com
e5565db7c6 Bug #28989 hpux11 ps_row warnings 
- also remove printout for error 4009
 2007-06-18 15:38:37 +02:00
tomas@whalegate.ndb.mysql.com
1c15d3e1a1 fixes Bug #25305 (and several other similar test tailures with the same symptom) 
- make tests wait until ndb connects properly
 2007-06-18 15:36:10 +02:00
gshchepa/uchum@gleb.loc
12c13e7d9e Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-06-18 17:08:56 +05:00
mats@kindahl-laptop.dnsalias.net
07774f97e5 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl
 2007-06-18 12:44:21 +02:00
lars/lthalmann@dl145k.mysql.com
431067573d Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 12:12:27 +02:00
lars/lthalmann@dl145h.mysql.com
a2d93c53db Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 12:10:36 +02:00
lars/lthalmann@dl145j.mysql.com
721c3ea5e5 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-18 12:05:17 +02:00
lars/lthalmann@dl145h.mysql.com
c5c624a752 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-18 12:02:39 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
135a98309c Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-06-18 12:02:03 +02:00
mats@kindahl-laptop.dnsalias.net
5e4137730c Fixes to make team-tree green. 2007-06-18 11:29:32 +02:00
joerg@trift2.
b9cc9dbb03 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-18 11:25:26 +02:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-06-18 09:42:22 +02:00
lars/lthalmann@dl145j.mysql.com
519e26e801 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-06-18 09:33:43 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bac8b8ab47 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-06-18 09:33:05 +02:00
svoj@june.mysql.com
674675a70c Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-06-18 11:49:36 +05:00
svoj@june.mysql.com
621dd1724e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-06-18 11:49:01 +05:00
svoj@june.mysql.com
491e471fb3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-06-18 11:47:47 +05:00
df@pippilotta.erinye.com
7013c96fdf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-18 07:58:51 +02:00
df@pippilotta.erinye.com
7cdb354d26 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-18 07:56:29 +02:00
jonas@perch.ndb.mysql.com
6d6eca5f3e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-06-18 07:49:33 +02:00
jonas@perch.ndb.mysql.com
8308d3781b ndb - bug#29167 
Fix case where all node in node group dies before they saved sysfile (wrt gcp)
  and Qmgr incorrectly thinks that "node group is missing"
 2007-06-18 07:48:59 +02:00
df@pippilotta.erinye.com
f369105aa4 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-18 07:42:13 +02:00
tomas@whalegate.ndb.mysql.com
1bfd45c277 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 22:07:21 +02:00
tomas@whalegate.ndb.mysql.com
795b9de49d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
 2007-06-17 22:06:47 +02:00
tomas@whalegate.ndb.mysql.com
4547957450 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
 2007-06-17 22:06:34 +02:00
tomas@whalegate.ndb.mysql.com
04ea0c3357 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-17 22:05:33 +02:00