mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45243 commits 2781 branches 343 tags 1.6 GiB
Commit graph

45243 commits

This branch
This branch
All branches
Author SHA1 Message Date
Justin.He/justin.he@dev3-240.dev.cn.tlan
fdf57c7ac2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
 2007-04-05 10:47:40 +08:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
849e637127 fix test for bug#25721 
did not run properly on a fast Windows machine
 2007-04-04 21:35:58 +00:00
tomas@whalegate.ndb.mysql.com
881fd5319c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-04-04 23:05:59 +02:00
tomas@whalegate.ndb.mysql.com
343bfb779d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-04-04 23:03:27 +02:00
kostja@vajra.(none)
fe6835c2b9 Fix a failure of this test case on HP-UX. 2007-04-05 00:04:44 +04:00
tsmith@quadxeon.mysql.com
cedde5758d Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
 2007-04-04 21:56:10 +02:00
tsmith@quadxeon.mysql.com
e9fd9a18e0 Bug #27638: slow logging to CSV table inserts bad query_time and lock_time values 
When MySQL logged slow query information to a CSV table, it stored the
query_time and lock_time values with an incorrect formula.

If the time was over 59 seconds, this caused incorrect statistics (either the
slow query was not logged, or the time was far from correct).  This change
fixes the method used to store those TIME values in the slow_log table.
 2007-04-04 21:40:47 +02:00
mskold/marty@linux.site
7baf861b63 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-04-04 21:33:38 +02:00
mskold/marty@linux.site
552d1086ec Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-04-04 17:03:31 +02:00
mskold/marty@mysql.com/linux.site
6c8f5c5859 Merge from 5.0 2007-04-04 16:58:25 +02:00
tomas@whalegate.ndb.mysql.com
6ec3cd9836 set name for ndb tools 2007-04-04 14:46:09 +02:00
gluh@eagle.(none)
18a259076d Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-04-04 17:37:36 +05:00
gluh@mysql.com/eagle.(none)
f8fb7a404b Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 
additional fix(to satisfy Win where CreateFile func does not support the path longer than 260)
 2007-04-04 17:36:58 +05:00
mskold/marty@linux.site
d5d2a1fd10 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-04-04 13:40:37 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
888c2057e9 sync the initialization configuration information between ConfigInfo.cpp and ParamInfo.cpp 2007-04-04 19:30:43 +08:00
mskold/marty@linux.site
7e33b92279 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-04-04 13:21:49 +02:00
mskold/marty@mysql.com/linux.site
625a2629f0 Bug #26242 UPDATE with subquery and triggers failing with cluster tables 
In certain cases AFTER UPDATE/DELETE triggers on NDB tables that referenced
subject table didn't see the results of operation which caused invocation
of those triggers. In other words AFTER trigger invoked as result of update
(or deletion) of particular row saw version of this row before update (or
deletion).

The problem occured because NDB handler in those cases postponed actual
update/delete operations to be able to perform them later as one batch.

This fix solves the problem by disabling this optimization for particular
operation if subject table has AFTER trigger for this operation defined.
To achieve this we introduce two new flags for handler::extra() method:
HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH.
These are called if there exists AFTER DELETE/UPDATE triggers during a
statement that potentially can generate calls to delete_row()/update_row().
This includes multi_delete/multi_update statements as well as insert statements
that do delete/update as part of an ON DUPLICATE statement.
 2007-04-04 12:50:39 +02:00
gkodinov/kgeorge@magare.gmz
204559cd2c Merge magare.gmz:/home/kgeorge/mysql/work/B27513-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
 2007-04-04 13:38:57 +03:00
gkodinov/kgeorge@magare.gmz
b530ae54ee BUG 27513: fixed left-over sql mode from a test case. 2007-04-04 13:38:19 +03:00
tsmith@quadxeon.mysql.com
a95aa68008 Portability fix to work around OS X -x86 toolchain bug with common (uninitialized data) symbols 2007-04-04 11:41:43 +02:00
tsmith@quadxeon.mysql.com
f14c2448c3 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
 2007-04-04 11:38:15 +02:00
holyfoot/hf@hfmain.(none)
cba85dba20 Merge mysql.com:/home/hf/work/27359/my51-27359 
into  mysql.com:/home/hf/work/my_mrg/my51-my_mrg
 2007-04-04 14:20:00 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
e44f0a2a2c merging 2007-04-04 14:19:33 +05:00
tsmith@quadxeon.mysql.com
ab15c0fb94 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/50
 2007-04-04 11:06:48 +02:00
holyfoot/hf@hfmain.(none)
d7352bdd3e Merge mysql.com:/home/hf/work/24633/my51-24633 
into  mysql.com:/home/hf/work/my_mrg/my51-my_mrg
 2007-04-04 14:05:45 +05:00
tsmith@quadxeon.mysql.com
2117193783 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
 2007-04-04 11:05:22 +02:00
holyfoot/hf@hfmain.(none)
f65b42dc6e Merge mysql.com:/home/hf/work/23675/my51-23675 
into  mysql.com:/home/hf/work/my_mrg/my51-my_mrg
 2007-04-04 14:04:05 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
f55ab9ef5e Bug #23675 Partitions: possible security breach via alter 
now we return different error message if user doesn't have
SELECT grants
 2007-04-04 14:01:47 +05:00
gkodinov/kgeorge@magare.gmz
41ac6776f5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27513-5.0-opt
 2007-04-04 11:52:53 +03:00
gni/root@dev3-221.dev.cn.tlan
888fcd6f7e recovery from 5.0 merge for bug18676 2007-04-04 15:22:37 +08:00
gni/root@dev3-221.dev.cn.tlan
99895eb6c3 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug18676 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
 2007-04-04 14:30:12 +08:00
igor@olga.mysql.com
38cf7dee4c Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-04-03 22:24:57 -07:00
igor@olga.mysql.com
0e14d4c7ed Improved coverage for the code added to fix bug 27532. 2007-04-03 19:45:37 -07:00
igor@olga.mysql.com
a87e5ac3d5 Fix after manual merge 2007-04-03 17:09:41 -07:00
igor@olga.mysql.com
6aa599fc31 Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-04-03 16:11:27 -07:00
igor@olga.mysql.com
90aa05d276 Fixed bug #27532: wrong results with ORDER/GROUP BY queries containing 
IN/BETWEEN predicates in sorting expressions.
Wrong results may occur when the select list contains an expression
with IN/BETWEEN predicate that differs from a sorting expression by
an additional NOT only.
 
Added the method Item_func_opt_neg::eq to compare correctly expressions
containing [NOT] IN/BETWEEN.
The eq method inherited from the Item_func returns TRUE when comparing
'a IN (1,2)' with 'a NOT IN (1,2)' that is not, of course, correct.
 2007-04-03 14:32:16 -07:00
Reggie@vm-xp.
66b0e9ca7a Bug #20376 Doesn't auto-detect data dir 
This changeset fixes the problem where mysql, when run as a service,
can't "detect" it's own data directory.
 2007-04-03 15:05:33 -05:00
kostja@bodhi.local
49d0b0caee Fix a race that breaks the valgrind build. 2007-04-03 21:33:56 +04:00
tomas@whalegate.ndb.mysql.com
c4b15b2e68 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-04-03 17:37:10 +02:00
tomas@whalegate.ndb.mysql.com
49d2135c72 Bug#17095 Cluster RBR in circle does not terminate 
- set correct server id
 2007-04-03 17:36:05 +02:00
gkodinov/kgeorge@magare.gmz
2179ee2b06 Bug #27513: test case added to make sure this 
crash bug doesn't reappear.
 2007-04-03 18:00:57 +03:00
gluh@mysql.com/eagle.(none)
8c18c3ea0c Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 
additional fix
 2007-04-03 19:40:55 +05:00
mskold/marty@linux.site
3a70c41512 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-04-03 16:27:23 +02:00
msvensson@pilot.blaudden
b436722bf1 Remove the cleanup of table t1 until problem with lock is fixed 2007-04-03 16:13:23 +02:00
tomas@whalegate.ndb.mysql.com
6e7df50749 Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data 
- insert gap event on cluster connect
 2007-04-03 14:49:57 +02:00
tomas@whalegate.ndb.mysql.com
6db3dbcaca Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data 
- insert gap event on cluster connect
 2007-04-03 14:31:46 +02:00
mskold/marty@mysql.com/linux.site
05216c2aa8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2007-04-03 14:00:38 +02:00
msvensson@pilot.blaudden
3efa2df721 Replace not portable "--system rm" with --remove_file 2007-04-03 13:36:58 +02:00
gluh@mysql.com/eagle.(none)
2d47f0cb1b Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte 2007-04-03 16:13:27 +05:00
tomas@whalegate.ndb.mysql.com
d654c57769 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-04-03 13:03:14 +02:00