Commit graph

1922 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
f59cfa6452 merge 2003-08-01 16:51:54 +03:00
bar@bar.mysql.r18.ru
e423faafb4 Database name and national characters fixes. 2003-07-30 17:51:42 +05:00
bar@bar.mysql.r18.ru
f8791c3962 Derivation attribute was not processed correctly
by MAX/MIN in some cases:
SELECT coercibility(max(s1)) from t1;

Subselect collation and derivation was not processed
correctly:

create table a select (select s1 from t1);
select * from t1 where s1 = (select s2 from t1);
2003-07-30 14:15:25 +05:00
bar@bar.mysql.r18.ru
a057f75bc1 Fixed that this sequence didn't produce an error as it should have:
CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german1_ci,
                 s2 CHAR(5) COLLATE latin1_swedish_ci);
SELECT * FROM t1 WHERE s1 = s2;
2003-07-29 17:39:39 +05:00
bar@bar.mysql.r18.ru
c2a7768b56 A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
bell@sanja.is.com.ua
bc1546ce31 count HAVING clause elements with select list elements, because agregate function can be present in it (BUG#922)
removerd unused loop_id
2003-07-29 13:00:32 +03:00
serg@serg.mylan
2fc11f1f45 test results fixed 2003-07-28 16:58:51 +02:00
vva@eagle.mysql.r18.ru
8b52d7b6c4 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1
2003-07-28 10:58:50 -04:00
vva@eagle.mysql.r18.ru
406b8ba21e changed for AUTO_VALUE_ON_ZERO 2003-07-28 10:57:46 -04:00
serg@serg.mylan
e0d9c9cd2b Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-27 09:59:24 +02:00
guilhem@mysql.com
941a65c1ec Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-07-26 23:15:11 +02:00
guilhem@gbichot2
a2b861b277 My changes to test rpl_insert_id in 4.0 about replication of foreign_key_checks
have in fact no effect, because in 4.0 the slave always runs with --skip-innodb.
In 4.1, mysqld accepts option --innodb which can override --skip-innodb.
So I add this option to the test.
When the updated test (using InnoDB tables) from 4.0 will be merged
into 4.1, with this good .opt file, we'll have a meaningful test in 4.1.
Until then, the test in 4.1 will pass but be useless.
And in 4.0, it will stay useless forever.
("it" = the part of the test which tests replication of foreign_key_checks)
2003-07-26 23:14:09 +02:00
paul@teton.kitebird.com
bd8c921172 Print accounts in error messages as 'user'@'host' rather than 'user@host'.
The latter is misleading because differs from the syntax used for GRANT/REVOKE.

Fix up test result affected by error message edits.
2003-07-24 12:43:57 -05:00
guilhem@gbichot2
a97c926eb6 temporary modification of rpl_loaddata.test until 4.0 is merged in 4.1.
This is to avoid a test failure, which is fixed in 4.0 in
ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
by making RESET SLAVE reset the error.
2003-07-23 16:48:45 +02:00
guilhem@mysql.com
29207651af Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-07-23 15:48:52 +02:00
guilhem@gbichot2
9a5ac78f4c On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table
and other replicate-*-table options in SHOW SLAVE STATUS.
Seems like it had not been done, so I push it now:
there's 4 new columns to SHOW SLAVE STATUS.
2003-07-23 15:46:46 +02:00
vva@eagle.mysql.r18.ru
99aa453f37 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1
2003-07-22 19:02:36 -04:00
vva@eagle.mysql.r18.ru
f32299279d fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump) 2003-07-22 18:58:30 -04:00
serg@serg.mylan
2cac8f0768 now GRANT db.* ... compares patterns correctly to prevent privilege escalation 2003-07-22 22:21:23 +02:00
serg@serg.mylan
b0b6d81b5e wild_compare fun: bug in GRANT db_pattern.* ... 2003-07-22 22:00:51 +02:00
venu@hundin.mysql.fi
0440e70a96 undo one row warning instead use sql_warnings=1 2003-07-21 19:37:18 +03:00
venu@myvenu.com
bc7cf30338 Enable warnings by default for single value list inserts also when the client protocol is >= 4.1 2003-07-21 00:13:22 -07:00
serg@serg.mylan
dc5c0784cf Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-21 00:33:13 +02:00
serg@serg.mylan
44f656708b absurd (and syntaxically incorrect) column definition corrected 2003-07-21 00:32:35 +02:00
paul@ice.snake.net
8e6d2a0fc2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2003-07-20 07:01:18 -05:00
paul@ice.snake.net
2ddef9fcf8 Fix test results affected by error message edit. 2003-07-20 07:00:00 -05:00
serg@serg.mylan
3ca302dbac bug #715: SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error 2003-07-20 12:26:18 +02:00
bar@bar.mysql.r18.ru
46813d545d All functions now use the same function to aggregate comparison
and result types
2003-07-18 15:50:40 +05:00
bar@bar.mysql.r18.ru
e6cd54379e IN now aggregates all argument types for comparison 2003-07-18 14:03:54 +05:00
bar@bar.mysql.r18.ru
ccece982fb Some fixes in CASE.
Test suit was extended to conver various arguments mixes.
2003-07-18 12:42:35 +05:00
paul@ice.snake.net
7fb37ad847 Fix openssl_2 test so it passes or fails. (It was being reported
as [skipped], even when run explicitly.)
2003-07-16 23:47:48 -05:00
paul@ice.snake.net
84b9c4e78d Error message consistency edits + updates to affected test results. 2003-07-16 14:37:00 -05:00
paul@ice.snake.net
1f6089d8e2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Users/paul/mysql-4.1
2003-07-16 09:19:14 -05:00
bar@bar.mysql.r18.ru
a35fff5bc3 Item_func_null doesn't have a separate Item for the first argument anymore.
args[0] is used instead. This allowed to resuse a lot of code.
2003-07-16 11:29:16 +05:00
paul@ice.snake.net
cf09817106 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Users/paul/mysql-4.1
2003-07-15 15:06:14 -05:00
paul@teton.kitebird.com
27a82c836c Update openssl_1 test. 2003-07-15 14:37:22 -05:00
paul@ice.snake.net
b0cea06b2e Modifications to error messages, and affected test results. 2003-07-15 11:33:01 -05:00
bar@bar.mysql.r18.ru
91d93f6f61 ELT passes the first argument in args[0] instead of having a separate Item. 2003-07-15 18:11:49 +05:00
bar@bar.mysql.r18.ru
4b9c7f8336 Item_func_field doesn't have a separate Item to store the first argument.
It's now passed as args[0]. This fix allowed to resuse a lot of code.
2003-07-15 17:33:00 +05:00
venu@myvenu.com
74ef77fd4b Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-07-14 07:37:09 -07:00
bar@bar.mysql.r18.ru
e26b90c238 COALESCE now aggregates its argument types in this way:
if some of the arguments is STRING_RESULT the STRING_RESULT
else if some of the arguments is REAL_RESULT then REAL_RESULT
else INT_RESULT
2003-07-14 19:28:36 +05:00
bar@bar.mysql.r18.ru
1472b156e2 A test for character conversion in ALTER TABLE was added 2003-07-14 18:00:27 +05:00
venu@myvenu.com
f4518cdc31 Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-07-13 09:53:31 -07:00
guilhem@gbichot2
3110561e5d Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
For the second and third one I guess this will disappear after merging 4.0.
2003-07-12 23:31:21 +02:00
venu@myvenu.com
fe7dc23f97 Merge 2003-07-11 18:56:39 -07:00
venu@myvenu.com
7d094db001 Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM #872) 2003-07-11 18:55:03 -07:00
lenz@kallisto.local
92b3a231d4 - Updated error message tests in several results of the test suite after
the server error messages had been modified in errmsg.txt
2003-07-10 10:02:57 +02:00
monty@mashka.mysql.fi
8b54bff34c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-07-08 23:48:04 +03:00
gluh@gluh.mysql.r18.ru
5709ed20ab SAPDB date/time finctions 2003-07-08 15:06:05 +05:00
gluh@gluh.mysql.r18.ru
e6eef74812 Merge gluh@gw:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
2003-07-08 12:57:00 +05:00