Commit graph

9142 commits

Author SHA1 Message Date
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
lenz@mysql.com
1b034c7ce3 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-08-06 12:24:50 +02:00
lenz@mysql.com
3d5d56cea9 - try harder to obtain the FQDN with "hostname -f", if possible (BUG#897)
Unfortunately the returned value of "hostname" is inconsistent on
   various platforms - some return the host name only, others return the
   FQDN by default. On Linux, one can use option "-f" to enable the output
   of the FQDN. Use it, if available.
2003-08-06 12:13:08 +02:00
lenz@mysql.com
b8e5f7f119 Some fixes for the RPM spec file:
- Fixed BUG#959 (libmysqld not being compiled properly)
 - Fixed BUG#998 (RPM build errors): added missing files to the
   distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
   mysql_fix_privilege_tables.1), removed "-n" from %install section.
2003-08-06 11:42:48 +02:00
miguel@hegel.local
27fde36d15 Fix an erronous cast for GCC introduced for to fix VC++ compiler error 2003-08-05 22:57:44 -03: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
monty@mashka.mysql.fi
a5cf27b65b Merge 2003-08-05 16:08:36 +03:00
bar@bar.mysql.r18.ru
a60acfcfe0 Old style charset() and set_charset() were removed. 2003-08-05 12:52:37 +05: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
miguel@hegel.local
be123fe5a7 Fix VC++ compiler error 2003-08-04 09:44:26 -03: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
bar@bar.mysql.r18.ru
d75c649b93 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-08-04 12:43:11 +05:00
monty@mashka.mysql.fi
9724a25901 Cleaned up code comment 2003-08-03 16:33:04 +03: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
guilhem@mysql.com
fbe49f0c48 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-08-02 17:24:44 +02:00
guilhem@gbichot2
6b8fd6fc0f There were two wrong calls to tables_ok() in MySQL 4.0 (BUG#980),
which are fixed now.
In 4.1 there are 3 calls; 2 of them will be fixed when there is a merge;
here I fix the 3rd, new one.
2003-08-02 17:23:39 +02:00
guilhem@mysql.com
c784b91578 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-02 16:11:39 +02:00
guilhem@mysql.com
fa1d0098ec Mark tables 'updating' in sql_acl.cc (mysql_grant(), mysql_table_grant()) so that
tables_ok() does not ignore them. This fixes random bug #980.
2003-08-02 16:10:26 +02:00
guilhem@mysql.com
119d3f039d Backporting the changeset below from 4.0, because a customer hits
the bug with 3.23.
ChangeSet@1.1416.113.1, 2003-03-22 15:22:59+01:00, guilhem@mysql.com
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
      Now it does not SEGV, but USER() is still badly replicated
      (it is replicated to ""), which is a lower priority bug.
2003-08-01 22:29:38 +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
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
serg@serg.mylan
f131bd53d4 replace mi_rrnd() in myrg_rkey family to more intelligent (HA_KEYREAD-aware) read function 2003-08-01 14:58:03 +02:00
heikki@hundin.mysql.fi
14f2fc28b6 log0log.c:
Fix assertion failure reported by Alex Kiernan when we compile with the SUN Forte Developer 7 C 5.4 compiler
2003-08-01 12:13:52 +03:00
lenz@mysql.com
3c007c3de9 - portability fixes: put string tests in double quotes (BUG#974).
Thanks to Alex Kiernan for the hint.
2003-08-01 10:21:41 +02:00
lenz@mysql.com
216ca1e15d - fixed BUG#968 ("test: argument expected" error) - thanks to Alex Kiernan
for the patch
2003-08-01 10:09:23 +02: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
44c0ca610e mysqldump.c:
Use the default character set instead of binary. This is to make "mysqlshow" -> "cat'n'paste database name" -> "mysqldump dbname" circle working.
2003-07-31 09:00:22 +05:00
bar@bar.mysql.r18.ru
e8d52f342d cp1251.xml:
Upper/lower case translation bug for letter 't' fix.
2003-07-31 08:33:59 +05:00
serg@serg.mylan
c8c7aab6a0 Bug#937
myisamchk.c:
  help text clarified
mi_check.c:
  allow one to "analyze" empty table :)
2003-07-30 16:15:10 +02:00
bell@sanja.is.com.ua
5c1ce3c1fe 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-07-30 16:52:56 +03:00
dlenev@mysql.com
4e88ee5a08 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bugfix
2003-07-30 16:55:31 +04: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
venu@myvenu.com
015a65a7f7 Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-07-30 02:15:26 -07: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
venu@myvenu.com
45dcca7351 Fix for timestamp issue (BR #819) 2003-07-30 02:01:53 -07:00
dlenev@mysql.com
8f50cd0472 Fix security bug. mysqld server without ssl support was completly
ignorant about ssl_type attribute
2003-07-30 03:33:48 +04:00
heikki@hundin.mysql.fi
d7ea863d6b dict0dict.c:
Fix bug introduced in 4.0.13 and reported by Emic: if a CREATE TABLE ended in a comment, a memory overrun could happen
2003-07-30 01:12:33 +03:00