tomas@whalegate.ndb.mysql.com
292929bc26
Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld
...
- test case workaround to avoid random failures
2007-04-05 09:12:30 +02:00
msvensson@pilot.blaudden
bc5462fb44
Add extra INSERT to make usre sync_slave_with_master has job to do
2007-04-05 09:10:22 +02:00
mskold/marty@mysql.com/linux.site
3e8cf5958b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 08:39:12 +02:00
mskold/marty@mysql.com/linux.site
b3ce01771a
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-05 08:24:03 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
0011750d9b
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 13:42:53 +08:00
mskold/marty@linux.site
2e27f2ce27
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-05 07:34:36 +02:00
mskold/marty@linux.site
c5210c0b59
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-04-05 07:29:38 +02:00
mskold/marty@mysql.com/linux.site
ee034c0e59
Removed compiler warnings
2007-04-05 07:28:09 +02:00
mskold/marty@linux.site
edadf1144c
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-05 06:59:47 +02:00
mskold/marty@linux.site
2e7255aee5
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-04-05 06:52:25 +02:00
mskold/marty@mysql.com/linux.site
84eb172c1a
Fixed compilation error on Windows
2007-04-05 06:49:43 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
10dffc5a19
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 12:26:01 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7da27b5b2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
2007-04-05 11:30:19 +08:00
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
msvensson@pilot.blaudden
87dcce985b
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-04 19:21:39 +02:00
msvensson@pilot.blaudden
3f365383de
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-04 19:20:14 +02:00
msvensson@pilot.blaudden
c159836fdc
Bug#27344 Total failure to start the server
...
- length($sockdir) >= 80 !!
2007-04-04 19:19:26 +02:00
msvensson@pilot.blaudden
6342517e30
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-04 19:18:00 +02:00
msvensson@pilot.blaudden
8cd59587d8
Bug#27344 Total failure to start the server
...
- length($sockdir) >= 80 !!
2007-04-04 19:16:09 +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
msvensson@pilot.blaudden
ff0ee38bd7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-04 15:43:03 +02:00
msvensson@pilot.blaudden
678a358746
Skip test cases if the script or binary they need can't be found
2007-04-04 15:40:40 +02:00
msvensson@pilot.blaudden
3b1fc84a5e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-04 15:17:00 +02:00
msvensson@pilot.blaudden
fc992b0667
Add "skip" function, makeing mysqltest return an
...
error code indicating test should be skipped
2007-04-04 15:15:40 +02:00
msvensson@pilot.blaudden
19801cbfdc
Add expansion of $variables in "let from query",
...
"if with query" and "while with query"
2007-04-04 15:09:12 +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
msvensson@pilot.blaudden
c5eb1f7df9
Bug#25337 Cannot build with OpenSSL support
...
- Cleanup Makefile.am, simplify how we build gen_lex_hash
and mysql_tzinfo_to_sql
2007-04-04 12:42:52 +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
msvensson@pilot.blaudden
f2501d2e56
Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-04 11:22:24 +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