mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 01:34:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38032 commits 2785 branches 343 tags 1.7 GiB
Commit graph

38032 commits

This branch
This branch
All branches
Author SHA1 Message Date
tnurnberg@salvation.intern.azundris.com
c9645e9c6d Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-07 02:58:47 +02:00
tsmith@maint1.mysql.com
84bf16ec40 Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/51
 2006-09-07 01:56:49 +02:00
tsmith@maint1.mysql.com
330fb6a3be Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/50
 2006-09-07 01:20:03 +02:00
tsmith@maint1.mysql.com
8991a269f1 Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx
 2006-09-07 01:07:24 +02:00
tsmith@maint1.mysql.com
b5f67a642f Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
 2006-09-07 00:59:08 +02:00
tsmith@maint1.mysql.com
2480ec8e3e Force conflict to avoid bk automerge behavior; will be undone during merge. 2006-09-07 00:54:48 +02:00
jimw@rama.(none)
75fdb8fa6a Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-09-06 15:41:16 -07:00
tsmith@maint1.mysql.com
b6cd727ed1 Bug #21054: myisam_stats_method ignored in my.cnf and cmdline 
Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up
 2006-09-07 00:11:43 +02:00
tsmith@maint1.mysql.com
f4265f7a57 Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1) 2006-09-07 00:01:00 +02:00
cmiller@zippy.cornsilk.net
461afda9bb Fix build problem for when not compiled with debugging. 2006-09-06 17:10:58 -04:00
jimw@rama.(none)
d77d51a39f Merge rama.(none):/home/jimw/my/mysql-5.1-19874 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-09-06 12:58:48 -07:00
tnurnberg@salvation.intern.azundris.com
c4b3f9bae9 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 20:32:23 +02:00
cmiller@zippy.cornsilk.net
14eaca47d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-06 14:28:53 -04:00
cmiller@zippy.cornsilk.net
8fdffd1b75 Fix merge problems; work around disparate "ls" behaviors. 2006-09-06 14:23:39 -04:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
03f2add932 Updated test case due to pb test failure on sol10-sparc-a' -max 2006-09-06 19:42:01 +02:00
rburnett@production.mysql.com
926d98d973 Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1
 2006-09-06 18:27:26 +02:00
brian@zim.(none)
1ac47c9513 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/tmp/merge-5.1
 2006-09-06 09:23:47 -07:00
bteam/mysqldev@mysql.com/production.mysql.com
bd7fefcb78 Raise version number 2006-09-06 17:56:59 +02:00
guilhem@gbichot3.local
21c915a003 mi_test_all.sh needs "./" before the executable names otherwise they 
are not found
 2006-09-06 15:05:19 +02:00
jmiller/ndbdev@ndb08.mysql.com
8f0a7e4ebf Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/data2/mysql-5.1-new-ndb
 2006-09-06 14:58:28 +02:00
ahristov@bk-internal.mysql.com
75eeececb1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
 2006-09-06 14:35:27 +02:00
guilhem@gbichot3.local
8f2ad430e2 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  gbichot3.local:/home/mysql_src/mysql-5.1-2
 2006-09-06 12:52:59 +02:00
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
mskold/marty@linux.site
b921b1288e Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-06 11:55:16 +02:00
mskold/marty@mysql.com/linux.site
70b19dd1c0 Bug #21056 ndb pushdown equal/setValue error on datetime: Added missing order by 2006-09-06 11:54:01 +02:00
mskold/marty@linux.site
d33411e558 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-06 11:21:49 +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
pekka@orca.ndb.mysql.com
bf24f687e8 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-09-06 10:21:11 +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
jonas@perch.ndb.mysql.com
3a80cee4b2 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-09-06 02:14:50 +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