bell@sanja.is.com.ua
cbb3a78d8d
merge
2003-08-11 12:00:33 +03:00
bell@sanja.is.com.ua
71b39c3020
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-11 11:57:37 +03:00
bell@sanja.is.com.ua
a0fda66f00
merge
2003-08-11 11:51:33 +03:00
monty@mashka.mysql.fi
2fb441fdf7
Remove wrong bug fix when calling create_sort_index.
...
Fix possible replication bug with LOAD DATA ... IGNORE LINES #
2003-08-10 05:14:16 +03:00
igor@rurik.mysql.com
994a1ea337
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-09 12:57:39 -07:00
bell@sanja.is.com.ua
da8ab7dd52
test for BUG#969
2003-08-09 17:10:58 +03:00
bell@sanja.is.com.ua
c66cc864e8
merge
2003-08-09 16:53:23 +03:00
bell@sanja.is.com.ua
87c60ca3d6
fixed union unlocking problem (BUG#906)
2003-08-09 14:39:54 +03:00
bell@sanja.is.com.ua
b41599de1c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merged_qc-4.0
2003-08-09 14:16:13 +03:00
serg@serg.mylan
083acc29bb
BETWEEN bug fix: non-const expressions on both ends
2003-08-09 01:20:02 +02:00
bell@sanja.is.com.ua
ddd3ee8b27
rewritten test using loop (BUG#930)
...
removed unused field (now it is in variables)
2003-08-08 23:27:22 +03:00
serg@serg.mylan
df8b7799cb
between range optimization bug (between with const on one end only)
2003-08-08 19:13:27 +02:00
serg@serg.mylan
f96d57d302
between tests added
...
bugfixes will follow
2003-08-08 18:49:22 +02:00
dlenev@build.mysql.com
38a5d1b70e
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into build.mysql.com:/users/dlenev/mysql-4.0-certs
2003-08-08 15:03:42 +02:00
kostja@oak.local
765053c838
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-08-07 22:19:42 +04:00
monty@mashka.mysql.fi
6e7a509d06
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-07 20:18:51 +03:00
monty@mashka.mysql.fi
8f08c511ee
Review of changesets since last pull.
...
(Mostly code cleanups)
2003-08-07 20:16:37 +03:00
dlenev@build.mysql.com
3f5faaaff9
openssl_1.result, openssl_1.test:
...
Aligned test with regenerated SSL certs
Many files:
Regenerated expired certificates
2003-08-07 15:20:15 +02:00
kostja@oak.local
c23975aace
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
...
into oak.local:/home/kostja/mysql/mysql-4.1
2003-08-07 13:29:25 +04:00
bell@sanja.is.com.ua
de705e53f2
fixed bug in used_tables() report of left expression of IN subquery
...
fixed number of rows of external field reported to optimizer
added check of choosen key (checked left expression tag)
(SCRUM fix for simple IN optimisation)
2003-08-07 11:16:02 +03:00
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
serg@serg.mylan
73bb79dbea
Bug #792 combination of date-interval and between with mixed constant and non-constant
2003-08-06 15:37:22 +02: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
serg@serg.mylan
3396c1a89d
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-05 16:30:22 +02:00
serg@serg.mylan
c0317ce66c
make it clear for optimizer that XOR's are not optimizable at the moment (BUG#992)
2003-08-05 16:29:09 +02:00
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
igor@rurik.mysql.com
f7adcbff7b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2003-08-02 03:27:13 -07:00
igor@rurik.mysql.com
c5da911270
resolving bk problems
2003-08-02 03:26:02 -07:00
igor@rurik.mysql.com
9306f55d8e
Many files:
...
Added key cache assignment
mi_locking.c:
Added key cache assignment: correction
my_sys.h:
Added key cache variable structure
2003-08-02 02:43:18 -07: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
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