mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37684 commits 2789 branches 343 tags 1.7 GiB
Commit graph

37684 commits

This branch
This branch
All branches
Author SHA1 Message Date
guilhem@gbichot3.local
04284f8c10 New way to fix BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE". 
This bug report was two problems:
1) LAST_INSERT_ID() returns a value which does not exist in the table
2) the reporter would want it to return the autoinc id of the updated
row.
1) is a real bug, 2) is a feature request.
In July I implemented 2) in 5.1 (which automatically fixes 1).
This has not yet been documented or released, so is changeable.
Precisely, recently Paul and a user found an easy workaround to give
2), which works in 4.1-5.0-5.1. So I can revert my code for 2),
because it's not needed, that's what I do here;
we forget about 2) (we will document the workaround).
But when I revert my code for 2), 1) comes back. We solve 1) by saying
that if INSERT ON DUPLICATE KEY UPDATE updates a row, it's like a
regular UPDATE: LAST_INSERT_ID() should not be affected (instead of
returning a non-existent value).
So note: no behaviour change compared to the last released 5.1; just
a bugfix for 1).
 2006-09-06 12:50:42 +02:00
serg@janus.mylan
fa98e9c718 converting plugin states to bitmask to simplify testing. 
state_mask argument to plugin_foreach()
 2006-09-06 10:22:59 +02:00
jonas@perch.ndb.mysql.com
e51935b363 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-09-06 02:16:36 +02:00
tnurnberg@salvation.intern.azundris.com
6bc0097f34 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-06 01:36:44 +02:00
serg@janus.mylan
29acac81cf plugin_foreach - don't hold the lock when calling the function 2006-09-05 23:59:16 +02:00
cmiller@zippy.cornsilk.net
ba1bb7bafc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:51:38 -04:00
cmiller@zippy.cornsilk.net
060f3bd0d9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:50:59 -04:00
cmiller@zippy.cornsilk.net
843c55763e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:50:07 -04:00
cmiller@zippy.cornsilk.net
4b7a597439 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:47:56 -04:00
cmiller@zippy.cornsilk.net
d346580f0e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:47:17 -04:00
cmiller@zippy.cornsilk.net
ba3829dc36 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:46:36 -04:00
cmiller@zippy.cornsilk.net
a4d39c753a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:44:08 -04:00
cmiller@zippy.cornsilk.net
02b40b04e6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:28:12 -04:00
cmiller@zippy.cornsilk.net
869be90372 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:27:24 -04:00
cmiller@zippy.cornsilk.net
47982ebae7 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:09:52 -04:00
cmiller@zippy.cornsilk.net
4c1e9c582e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:09:05 -04:00
cmiller@zippy.cornsilk.net
d58cd1de27 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:03:58 -04:00
tnurnberg@salvation.intern.azundris.com
44f3cc636d Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-05 23:03:04 +02:00
tnurnberg@salvation.intern.azundris.com
fbff93ef75 Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-05 22:55:55 +02:00
cmiller@zippy.cornsilk.net
bae80733e5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 16:47:39 -04:00
cmiller@zippy.cornsilk.net
7ca1a49437 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 16:46:55 -04:00
cmiller@zippy.cornsilk.net
954256c324 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 16:46:05 -04:00
cmiller@zippy.cornsilk.net
b023f5d3f5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 16:45:25 -04:00
cmiller@zippy.cornsilk.net
fa13c3213e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 16:38:49 -04:00
cmiller@zippy.cornsilk.net
298917eb5b Fix bad manual merge. 2006-09-05 16:28:31 -04:00
cmiller@zippy.cornsilk.net
e5669a6527 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:53:06 -04:00
cmiller@zippy.cornsilk.net
1b60377484 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:52:06 -04:00
cmiller@zippy.cornsilk.net
114bea4152 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:51:23 -04:00
cmiller@zippy.cornsilk.net
4a62b02de8 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:49:24 -04:00
cmiller@zippy.cornsilk.net
f5e245559b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:46:46 -04:00
cmiller@zippy.cornsilk.net
6691b314ce Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:44:52 -04:00
cmiller@zippy.cornsilk.net
7001078c8f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:44:07 -04:00
cmiller@zippy.cornsilk.net
1802728390 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:43:26 -04:00
cmiller@zippy.cornsilk.net
6dd8667b7b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:42:41 -04:00
cmiller@zippy.cornsilk.net
079b6ee8f8 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:35:50 -04:00
cmiller@zippy.cornsilk.net
469e85e3f2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:35:13 -04:00
cmiller@zippy.cornsilk.net
ddbbc7fd47 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 11:36:34 -04:00
cmiller@zippy.cornsilk.net
085bee2fd4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 11:31:37 -04:00
cmiller@zippy.cornsilk.net
9dd2f452ca Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 11:24:19 -04:00
cmiller@zippy.cornsilk.net
d86961942e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 11:23:41 -04:00
cmiller@zippy.cornsilk.net
5579393c78 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 11:01:50 -04:00
cmiller@zippy.cornsilk.net
5415dcf43b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 10:58:39 -04:00
cmiller@zippy.cornsilk.net
6cb1e2d600 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 10:57:50 -04:00
cmiller@zippy.cornsilk.net
53ecc8ccf4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 10:57:08 -04:00
cmiller@zippy.cornsilk.net
2ba74e7850 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 10:56:32 -04:00
cmiller@zippy.cornsilk.net
43210b7f7a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 10:55:10 -04:00
cmiller@zippy.cornsilk.net
2a90b7670d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 10:53:15 -04:00
cmiller@zippy.cornsilk.net
8e2ca1564a Removed duplicate code from bad merge. 2006-09-05 10:01:52 -04:00
tsmith@maint1.mysql.com
c488e4b928 Applied InnoDB 5.1 snapshot ss787. 
Bugs fixed:
- Bug #20791    valgrind errors in InnoDB
  Remove Valgrind warning of Bug #20791 : in new database
  creation, we read the doublewrite buffer magic number from
  uninitialized memory; the code worked because it was extremely
  unlikely that the memory would contain the magic number
- Bug #21784    DROP TABLE crashes 5.1.12-pre if concurrent
  queries on the table
  remove update_thd() in ::store_lock()


Also includes numerous coding style fixes, etc.  See file-level
comments for details.
 2006-09-05 03:52:15 +02:00
tsmith@maint2.mysql.com
5f5cb7d1f6 Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 
into  maint2.mysql.com:/data/localhome/tsmith/bk/51
 2006-09-04 23:05:17 +02:00