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
gluh@gluh.mysql.r18.ru
144d0efaaa
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix
2003-08-29 11:24:33 +05:00
monty@narttu.mysql.fi
5e04e2370f
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-08-29 04:17:58 +03:00
monty@narttu.mysql.fi
27e331c30a
Revert change of lower-case-table handling as this breaks how alias works.
...
Changes like this should be done to 4.1, not to a stable release
2003-08-29 04:17:30 +03:00
dlenev@dlenev.mshome
6cad89775b
Fixed problem with absence of gmtime_r under Windows.
2003-08-29 03:23:18 +04:00
wax@mysql.com
523187296d
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1mm
2003-08-29 02:30:11 +06:00
wax@kishkin.ru
a39f98d637
BUG
...
correct bugs #833 and #836
2003-08-29 02:28:32 +06:00
jcole@mugatu.spaceapes.com
289ffc97e7
Merge jcole@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mugatu.spaceapes.com:/home/jcole/bk/mysql-4.0
2003-08-28 16:06:43 -04:00
jcole@mugatu.spaceapes.com
7a50118793
opt_range.cc: Fixes for out of memory conditions.
2003-08-28 16:06:13 -04:00
monty@narttu.mysql.fi
7d653b2c7c
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-08-28 22:30:11 +03:00
monty@narttu.mysql.fi
a2a1e97226
Portability fixes
2003-08-28 22:18:02 +03:00
jani@rhols221.adsl.netsonic.fi
fc2fe36474
Removed restriction not to be able use non regular files.
2003-08-28 21:27:25 +03:00
bell@sanja.is.com.ua
96cb167d28
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1
2003-08-28 20:38:08 +03:00
bell@sanja.is.com.ua
7a56d62dfb
fixed typo
2003-08-28 18:31:38 +03:00
bell@laptop.sanja.is.com.ua
eccab7f821
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-08-28 17:27:47 +03:00
ram@mysql.r18.ru
3e9c55590a
Fix for the bug #1125 mysqldump -X creates invalid XML
2003-08-28 19:27:46 +05:00
bell@laptop.sanja.is.com.ua
d6761fade4
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1
2003-08-28 17:27:46 +03:00
hf@deer.(none)
84788f7903
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2003-08-28 19:27:46 +05:00
vva@eagle.mysql.r18.ru
63cf4946a7
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
2003-08-28 10:27:45 -04:00
vva@eagle.mysql.r18.ru
79be48410d
fixed merge mistake
2003-08-28 10:26:56 -04:00
gluh@gluh.mysql.r18.ru
e4951147cf
Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
...
This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
Note about COMMIT&ROLLBACK:
Only 'COMMIT' statement updates the binary log.
'ROLLBACK' statement doesn't update the binlog.
2003-08-28 18:09:00 +05:00
serg@serg.mylan
31b337feff
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-28 13:15:55 +02:00
serg@serg.mylan
d09626d9d6
post-merge fixes
2003-08-28 13:14:54 +02:00
serg@serg.mylan
476a0c0fff
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-28 12:39:25 +02:00
serg@serg.mylan
4808a6d9f2
oom protection
2003-08-28 12:37:50 +02:00
bell@laptop.sanja.is.com.ua
ec8d6d05de
enum renamed (asked for compilation under windows)
2003-08-28 13:21:30 +03:00
lenz@mysql.com
ee46c6730b
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0
2003-08-28 11:45:49 +02:00
monty@narttu.mysql.fi
17d8cc22cb
merge with 3.23 to get for overrun in ISAM tables with man fields and a blob.
2003-08-28 12:35:36 +03:00