mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
8738 commits 2791 branches 343 tags 1.7 GiB
Commit graph

1944 commits

Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
1d2a7cadae merge 2003-08-06 18:59:26 +03:00
Sinisa@sinisa.nasamreza.org
3c99eb433c sql_union.cc, sql_select.cc: 
Code clean-up
sql_union.cc, union.test, union.result:
  A fix for a bug #978.
  This enables that NULL's can be entered into UNION's result set,
  although first SELECT columns are NOT NULL.
  This is also a start of fixing UNION's properly regarding type
  acceptance.
sql_select.cc:
  A commit for my second July SPRINT task
 2003-08-06 18:48:34 +03:00
kostja@oak.local
a4483aaa1d Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1-count-distinct
 2003-08-06 17:25:01 +04:00
kostja@oak.local
2205e3c4c4 fix for bug #958 and tests for it 
aligned with Sergey notes.
 2003-08-06 16:58:03 +04: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
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
bell@sanja.is.com.ua
c09d28dd1a merge fix 2003-08-01 19:04:35 +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
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
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
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
Sinisa@sinisa.nasamreza.org
1167e170d2 Merge 2003-07-19 18:49:04 +03: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