database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
38,849 Commits 3,270 Branches 1,096 Tags
e52bd4be2bdacb45a71223444860c36faeee0216
Commit Graph

14271 Commits

Author SHA1 Message Date
istruewing@chilla.local
39c0f0a484 Bug#14400 - Query joins wrong rows from table which is subject of 
"concurrent insert"
Additional fix for full keys and test case.
 2006-09-07 15:39:31 +02:00
gluh@mysql.com/gluh.(none)
e2684ad5d7 after merge fix 2006-09-07 18:09:49 +05:00
gluh@mysql.com/gluh.(none)
76b97433c2 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-09-07 15:17:46 +05:00
tnurnberg@mysql.com/salvation.intern.azundris.com
330ae3e29d make partition_mgm test deterministic wrt results of ls 2006-09-07 04:18:17 +02:00
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
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
cmiller@zippy.cornsilk.net
98837a945e Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-09-06 14:44:59 -04: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
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
mats@romeo.(none)
eea3e3d6b1 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b17620-mysql-5.1-new-rpl
 2006-09-06 19:34:02 +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
mats@romeo.(none)
6ba388d17c BUG#17620: Row-based replication fails when query cache enabled on slave 
Invalidating query cache when processing rows for a statement on the slave.
 2006-09-06 17:45:27 +02:00
igor@rurik.mysql.com
b7ded1e34f Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views. 
Select_type in the EXPLAIN output for the query SELECT * FROM t1 was
'SIMPLE', while for the query SELECT * FROM v1, where the view v1
was defined as SELECT * FROM t1, the EXPLAIN output contained 'PRIMARY'
for the select_type column.
 2006-09-06 08:21:43 -07:00
msvensson@neptunus.(none)
41001755f2 Removed unused variable "glob_cygwin_shell" 2006-09-06 15:06:22 +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
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
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
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
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
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
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
298917eb5b Fix bad manual merge. 2006-09-05 16:28:31 -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
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
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
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
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
gkodinov/kgeorge@rakia.(none)
580d4a0df4 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B16792-4.1-opt
 2006-09-05 19:22:55 +03:00
gkodinov/kgeorge@macbook.gmz
7eaa08e092 Merge bug #16792 4.1->5.0 2006-09-05 19:07:55 +03: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
mskold/marty@mysql.com/linux.site
6752861d1b Bug #21056 ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields 2006-09-05 17:07:00 +02:00
guilhem@gbichot3.local
e4d3595b18 Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0". 
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
only NDB wanted that. Users and trainers complained that it affected
InnoDB and was a change compared to 4.1 where only NDB autocommitted.
To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
ha_ndbcluster::external_lock().
The result is that LOAD DATA INFILE commits all uncommitted changes
of NDB if this is an NDB table, its own changes if this is an NDB
table, but does not affect other engines.
Note: even though there is no "commit the full transaction at end"
anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
problems per a comment of Pem).
Note: ha_ndbcluster::has_transactions() does not give reliable results
because it says "yes" even if transactions are disabled in this engine...
 2006-09-05 16:52:05 +02:00
gkodinov/kgeorge@macbook.gmz
91e93eb7d0 Merge macbook.gmz:/Users/kgeorge/mysql/work/B16792-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B16792-5.0-opt
 2006-09-05 17:09:12 +03:00
anozdrin/alik@alik.
6b6ba582e2 Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-tree 
into  alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
 2006-09-05 17:42:59 +04:00
gkodinov/kgeorge@rakia.(none)
68b9ae4d14 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B21392-4.1-opt
 2006-09-05 13:12:30 +03: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
gkodinov/kgeorge@rakia.(none)
d99ac63820 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B21392-5.0-opt
 2006-09-04 19:21:25 +03:00
gkodinov/kgeorge@macbook.gmz
4c1db01833 Merge macbook.gmz:/Users/kgeorge/mysql/work/B21392-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21392-5.0-opt
 2006-09-04 18:45:48 +03:00
gkodinov/kgeorge@macbook.gmz
3758b975f8 Bug #21392: multi-table delete with alias table name fails with 
1003: Incorrect table name
in multi-table DELETE the set of tables to delete from actually 
references then tables in the other list, e.g:
DELETE alias_of_t1 FROM t1 alias_of_t1 WHERE ....
is a valid statement.
So we must turn off table name syntactical validity check for alias_of_t1 
because it's not a table name (even if it looks like one).
In order to do that we add a special flag (TL_OPTION_ALIAS) to 
disable the name checking for the aliases in multi-table DELETE.
 2006-09-04 18:40:30 +03:00