mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
9250 commits 2791 branches 343 tags 1.7 GiB
Commit graph

9250 commits

This branch
This branch
All branches
Author SHA1 Message Date
hf@deer.(none)
9807a3fa55 Trimming of embedded library code 2003-09-08 15:08:53 +05:00
hf@deer.(none)
9e83f314c3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2003-09-08 13:13:17 +05:00
hf@deer.(none)
2ba517a3f1 fix for #1210 2003-09-08 13:11:18 +05:00
bell@sanja.is.com.ua
d8361678da Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
 2003-09-07 20:36:21 +03:00
bell@sanja.is.com.ua
a02094ef10 fixed row union processing 2003-09-07 20:35:10 +03:00
hf@deer.(none)
bebe295dfe Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2003-09-06 18:51:39 +05:00
hf@deer.(none)
c7297eba3e Fix for LOAD DATA to work with embedded library 2003-09-06 18:50:30 +05:00
bell@sanja.is.com.ua
b48f64be19 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-06 11:43:52 +03:00
gluh@gluh.mysql.r18.ru
548d7dc948 Fix for bug 1176 2003-09-04 17:12:20 +05:00
wax@kishkin.ru
b34c3934d9 BUG 
correct bug 1085 (a problem with min/max functions)
add tests of bugs 833,836,1085
 2003-09-04 06:44:16 +06:00
wax@mysql.com
f053ce3239 merge 2003-09-04 06:13:21 +06: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
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
serg@serg.mylan
2317fa3ba5 C cleanups 2003-09-03 16:31:01 +02: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
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
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
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
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
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
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
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
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
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