msvensson@shellback.(none)
8ce37febef
Fix problem running mysql-test-run.pl when running in a clone not compiled with ndb support
2006-09-08 15:55:11 +02:00
anozdrin/alik@alik.
c9e76d514a
Fix for BUG#22074: mysql-test-run.pl abort test run if it fails
...
to start instance manager.
The problem was that if IM failed to start, test suite aborts.
The fix is to mark current test as failed, and continue running
test suite.
The fix affects only test suite.
2006-09-08 16:41:35 +04:00
anozdrin/alik@alik.
f564e7f8a5
This is another patch for test suite to make IM tests work smoothly.
...
The patch affects only test suite and has the following changes:
1. On starting Instance Manager -- added code for waiting for guarded
mysqld instances to create PID files;
2. Polishing;
3. Move IM-related operations out of mtr_process.pl into new dedicated
for IM file -- mtr_im.pl
2006-09-08 16:19:19 +04:00
mikael/pappa@dator5.(none)
4f122ed95b
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug21210
2006-09-08 06:29:35 -04:00
mikael/pappa@dator5.(none)
5c43cc8641
Merge dator5.(none):/home/pappa/valgrind_test
...
into dator5.(none):/home/pappa/bug21210
2006-09-08 06:28:45 -04:00
gkodinov/kgeorge@macbook.gmz
0f8069bfb0
Bug #21772 : can not name a column 'upgrade' when create a table in version 5.0.24
...
Upgrade was a reserved word. Unreserve UPGRADE so it can be used in unquoted identifiers.
2006-09-08 13:10:14 +03:00
kaa@polly.local
268c7a3522
Bug #20924 : CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
...
- Honor unsigned_flag in the corresponding functions
- Use compare_int_signed_unsigned()/compare_int_unsigned_signed() instead of explicit comparison in GREATEST() and LEAST()
2006-09-08 14:08:29 +04:00
mikael/pappa@dator5.(none)
89af58aa95
Need to set symbolic-links=1 for valgrind builds for the partition test
2006-09-08 05:57:37 -04:00
gkodinov/kgeorge@macbook.gmz
719f836cc4
Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES
...
VALUES() was considered a constant. This caused replacing
(or pre-calculating) it using uninitialized values before the actual
execution takes place.
Mark it as a non-constant (still not dependent of tables) to prevent
the pre-calculation.
2006-09-08 10:24:14 +03:00
mikael/pappa@dator5.(none)
2b3a53e54e
Rearranged test cases, move InnoDB test cases to partition_innodb
2006-09-08 03:18:05 -04:00
andrey@example.com
83f4f3b2aa
fix build
2006-09-08 00:49:37 +02:00
evgen@moonbone.local
31c738d8a2
query_cache.result, func_time.test, type_date.result, func_time.result:
...
Corrected test case after removal of fix for bug#16377
type_date.test:
Corrected test case after removal of fix for bug#16377
item_cmpfunc.cc:
Removed changes to the agg_cmp_type() made in the for bug#16377
2006-09-08 00:59:34 +04:00
istruewing@chilla.local
aeae764e64
Merge chilla.local:/home/mydev/mysql-5.0-bug14400
...
into chilla.local:/home/mydev/mysql-5.1-bug14400
2006-09-07 22:07:52 +02:00
igor@rurik.mysql.com
00a2f232c9
Merge rurik.mysql.com:/home/igor/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21698
2006-09-07 11:10:36 -07:00
igor@rurik.mysql.com
34206c6f80
Fixed bug #21698 : erroneously a field could be replaced by an
...
equal constant under any circumstances.
In fact this substitution can be allowed if the field is
not of a type string or if the field reference serves as
an argument of a comparison predicate.
2006-09-07 11:06:37 -07:00
istruewing@chilla.local
50192889a4
Merge chilla.local:/home/mydev/mysql-4.1-bug14400
...
into chilla.local:/home/mydev/mysql-5.0-bug14400
2006-09-07 18:46:37 +02:00
guilhem@gbichot3.local
87de41ad23
Removing sleeps; rpl_row_basic_8partition falls from 2 minutes
...
15 seconds to less than a second.
The sleeps used to be necessary but not anymore as NDB has been fixed
wrt sync_slave_with_master.
2006-09-07 18:01:42 +02:00
kroki/tomash@moonlight.intranet
7abe938dfa
BUG#20492: Subsequent calls to stored procedure yield incorrect result
...
if join is used
For procedures with selects that use complicated joins with ON expression
re-execution could erroneously ignore this ON expression, giving
incorrect result.
The problem was that optimized ON expression wasn't saved for
re-execution. The solution is to properly save it.
2006-09-07 18:51:00 +04:00
istruewing@chilla.local
45ceab9ec5
Merge chilla.local:/home/mydev/mysql-4.0-bug14400
...
into chilla.local:/home/mydev/mysql-4.1-bug14400
2006-09-07 16:46:20 +02:00
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
rburnett@bk-internal.mysql.com
51bf56c107
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-09-07 04:57:46 +02: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
bar@mysql.com/bar.intranet.mysql.r18.ru
feb41b3a9e
Adding a new test for bug N17939
2006-09-06 10:06:03 +05: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