kroki/tomash@moonlight.intranet
b7b991cec3
BUG#18819: DELETE IGNORE hangs on foreign key parent delete
...
If the error happens during DELETE IGNORE, nothing could be send to the
client, thus leaving it frozen expecting the reply.
The problem was that if some error occurred, it wouldn't be reported to
the client because of IGNORE, but neither success would be reported.
MySQL 4.1 would not freeze the client, but will report
ERROR 1105 (HY000): Unknown error
instead, which is also a bug.
The solution is to report success if we are in DELETE IGNORE and some
non-fatal error has happened.
2006-10-25 19:53:26 +04:00
msvensson@neptunus.(none)
6665d67e3f
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-25 16:51:32 +02:00
msvensson@neptunus.(none)
8f118827c4
Skip innodb test if mysqld doesn't have innodb support
2006-10-25 16:50:06 +02:00
msvensson@neptunus.(none)
e193c7bf87
Test failure when compiled without innodb
...
Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.
2006-10-25 15:41:32 +02:00
msvensson@neptunus.(none)
8ce354f3cf
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-25 14:57:06 +02:00
msvensson@neptunus.(none)
de932f2a5f
Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified
2006-10-25 14:56:36 +02:00
msvensson@neptunus.(none)
86cca50848
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-25 14:39:29 +02:00
msvensson@neptunus.(none)
a6d87b4c00
Add valgrinding support for mysql_client_test
...
Fix two memory leaks in mysql_client_test
2006-10-25 14:34:18 +02:00
msvensson@neptunus.(none)
392c00d49e
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-25 12:41:34 +02:00
msvensson@neptunus.(none)
4969081589
Set flag opt_skip_ndbcluster_slave if no slaves are being used.
...
Add comments
Deperlify
2006-10-25 12:40:33 +02:00
msvensson@neptunus.(none)
9906a10a27
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 23:40:11 +02:00
msvensson@neptunus.(none)
1f780b77e7
Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default
2006-10-24 23:39:46 +02:00
tsmith/tim@siva.hindu.god
3af2089b13
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-24 14:42:08 -06:00
msvensson@neptunus.(none)
e0985bef96
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
ac5b37ef00
Pass --core-file option to mysqld when bootstrapping
2006-10-24 21:02:04 +02:00
msvensson@neptunus.(none)
56d2a6fd3c
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 19:22:48 +02:00
msvensson@neptunus.(none)
844369130f
Remove debug printout
2006-10-24 19:22:27 +02:00
msvensson@neptunus.(none)
a45e6ba7e8
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 18:51:07 +02:00
msvensson@neptunus.(none)
a8d1c62e5f
Run mysql_client_test without --silent
...
Flush both stdout and stderr before abort'ing mysql_client_test
2006-10-24 18:49:19 +02:00
msvensson@neptunus.(none)
d02838deb0
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 18:08:38 +02:00
msvensson@neptunus.(none)
80f4c1056f
Fix spelling errors in test files
2006-10-24 17:54:45 +02:00
msvensson@neptunus.(none)
3df77e48af
Add analyze_testcase_failure which is called when mysqltest has failed
...
with error 1 and we are running with --force
The specific "analyze" code is enclosed in a .test file fwich can easily
be modified to be more advanced
2006-10-24 17:36:46 +02:00
stewart@willster.(none)
a8037f478d
fix result file for ndb_multi
2006-10-25 00:41:55 +10:00
msvensson@neptunus.(none)
ccc33b4e53
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 16:00:42 +02:00
msvensson@neptunus.(none)
e4df2aac07
Avoid matching the trailing carriage return when parsing the mysqld.spec file
...
This fixes problem where --replace_result failed in rpl000015 because the MYSQL_TCP_PORT variable was "3306\r"
2006-10-23 20:36:44 +02:00
msvensson@neptunus.(none)
792adb7ce3
The vardir trick can only bge used on platforms with native symlinks - otherwise opt_vardir need to be set to default value.
2006-10-23 16:51:48 +02:00
andrey@example.com
6237be99d0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug23037/my50
2006-10-23 15:21:23 +02:00
msvensson@neptunus.(none)
6b5ec53962
Don't use the "4.1 vardir trick" on OS that does not have native symlink(i.e windows)
2006-10-23 13:32:20 +02:00
andrey@example.com
389c6a019e
Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table"
...
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
2006-10-23 13:12:30 +02:00
msvensson@neptunus.(none)
cad9d6b106
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-23 12:19:52 +02:00
msvensson@neptunus.(none)
e5c2351b4a
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-23 12:17:15 +02:00
msvensson@neptunus.(none)
43aa130a38
If "var" is a symlink which does not point to anything, remove it before creating real var
2006-10-23 12:16:40 +02:00
msvensson@neptunus.(none)
962fe84784
As both ndb and im are components that may be disabled as well as the binaries may not exist. Look for
...
their binaries in a separate function and produce test casea failures for the test thet needs these components
2006-10-23 12:02:56 +02:00
kostja@bodhi.local
81962878d8
A post-merge fix.
2006-10-23 13:55:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
dd2a1d1e96
Merge mysql.com:/usr/home/ram/work/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
2006-10-23 12:58:20 +05:00
kostja@bodhi.local
0ef2ae34e7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-10-23 11:51:45 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a67472f289
Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-23 12:44:25 +05:00
msvensson@neptunus.(none)
125163c03b
Init some variables that changes between test cases direclty in run_testcase
...
This can not be done in run_testcase_start_servers as embedded never starts a server
Add error if mysqld_start is called in embedded mode
2006-10-20 17:09:07 +02:00
gkodinov@dl145s.mysql.com
a93cc1b70b
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-20 11:02:56 +02:00
gkodinov@dl145s.mysql.com
0612a212d1
Merge bk-internal:/home/bk/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-10-20 10:57:38 +02:00
malff/marcsql@weblab.(none)
ea0998caca
Bug#20028 (Function with select return no data)
...
This patch reverts a change introduced by Bug 6951, which incorrectly
set thd->abort_on_warning for stored procedures.
As per internal discussions about the SQL_MODE=TRADITIONAL,
the correct behavior is to *not* abort on warnings even inside an INSERT/UPDATE
trigger.
Tests for Stored Procedures, Stored Functions, Triggers involving SQL_MODE
have been included or revised, to reflect the intended behavior.
(reposting approved patch, to work around source control issues, no review needed)
2006-10-19 11:39:51 -07:00
msvensson@neptunus.(none)
698e0abd11
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 20:34:28 +02:00
msvensson@neptunus.(none)
c4a570aa00
Adapt to running from "binary dist"
...
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
2006-10-19 20:33:32 +02:00
msvensson@neptunus.(none)
c950eee217
Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set
...
to a value wich is not our default
2006-10-19 20:29:33 +02:00
msvensson@neptunus.(none)
c7710510ac
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 17:15:49 +02:00
svoj@mysql.com/april.(none)
afefa5d42f
After merge fix.
2006-10-19 18:48:37 +05:00
svoj@mysql.com/april.(none)
2d9e457460
Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
2006-10-19 18:04:34 +05:00
gkodinov@dl145s.mysql.com
c77fae407b
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 15:04:12 +02:00
gkodinov@dl145s.mysql.com
892495acaf
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 14:37:49 +02:00
svoj@mysql.com/april.(none)
d2fa9fd192
Merge mysql.com:/home/svoj/devel/mysql/BUG23175/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
2006-10-19 17:35:09 +05:00