mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42202 commits 2778 branches 343 tags 1.6 GiB
Commit graph

42202 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.local
51a2f5153f A fix for the broken 4.1-runtime tree. 2007-01-16 21:23:52 +03:00
msvensson@neptunus.(none)
61dfec1540 Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-01-16 17:54:55 +01:00
msvensson@neptunus.(none)
77b0123882 Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-16 17:53:45 +01:00
msvensson@neptunus.(none)
c36a5390e4 Update xid's as an effect of not closing the prepared statements all the time 2007-01-16 17:52:17 +01:00
msvensson@neptunus.(none)
701033e7eb Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-01-16 17:51:59 +01:00
msvensson@neptunus.(none)
ae03f5d382 Don't reuse prepared statements if running with reconnect enabled 2007-01-16 17:47:41 +01:00
kostja@bodhi.local
485742fb8b Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-16 17:22:28 +03:00
msvensson@neptunus.(none)
11ddeb693d Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-16 14:13:48 +01:00
msvensson@neptunus.(none)
39b7275037 Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-01-16 13:59:33 +01:00
msvensson@neptunus.(none)
f507bb2cb3 Bug#15518 Reusing a stmt that has failed during prepare does not clear error 
- Always reset error when calling mysql_stmt_prepare a second time
 - Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server.
 - Add test to mysql_client_test
 - Remove mysql_stmt_close in mysqltest after each query
 - Close all open statements in mysqltest if disable_ps_protocol is called.
 2007-01-16 13:39:42 +01:00
kostja@bodhi.local
2209dcdcf4 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-16 15:12:32 +03:00
kostja@bodhi.local
717452fec9 Merge bodhi.local:/opt/local/work/mysql-5.1-root 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-16 14:54:43 +03:00
joerg@trift2.
25c53269ab configure.in : Fix a dependency problem for "extra/" which shows up only in RPM builds. 2007-01-16 12:46:48 +01:00
mats@romeo.(none)
1135806991 Post-merge fixes. 2007-01-16 11:58:48 +01:00
msvensson@neptunus.(none)
08cbe04670 Always use two masters for ndb tests 
Abandon attempt to only use one for some tests that don't use the second master
 2007-01-16 09:47:03 +01:00
msvensson@neptunus.(none)
52a19378d8 Remove wait until not readonly 2007-01-16 09:38:09 +01:00
msvensson@neptunus.(none)
47583ddf3e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-16 09:35:53 +01:00
msvensson@neptunus.(none)
f44d73a58d Always use two masters for ndb tests 2007-01-16 09:35:14 +01:00
dlenev@mockturtle.local
693bc6a233 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
 2007-01-16 07:25:23 +03:00
dlenev@mockturtle.local
33b8690570 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
 2007-01-16 07:19:39 +03:00
malff/marcsql@weblab.(none)
47dff35dd1 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-6298
 2007-01-15 16:24:30 -07:00
kostja@bodhi.local
df18e193a2 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-root
 2007-01-15 23:51:52 +03:00
msvensson@neptunus.(none)
8540eac24a Cset exclude: cmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa|ChangeSet|20070111195403|30218 2007-01-15 21:50:31 +01:00
kostja@bodhi.local
226fa85635 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-15 23:37:38 +03:00
kostja@bodhi.local
26c626487e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-15 23:33:42 +03:00
kostja@bodhi.local
6e16458487 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-15 23:29:02 +03:00
kostja@bodhi.local
d49ac4fbb7 A post-merge fix. 2007-01-15 23:25:16 +03:00
bteam/mysqldev@mysql.com/production.mysql.com
b711c554f5 Raise version number after cloning 5.0.34 2007-01-15 16:57:22 +01:00
iggy@recycle.(none)
db79dd6b73 Merge recycle.(none):/src/bug19424/my50-bug19424 
into  recycle.(none):/src/mysql-5.0-maint
 2007-01-15 10:15:43 -05:00
iggy@recycle.(none)
17b2160087 Merge recycle.(none):/src/bug19424/my51-bug19424 
into  recycle.(none):/src/mysql-5.1-maint
 2007-01-15 10:14:30 -05:00
iggy@recycle.(none)
e3646a119e Merge recycle.(none):/src/bug19424/my50-bug19424 
into  recycle.(none):/src/bug19424/my51-bug19424
 2007-01-15 10:05:33 -05:00
iggy@recycle.(none)
f10a24314d Bug#19424 InnoDB: Possibly a memory overrun of the buffer being freed (Win64) 
- Re-enabling optimization on all except innodb/mem/*.
 2007-01-15 10:00:29 -05:00
joerg@trift2.
17056a63c7 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-15 12:13:11 +01:00
dlenev@mockturtle.local
6d65d12124 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
 2007-01-15 13:57:47 +03:00
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
kostja@bodhi.local
4953297845 Merge bodhi.local:/opt/local/work/mysql-5.0-4968-pull-from-4.1 
into  bodhi.local:/opt/local/work/mysql-5.1-4968-null-merge
 2007-01-15 12:40:43 +03:00
dlenev@mockturtle.local
c0f6023aa4 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
 2007-01-15 12:40:07 +03:00
kent@kent-amd64.(none)
f9ac031dd0 Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
 2007-01-15 10:37:27 +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
kent@kent-amd64.(none)
cccafa22bc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
 2007-01-15 10:29:55 +01:00
aelkin/elkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi
9d007a2773 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkibras-fe36f900-97.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/pushed.bug24998_insert_delayed_many_rows
 2007-01-14 19:19:58 +02:00
aelkin/elkin@dsl-hkibras-fe36f900-97.dhcp.inet.fi
682af9cb3b Bug#24998 rpl_row_delayed_ins.test fails in pushbuild 
forgotten to push changed results
 2007-01-14 19:15:59 +02:00
joerg@trift2.
f5c4d92d82 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/tmp-5.1
 2007-01-14 13:50:16 +01:00
lars/lthalmann@dl145h.mysql.com
77c4b08fd1 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-01-13 15:08:42 +01:00
kostja@bodhi.local
16d53afcd2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-12 22:06:46 +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