kostja@oak.local
424a647069
post-merge fixes
2003-09-03 16:43:41 +04: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
2fcab1c2ee
CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]
2003-09-03 11:34:32 +02: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
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
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
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
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
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
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
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
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
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
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
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
monty@narttu.mysql.fi
8a77f97079
Add detection of in_addr_t
...
Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update.
(This will probably solve bug #563 )
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support
2003-08-28 06:08:17 +03:00
vva@eagle.mysql.r18.ru
60fc3ae02b
Merge
2003-08-27 21:26:00 -04:00
bell@laptop.sanja.is.com.ua
3d2a3804a1
reset() split in 2 function clear() & add()
...
aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)
2003-08-28 03:10:14 +03:00
vva@eagle.mysql.r18.ru
40757beb81
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
2003-08-27 19:15:27 -04:00
vva@eagle.mysql.r18.ru
cde2b50514
fixed bug #910 (right type of ifnull function)
2003-08-27 19:11:54 -04:00
monty@narttu.mysql.fi
42171225eb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-08-27 22:31:16 +03:00
monty@narttu.mysql.fi
60dd8a2c4f
hanged UDF interface to use clear() instead of reset()
2003-08-27 22:30:50 +03:00
monty@narttu.mysql.fi
c24e0fcc46
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-08-27 22:13:26 +03:00
monty@narttu.mysql.fi
381202354b
Fixed unlikely stack bug when having a BIG expression of type 1+1-1+1-1... in certain combinations. Bug #871
2003-08-27 20:00:18 +03:00
miguel@hegel.local
4fd4580f9d
Updating translation for Spanish/Portuguese error messages files
2003-08-27 12:22:42 -04:00
gluh@gluh.mysql.r18.ru
4c076ea6d7
Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
2003-08-27 18:03:39 +05:00
Sinisa@sinisa.nasamreza.org
375b9aec15
Merge fixes
2003-08-27 15:32:52 +03:00