kent@mysql.com/kent-amd64.(none)
7f696378fb
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/sotest/mysql-5.0-build
2007-04-05 08:13:39 +02:00
mskold/marty@mysql.com/linux.site
ee034c0e59
Removed compiler warnings
2007-04-05 07:28:09 +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
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
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
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
8cd59587d8
Bug#27344 Total failure to start the server
...
- length($sockdir) >= 80 !!
2007-04-04 19:16:09 +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
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
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
msvensson@pilot.blaudden
bc675fb568
Only check for warnings produced by mysqltest if --check-testcases
2007-04-04 10:59:00 +02: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
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
df@pippilotta.erinye.com
c686576eba
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-04-03 18:59:43 +02:00
df@pippilotta.erinye.com
8c490e2689
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-RPMs
2007-04-03 18:16:42 +02:00
df@pippilotta.erinye.com
6ed21ea834
no Max rpms anymore, but a debug binary
2007-04-03 18:04:24 +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
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
jamppa@bk-internal.mysql.com
cbfd66e754
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
2007-04-03 13:55:20 +02:00
jani@ua141d10.elisa.omakaista.fi
aa2fc5cfd1
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main
2007-04-03 14:25:36 +03:00
anozdrin/alik@ibm.opbmk
5441aefd1d
Fix for BUG#27337: Privileges are not properly restored.
...
The problem was that THD::db_access variable was not restored after
database switch in stored-routine-execution code.
The fix is to restore THD::db_access in this case.
Unfortunately, this fix requires additional changes,
because in prepare_schema_table(), called on the parsing stage, we checked
privileges. That was wrong according to our design, but this flaw haven't
struck so far, because it was masked. All privilege checkings must be
done on the execution stage in order to be compatible with prepared statements
and stored routines. So, this patch also contains patch for
prepare_schema_table(), which moves the checkings to the execution phase.
2007-04-03 15:11:34 +04:00
gni/root@dev3-221.dev.cn.tlan
98e5757618
BUG#18676 when cluster storage engine is down, misleading error message on create table with 4009.
2007-04-03 18:44:29 +08:00
svoj@mysql.com/june.mysql.com
ccbdbe5713
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25729/mysql-5.0-engines
2007-04-03 12:11:51 +05:00
msvensson@pilot.blaudden
39cca0323c
Look for "testname.warnings" file produced by mysqltest, could find
...
problems like misspelled -- commands
2007-04-02 22:58:25 +02:00
iggy@recycle.(none)
5c0d886248
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into recycle.(none):/src/bug23491_ii/my50-bug23491_ii
2007-04-02 16:25:06 -04:00
tomas@whalegate.ndb.mysql.com
33a995712f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-02 22:23:05 +02:00
iggy@recycle.(none)
19a2630641
Minor test cleanup.
2007-04-02 16:21:12 -04:00
kostja@bodhi.local
31a8bfbe2e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-04-02 22:06:15 +04:00
tomas@whalegate.ndb.mysql.com
fb87082d32
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-02 18:28:42 +02:00
tomas@whalegate.ndb.mysql.com
c02efd8f1b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-02 18:22:33 +02:00
tomas@whalegate.ndb.mysql.com
dd6073f5d7
BUG#27560: Memory usage of mysqld grows while doing nothing
...
The query-cache watch thread was continually allocating new thread entries on the
THD MEM_ROOT, not freed until server exit.
Fixed by using a simple array, auto-expanded as necessary.
2007-04-02 18:21:05 +02:00
svoj@mysql.com/june.mysql.com
27d9265c26
BUG#25729 - boolean full text search is confused by NULLs produced by
...
LEFT JOIN
Fixed that in certain situations MATCH ... AGAINST returns false hits
for NULLs produced by LEFT JOIN when there is no fulltext index
available.
2007-04-02 17:26:39 +05:00
df@pippilotta.erinye.com
c2c822a3b4
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-02 14:02:39 +02:00
msvensson@pilot.blaudden
82b454aa28
Bug#21611 Slave can't connect when master-ssl-cipher specified
...
- Change check for return value of 'SSL_CTX_set_cipher_list'
in order to handle 0 as error setting cipher.
- Thanks to Dan Lukes for finding the problem!
2007-04-02 13:12:59 +02:00
gluh@mysql.com/eagle.(none)
54bc9c3d77
Bug#27069 set with identical elements are created
...
added the check for unique elements count in SET
2007-04-02 15:01:19 +05:00
msvensson@pilot.blaudden
697b94a854
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:52:47 +02:00
msvensson@pilot.blaudden
bb9a601829
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:50:39 +02:00
msvensson@pilot.blaudden
252e3f03c7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-02 10:48:11 +02:00
msvensson@pilot.blaudden
cb3091c166
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:42:08 +02:00
msvensson@pilot.blaudden
c731bad918
Cset exclude: tsmith@siva.hindu.god|ChangeSet|20070328212513|13373
2007-04-02 10:39:23 +02:00