Commit graph

9510 commits

Author SHA1 Message Date
wax@mysql.com
f053ce3239 merge 2003-09-04 06:13:21 +06:00
monty@mashka.mysql.fi
08e5b18fa2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-tmp
2003-09-04 02:49:35 +03:00
serg@serg.mylan
be96cc0984 bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY 2003-09-03 22:27:04 +02:00
kostja@oak.local
fbbc9a00af fixed bug - check_user shall not be included into the
embedded library.
2003-09-03 21:52:42 +04:00
serg@serg.mylan
867b4cc18f Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-03 19:41:01 +02:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
monty@narttu.mysql.fi
a6e3ee6bef Better quoting patch for mysqldump 2003-09-03 18:48:10 +03:00
kostja@oak.local
32635549fc Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into oak.local:/home/kostja/mysql/mysql-4.1-root
2003-09-03 19:28:16 +04:00
gerberb@ou800.zenez.com
b64d6a0310 Merge bgerber@bk-internal.mysql.com:/home/bk/mysql-4.0
into ou800.zenez.com:/unixware/home/mount/ou800/zenez3/zenez/bk/blg/mysql-4.0
2003-09-03 09:23:18 -06:00
serg@serg.mylan
2317fa3ba5 C cleanups 2003-09-03 16:31:01 +02:00
gerberb@ou800.zenez.com
7005115e97 Change set for gcc patch on OpenUNIX and UnixWare SCO is the OS vendor. 2003-09-03 08:07:58 -06:00
kostja@oak.local
f1a4f7d037 Monty explanation for net_store_length(uint) put to the comment 2003-09-03 18:07:00 +04:00
serg@serg.mylan
7d2b0a0ce7 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-09-03 15:40:19 +02:00
kostja@oak.local
2335c7a0d4 fixed after-merge bug in CHANG_USER command 2003-09-03 17:29:51 +04:00
kostja@oak.local
711a3f6806 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into oak.local:/home/kostja/mysql/mysql-4.1-root
2003-09-03 16:44:40 +04:00
kostja@oak.local
424a647069 post-merge fixes 2003-09-03 16:43:41 +04:00
bell@sanja.is.com.ua
358a9fafc7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-string_parameters-4.1
2003-09-03 15:36:56 +03:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were
lost.
2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
serg@serg.mylan
3d3f11f832 making InnoDB to return the row exactly the same (bytewise) as it was written to it 2003-09-03 11:37:59 +02:00
serg@serg.mylan
2fcab1c2ee CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] 2003-09-03 11:34:32 +02:00
dlenev@dlenev.mshome
bd49884c19 Added automatically created SSL certificates from mysql-test/std_data
to ignore list.
2003-09-03 12:19:30 +04:00
bell@sanja.is.com.ua
054c6a93bb inserted forgoten ASSERT (BUG#1180) 2003-09-03 10:59:14 +03:00
bell@sanja.is.com.ua
51374e569d fixed BUG#1180 (changing WHERE clause of prepared statements by optimisation) 2003-09-02 19:56:55 +03:00
serg@serg.mylan
04112b9f89 proper obligatory quoting of identifiers in mysqldump<->server communication (unrelated from command-line options) 2003-09-02 18:30:34 +02:00
ram@mysql.r18.ru
5e6d8dd7fe Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column. 2003-09-02 21:09:28 +05:00
vva@eagle.mysql.r18.ru
dc554ab989 fixed bug #1174 2003-09-02 12:09:27 -04:00
serg@serg.mylan
15b650fe72 more sanity checks for compressed files, BUG#770 2003-09-02 16:49:00 +02:00
bell@sanja.is.com.ua
0f456a480e fixed string parameter assugnment (coping instead of asigning pointer to buffer) (BUG#1115)
fixed test_field_misc (UTF variable value)
2003-09-02 14:37:06 +03:00
serg@serg.mylan
48e2d15369 bug #928 - arbitrary table grant was used, sort-order wasn't honored 2003-09-02 11:18:13 +02:00
serg@serg.mylan
c297aa934e s/\t/ / in command-line help text 2003-09-02 08:37:27 +02:00
dlenev@dlenev.mshome
f655ba9866 Updated various tests results which were missed during auto-merge
with replication over SSL patch.
2003-09-01 19:13:19 +04:00
serg@serg.mylan
de627fde80 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-01 14:59:56 +02:00
serg@serg.mylan
b2c83e7f03 workaround for IN's special treatment of first argument. Not for 4.1 2003-09-01 14:18:27 +02:00
dlenev@mysql.com
73ab4be246 Manual merge fixes 2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2 Implemented replication over SSL
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file
2003-09-01 15:16:20 +04:00
lenz@mysql.com
a37142ca92 - added a missing %define in the RPM spec file
(thanks to Haakon Innerdal for spotting this one)
2003-09-01 12:25:39 +02:00
ram@mysql.r18.ru
fe98e58037 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/4.1
2003-09-01 13:06:39 +05:00
Sinisa@sinisa.nasamreza.org
b92567ac4c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-08-30 19:01:58 +03:00
miguel@hegel.local
ffaeee7ef9 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
2003-08-30 12:01:57 -04:00
Sinisa@sinisa.nasamreza.org
b0a8931986 Two small fixes 2003-08-30 18:21:24 +03:00
Sinisa@sinisa.nasamreza.org
8f39fb9ef8 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-08-30 17:14:57 +03:00
Sinisa@sinisa.nasamreza.org
5b38005ce1 Fix for a compilation problem with VC++ 2003-08-30 17:13:10 +03:00
miguel@hegel.local
234208f03e Fix VC++ compiler error with redifinition return type 2003-08-29 22:13:57 -04:00
lenz@mysql.com
735b5ca49d - Fixed BUG 1162 (removed macro names from the changelog)
- Really fixed BUG 998 (disable the checking for installed but
   unpackaged files)
2003-08-29 19:14:42 +02:00
bell@sanja.is.com.ua
0466c25078 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-tmp_field-4.1
2003-08-29 16:27:44 +03:00
bell@sanja.is.com.ua
334841d902 tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of tmp_table_field(TABLE *t_arg) 2003-08-29 16:24:03 +03:00
kostja@oak.local
dc6366035d comment left after merge was moved to correct
place
2003-08-29 17:14:10 +04:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
kostja@oak.local
7a51e36929 removed stale comment
13:58 <monty> konstantin: the comment is missplaced (probably after merge).
          You can remove it
2003-08-29 14:38:39 +04:00