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
gkodinov/kgeorge@macbook.gmz
932d86bbb9
Bug #21809 : Error 1356 while selecting from view with grouping though underlying
...
select OK.
The SQL parser was using Item::name to transfer user defined function attributes
to the user defined function (udf). It was not distinguishing between user defined
function call arguments and stored procedure call arguments. Setting Item::name
was causing Item_ref::print() method to print the argument as quoted identifiers
and caused views that reference aggregate functions as udf call arguments (and
rely on Item::print() for the text of the view to store) to throw an undefined
identifier error.
Overloaded Item_ref::print to print aggregate functions as such when printing
the references to aggregate functions taken out of context by split_sum_func2()
Fixed the parser to properly detect using AS clause in stored procedure arguments
as an error.
Fixed printing the arguments of udf call to print properly the udf attribute.
2006-10-24 15:26:41 +03:00
holyfoot/hf@mysql.com/deer.(none)
48caaf1f5e
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/w3475/my50-w3475
2006-10-24 16:51:53 +05:00
holyfoot/hf@mysql.com/deer.(none)
dc0d680575
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/w3475/my41-w3475
2006-10-24 16:50:27 +05: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
holyfoot/hf@mysql.com/deer.(none)
cd5684543c
Merge mysql.com:/home/hf/work/w3475/my41-w3475
...
into mysql.com:/home/hf/work/w3475/my50-w3475
2006-10-23 16:50:01 +05: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
holyfoot/hf@mysql.com/deer.(none)
4d23559806
WL#3475 (Threads for the embedded server in mysqltest)
...
Necessary code added to mysqltest.c.
Disabled tests are available now.
2006-10-23 15:02:51 +05: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
igor@rurik.mysql.com
2ab34bac4b
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-10-20 12:43:01 -07:00
igor@rurik.mysql.com
a771364196
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-4.1-opt
2006-10-20 10:08:58 -07:00
igor@rurik.mysql.com
c6663c32db
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-10-20 09:26:01 -07: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
igor@rurik.mysql.com
d8b6f46a39
Fixed bug #23478 .
...
If elements a not top-level IN subquery were accessed by an index and
the subquery result set included a NULL value then the quantified
predicate that contained the subquery was evaluated to NULL when
it should return a non-null value.
2006-10-19 23:05:53 -07: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