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
42332 commits 2793 branches 343 tags 1.5 GiB
Commit graph

12692 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
 2007-01-27 03:46:45 +02:00
monty@narttu.mysql.fi
c022454e7c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-01-24 19:53:51 +02:00
tomas@poseidon.mysql.com
a9193743a2 correct manual merge 2007-01-23 09:52:13 +07:00
tomas@poseidon.mysql.com
cd5f9b2f3e Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-01-23 07:25:24 +07:00
monty@mysql.com/narttu.mysql.fi
243a3a06e9 Change to new (after merge) error numbers 2007-01-23 01:58:07 +02:00
jonas@perch.ndb.mysql.com
6fae8d4133 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-01-22 22:25:56 +01:00
tomas@poseidon.mysql.com
9605aee4fe bug#25746 ndb: 4209 error with 2 VARCHAR primary keys 
- make sure keys are copied correctly when varchar has 2 length bytes
- test case
 2007-01-23 00:34:00 +07:00
monty@narttu.mysql.fi
7df1dbcd74 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-01-22 19:18:22 +02:00
monty@mysql.com/narttu.mysql.fi
2dcc7110c9 Give warnings for unused objects 
Changed error message to be compatible with old error file
Added new error message for new DUP_ENTRY syntax
 2007-01-22 18:42:52 +02:00
monty@mysql.com/narttu.mysql.fi
807526ff79 Fixed compiler warnings 
Fixed wrong merge that disabled 'make test'
Renamed all suppress files to end in '.supp'
Don't give "skipped %d bytes from file" warnings in 5.0
 2007-01-22 15:52:15 +02:00
monty@mysql.com/narttu.mysql.fi
a3d3c85224 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  mysql.com:/home/my/mysql-5.0
 2007-01-22 14:10:46 +02:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-01-22 14:04:40 +02:00
baker@bk-internal.mysql.com
42345b83c3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-21 02:21:23 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ad42530481 after merge fix. 2007-01-19 12:15:44 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
86322e269f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
 2007-01-19 08:56:03 +04:00
ramil/ram@myoffice.izhnet.ru
1b488c7fbe Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
 2007-01-19 08:54:10 +04:00
tsmith@siva.hindu.god
f4354a87d7 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 13:27:51 -07:00
tsmith@siva.hindu.god
f135f34ebc Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
 2007-01-18 13:26:48 -07:00
tsmith@siva.hindu.god
f5aab8b213 ndb_types.test: sleep a bit longer, to ensure that timestamp > @now 2007-01-18 13:26:26 -07:00
tsmith@siva.hindu.god
6b729ff2cd Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
244b2004ee Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
 2007-01-18 10:06:36 -07:00
tsmith@siva.hindu.god
6fd02a439f Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
 2007-01-18 09:53:30 -07:00
tsmith@siva.hindu.god
cc7afe2494 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
 2007-01-18 08:30:35 -07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
6eba677517 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
 2007-01-18 17:10:00 +04:00
ramil/ram@myoffice.izhnet.ru
3760672ead Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
 2007-01-18 16:40:49 +04:00
ramil/ram@myoffice.izhnet.ru
9d86d7e97b Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533 
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
 2007-01-18 15:59:40 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c57442d6d8 after merge fix. 2007-01-18 15:28:45 +04:00
ramil/ram@myoffice.izhnet.ru
a2303ea3fe Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533 
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
 2007-01-18 11:13:13 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5c42e68388 after merge fix. 2007-01-18 10:51:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
e8968822dc Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533 
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
 2007-01-18 09:39:47 +04:00
cmiller@zippy.cornsilk.net
f2d4988c37 errmsg change 2007-01-17 18:15:35 -05:00
lars/lthalmann@dl145j.mysql.com
5810ca92c9 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-01-17 19:32:14 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
b25079d61a Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-01-17 19:30:05 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bbaf32754f Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
 2007-01-17 19:28:55 +01:00
baker@bk-internal.mysql.com
7acead9c68 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-17 17:11:53 +01:00
kostja@bodhi.local
175438819a Fix a ps.test failure in 5.0-runtime tree. 2007-01-17 14:24:54 +03:00
msvensson@pilot.mysql.com
51292deb36 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-17 11:53:00 +01:00
msvensson@pilot.mysql.com
8154355a07 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
 2007-01-17 11:13:03 +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
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
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
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
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
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
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