mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34565 commits 2791 branches 343 tags 1.7 GiB
Commit graph

34565 commits

This branch
This branch
All branches
Author SHA1 Message Date
dlenev@mockturtle.local
af838b4c55 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
 2007-01-15 13:48:07 +03:00
kostja@bodhi.local
8659035f86 Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push 
into  bodhi.local:/opt/local/work/mysql-5.0-4968-to-push
 2007-01-15 13:12:37 +03:00
kostja@bodhi.local
d7a63c0f6a Manual merge. 2007-01-15 13:10:07 +03:00
kostja@bodhi.local
d53072d190 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
 2007-01-15 13:03:21 +03:00
df@kahlann.erinye.com
51936c964a Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2007-01-15 10:43:32 +01:00
dlenev@mockturtle.local
ab98cbc88a Fix for bug#20390 "SELECT FOR UPDATE does not release locks 
of untouched rows in full table scans".

SELECT ... FOR UPDATE/LOCK IN SHARE MODE statements as well as
UPDATE/DELETE statements which were executed using full table
scan were not releasing locks on rows which didn't satisfy
WHERE condition.
This bug surfaced in 5.0 and affected NDB tables. (InnoDB tables
intentionally don't support such unlocking in default mode).

This problem occured because code implementing join didn't call
handler::unlock_row() for rows which didn't satisfy part of condition
attached to this particular table/level of nested loop. So we solve
the problem adding this call.
Note that we already had this call in place in 4.1 but it was lost
(actually not quite correctly placed) when we have introduced nested 
joins.

Also note that additional QA should be requested once this patch is
pushed as interaction between handler::unlock_row() and many recent
MySQL features such as subqueries, unions, views is not tested enough.
 2007-01-15 12:32:38 +03:00
kostja@bodhi.local
7c298786f1 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-12 22:01:53 +03:00
kostja@bodhi.local
5a99ffdf92 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-12 21:59:17 +03:00
joerg@trift2.
ba876c4278 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-12 16:16:17 +01:00
kostja@bodhi.local
a7862496ce Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2007-01-12 18:06:43 +03:00
joerg@trift2.
4ffada35bf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  trift2.:/MySQL/M41/mysql-4.1
 2007-01-12 14:40:28 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c380de50ef Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-01-12 12:22:54 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
22398faa91 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-01-12 12:21:44 +01:00
df@kahlann.erinye.com
9a00ad04db Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2007-01-12 11:24:03 +01:00
gluh@mysql.com/eagle.(none)
6d5cf25d20 Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2007-01-12 13:58:08 +04:00
gluh@mysql.com/eagle.(none)
c081e28ef5 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2007-01-12 13:57:40 +04:00
joerg@trift2.
59e2133e00 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-12 10:17:39 +01:00
mmj@tiger.mmj.dk
86890b8919 mysql_explain_log.sh: 
Patch from Paul DuBois for better help messages
 2007-01-12 01:04:39 +01:00
jonas@perch.ndb.mysql.com
5dac4e99c7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-01-11 21:12:14 +01:00
jonas@perch.ndb.mysql.com
07ac8c853a Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-01-11 21:10:18 +01:00
jonas@perch.ndb.mysql.com
6ca26ea1f4 ndb - bug#25554 
fix bug when master failure during nr
  (recommit against 5.0)
 2007-01-11 20:51:16 +01:00
kostja@bodhi.local
61a4d6e5ed Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-11 22:09:48 +03:00
kostja@bodhi.local
bf1005a125 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-11 21:59:28 +03:00
kostja@bodhi.local
dd03d51f22 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2007-01-11 21:49:52 +03:00
joerg@trift2.
f3025c1122 Merge mysqldev@production.mysql.com:my/mysql-4.0-15815 
into  trift2.:/MySQL/M40/mysql-4.0
 2007-01-11 19:17:27 +01:00
mysqldev@mysql.com/production.mysql.com
eb18787c81 Merge mysqldev@quadxeon:/benchmarks/ext3/TOSAVE/tsmith/bk/g40 
into  mysql.com:/data0/mysqldev/my/mysql-4.0-15815
 2007-01-11 19:04:36 +01:00
gkodinov/kgeorge@rakia.gmz
7eebacadad Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt
 2007-01-11 19:13:04 +02:00
gkodinov/kgeorge@macbook.gmz
15bcf13182 BUG#25106: A USING clause in combination with a VIEW results in column 
aliases ignored
When a column reference to a column in JOIN USING is resolved and a new 
Item is created for this column the user defined name was lost.
This fix preserves the alias by setting the name of the new Item to the
original alias.
 2007-01-11 19:10:01 +02:00
joerg@trift2.
671028a44c Merge trift2.:/MySQL/M40/clone-4.0 
into  trift2.:/MySQL/M40/mysql-4.0
 2007-01-11 17:53:38 +01:00
cmiller@zippy.cornsilk.net
9ff7d182e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-11 09:44:39 -05:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-11 09:43:44 -05:00
thek@kpdesk.mysql.com
36fc42cb10 Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2007-01-11 15:23:34 +01:00
thek@kpdesk.mysql.com
965aa4c74f Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2007-01-11 15:21:06 +01:00
thek@kpdesk.mysql.com
75d91dedac Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2007-01-11 15:16:33 +01:00
thek@kpdesk.mysql.com
55558582ae Merge kpdesk.mysql.com:/home/thek/dev/test23010/my40-bug23010 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint
 2007-01-11 15:14:34 +01:00
thek@kpdesk.mysql.com
1802d5aabb Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2007-01-11 14:11:58 +01:00
thek@kpdesk.mysql.com
f7688d5f10 Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2007-01-11 14:08:12 +01:00
thek@kpdesk.mysql.com
0982a1d9b4 Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2007-01-11 14:04:01 +01:00
df@kahlann.erinye.com
7c71ab62d5 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2007-01-11 13:52:54 +01:00
Kristofer.Pettersson@naruto.
472ff94b4d Merge naruto.:C:/cpp/bug24751/my41-bug24751 
into  naruto.:C:/cpp/mysql-4.1-maint
 2007-01-11 13:13:06 +01:00
Kristofer.Pettersson@naruto.
d9ad0cd0ba Merge naruto.:C:/cpp/bug24751/my50-bug24751 
into  naruto.:C:/cpp/mysql-5.0-maint
 2007-01-11 13:09:13 +01:00
kent@mysql.com/kent-amd64.(none)
e9f9b03263 Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
 2007-01-11 12:43:30 +01:00
kent@mysql.com/kent-amd64.(none)
bd2ec8051d Many files: 
Reverted change for bug#13859, applied smaller patch from Marko
 2007-01-11 12:31:52 +01:00
joerg@trift2.
19b4e4fd75 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-11 11:32:53 +01:00
joerg@trift2.
050a69a794 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-11 11:30:44 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
3ff9dff06a Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/d2/hf/mr10/my50-mr10
 2007-01-11 13:18:49 +04:00
Kristofer.Pettersson@naruto.
3adcf75e1d Merge naruto.:C:/cpp/bug24751/my41-bug24751 
into  naruto.:C:/cpp/bug24751/my50-bug24751
 2007-01-11 09:41:44 +01:00
Kristofer.Pettersson@naruto.
270752654e Bug#24751 - Possible infinit loop in init_io_cache() when insufficient memory 
- When cache memory can't be allocated size is recaclulated using 3/4 of
  the requested memory. This number is rounded up to the nearest 
  min_cache step. 
  However with the previous implementation the new cache size might
  become bigger than requested because of this rounding and thus we get
  an infinit loop.
- This patch fixes this problem by ensuring that the new cache size
  always will be smaller on the second and subsequent iterations until
  we reach min_cache.
 2007-01-11 09:40:17 +01:00
mmj@tiger.mmj.dk
49913f2a95 Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage 
into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
 2007-01-11 09:19:32 +01:00
tsmith@quadxeon.mysql.com
0d7120d9b6 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mysql-4.0-bug15815 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g40
 2007-01-11 01:59:11 +01:00