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

41738 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
d1a61e1c08 Merge trift2.:/MySQL/M50/upward-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-17 20:47:53 +01:00
kostja@bodhi.local
1480f9f48c Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-17 20:47:50 +03:00
kostja@bodhi.local
15c9d8a6c9 Disable symlinks under valgrind builds (again), with a comment. 2007-01-17 20:46:09 +03:00
kostja@bodhi.local
4399e3244d Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-17 16:03:10 +03:00
kostja@bodhi.local
a9590803fc Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
 2007-01-17 16:00:33 +03:00
kostja@bodhi.local
6399db740e Fix a failure of lowercase_tables2 test on powermacg5, introduced 
by the patch for Bug#4968
 2007-01-17 15:46:30 +03:00
kostja@bodhi.local
feb9098a03 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-17 14:28:10 +03:00
kostja@bodhi.local
175438819a Fix a ps.test failure in 5.0-runtime tree. 2007-01-17 14:24:54 +03:00
joerg@trift2.
88bc918be6 myisam/mi_packrec.c 
Fix a compile error:  Macro "DBUG_ENTER" must not follow an executable statement.
 2007-01-16 20:01:17 +01:00
kostja@bodhi.local
68a4327aac Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-01-16 21:36:47 +03:00
kostja@bodhi.local
76dfe0bc08 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-01-16 21:31:59 +03:00
kostja@bodhi.local
51a2f5153f A fix for the broken 4.1-runtime tree. 2007-01-16 21:23:52 +03: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
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
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
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
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
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
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
malff/marcsql@weblab.(none)
eda8c901f4 Fixed windows build break 2007-01-12 10:33:44 -07: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
malff/marcsql@weblab.(none)
b73101af15 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22687
 2007-01-12 08:11:52 -07: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
gluh@eagle.(none)
90c7557266 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-01-12 15:08:40 +04:00
gluh@eagle.(none)
5c5edbdd82 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-01-12 14:48:59 +04:00
gluh@eagle.(none)
cf41e1ec63 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-01-12 14:47:11 +04:00
tnurnberg@mysql.com/sin.azundris.com
90a8092660 Bug#24660: "enum" field type definition problem 
ENUMs weren't allowed to have character 0xff, a perfectly good
character in some locales.  This was circumvented by mapping 0xff in
ENUMs to ',', thereby prevent actual commas from being used. Now if
0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an
error.

Any solution would have broken some sort of existing behaviour. This
solution should serve both fractions (those with 0xff and those with
',' in their enums), but WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE
WITH 0xff IN THEIR ENUMS. :-/ That is, mysqldump with their current
server, and restore when upgrading to one with this patch.
 2007-01-12 11:06:38 +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