Commit graph

9079 commits

Author SHA1 Message Date
monty@mashka.mysql.fi
4f7512160b After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
monty@mashka.mysql.fi
1279f9b024 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-08-07 21:19:43 +03:00
greg@gcw.ath.cx
c10d1204bc Add --win-dist parameter to Bootstrap, to run make_win_src_distribution 2003-08-07 14:19:42 -04:00
vva@eagle.mysql.r18.ru
26abb7d368 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2003-08-07 14:19:41 -04:00
vva@eagle.mysql.r18.ru
5ad00d9963 fixed bug with missing '\' in string constant in client/mysqldump.cc 2003-08-07 14:18:43 -04:00
monty@mashka.mysql.fi
d78830457b Fix that -integer works as in 4.0 2003-08-07 20:42:26 +03: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
lenz@mysql.com
d5547ad13b - some fixed for make_win_src_distribution to work properly 2003-08-07 18:54:59 +02:00
serg@serg.mylan
e56383eff2 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-07 16:27:05 +02:00
greg@gcw.ath.cx
cc843a81ae Merge gweir@build.mysql.com:/home/bk/mysql-4.0
into gcw.ath.cx:/home/greg/bk/mysql-4.0
2003-08-07 10:22:07 -04:00
serg@serg.mylan
86e79ec380 merged 2003-08-07 14:39:34 +02:00
serg@serg.mylan
2fd6684928 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mylan:/usr/home/serg/Abk/mysql
2003-08-07 14:33:56 +02:00
serg@serg.mylan
2e190e6292 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-07 13:40:26 +02:00
serg@serg.mylan
7da378f1d1 PRIMARY KEY can erroneously have HA_NULL_PART_KEY flag that breaks correct key sorting 2003-08-07 13:39:53 +02:00
serg@serg.mylan
4235268bef fixed password buffer overflow 2003-08-07 11:16:34 +02:00
greg@gcw.ath.cx
e177eba89b New option for Bootstrap: -w | --win-dist to create Windows source package 2003-08-07 01:14:45 -04:00
greg@gcw.ath.cx
d527253d04 Copied Venu's make_win_src_distribution script from 4.1 tree 2003-08-06 22:57:14 -04: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
96f6e47c22 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-06 16:52:47 +02: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
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
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