Commit graph

1806 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
1119ec0e6f Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-08-05 09:58:00 +03:00
bell@sanja.is.com.ua
659650b4ea merge 2003-08-05 09:56:21 +03:00
bar@bar.mysql.r18.ru
708ddc3a3b Fix:
CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci);
INSERT INTO t1 VALUES ('Ü');
SELECT FIELD('ue',s1) FROM t1;
The above returned 0 in error.
Now 1 is returned.
2003-08-05 11:26:31 +05:00
bar@bar.mysql.r18.ru
85c7a8198a Fix:
CREATE TABLE t1 (s1 CHAR(5) CHARACTER SET latin1 COLLATE latin1_german2_ci);
INSERT INTO t1 VALUES ('Ü');
INSERT INTO t1 VALUES ('ue');
SELECT DISTINCT s1 FROM t1;

The above returned two rows in error.
Now it returns one row, in latin1_german2_ci:  Ü == ue
2003-08-05 11:03:05 +05:00
bar@bar.mysql.r18.ru
544f96f0fe fix_fields recoursion didn't stop when some level's fix_length_and_dec
produced an error. This led to server crash in some cases, e.g.:
create table t7 (s1 char);
select * from t7
where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci)
= 'AA';
2003-08-05 10:08:16 +05:00
guilhem@mysql.com
bb12d905cb 2 bugfixes:
- Bug #985: "Between RESET SLAVE and START SLAVE, SHOW SLAVE STATUS is wrong."
Now RESET SLAVE puts correct info in mi->host etc. A new test rpl_reset_slave
for that.
- Bug #986: "CHANGE MASTER & START SLAVE do not reset error columns in SHOW
SLAVE STATUS". Now these reset the errors.
2003-08-04 10:59:44 +02:00
guilhem@mysql.com
41865cf3a6 Fix so that SET PASSWORD is not replicated by the slave if running with
replicate-*-table rules which exclude 'mysql' tables
(e.g. replicate-wild-ignore-table=mysql.%).
This was already the behaviour for GRANT/REVOKE, I'm extending it to
SET PASSWORD because it seems very logical (the contrary seems illogical).
2 new tests:
- one to test if GRANT and SET PASSWORD are replicated
- one to test if they are not replicated if replicate-wild-ignore-table=mysql.%
The 2nd is also a testcase for BUG#980.
2003-08-02 23:46:26 +02:00
bell@sanja.is.com.ua
9c58e2a5c7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-unknown_table-4.1
2003-08-01 19:06:03 +03:00
konstantin@mysql.com
4dc963f6d6 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-08-01 19:44:27 +04:00
bell@sanja.is.com.ua
8d0647c6ac merge 2003-08-01 18:24:27 +03:00
kostja@oak.local
f54d9df31b added disable_query_log to fulltext2.test 2003-08-01 18:49:30 +04:00
bell@sanja.is.com.ua
42283d2255 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_ci-4.1
2003-08-01 17:32:05 +03:00
bell@sanja.is.com.ua
f59cfa6452 merge 2003-08-01 16:51:54 +03:00
serg@serg.mylan
5ac7f31b57 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-01 14:58:57 +02:00
kostja@oak.local
50d3291aee manual merge 2003-07-31 17:11:52 +04:00
serg@serg.mylan
fb5a1da621 bug #942. docid == ftb->lastpos in join on looping over nested table 2003-07-31 13:45:35 +02:00
bar@bar.mysql.r18.ru
e423faafb4 Database name and national characters fixes. 2003-07-30 17:51:42 +05:00
bell@sanja.is.com.ua
86e6cf399e support of more then 255 tables dependence in query cache (fixed BUG#930) 2003-07-30 14:59:56 +03: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
bell@sanja.is.com.ua
2b2b8cd889 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-07-29 20:27:36 +03:00
bell@sanja.is.com.ua
62eaaf22f3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
2003-07-29 20:26:14 +03:00
bell@sanja.is.com.ua
6dea500fb2 prevented finding references in item_list for non-SELECT st_select_lex
(fixed BUG#943)
2003-07-29 16:59:46 +03: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
bell@sanja.is.com.ua
376f026550 tabe & query hashes made case insensitive (BUG#933) 2003-07-28 18:28:44 +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
34352d0c21 Make rpl_insert_id.test use InnoDB, and added foreign keys to the table,
so that it really tests replication of SET FOREIGN_KEY_CHECKS (previously
it used MyISAM).
2003-07-26 17:59:05 +02:00
serg@serg.mylan
4e22494ebf outer join, impossible on condition, where, and usable key for range
bug#926
2003-07-25 14:32:03 +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
Sinisa@sinisa.nasamreza.org
e08a00bd02 Fuller implementation of lower case table names.
Bug record #828
2003-07-23 17:36:56 +03: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
bell@sanja.is.com.ua
695c71d1c1 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-07-22 11:20:02 +03:00
bell@sanja.is.com.ua
af41a59af7 merge 2003-07-22 11:18:51 +03: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