Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merged | serg@serg.mylan | 2003-09-03 | 37 | -219/+498 |
|\ | |||||
| * | CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] | serg@serg.mylan | 2003-09-03 | 11 | -28/+138 |
| | | |||||
| * | added support for --libs_r | serg@serg.mylan | 2003-08-22 | 1 | -0/+4 |
| | | |||||
| * | bug #1078. two innodb+delayed crashes | serg@serg.mylan | 2003-08-22 | 3 | -0/+30 |
| | | |||||
| * | use crc32() from bundled zlib if system zlib is unavailable | serg@serg.mylan | 2003-08-21 | 7 | -42/+62 |
| | | |||||
| * | fixed a crash on COMPRESS() and other zlib-dependent functions when compiled ↵ | serg@serg.mylan | 2003-08-21 | 12 | -114/+197 |
| | | | | | | | | | | | | | | | | w/o zlib moved them all from different places to item_strfunc.{h,cc} checksum table command Com_xxx status variables updated | ||||
| * | Merge bk-internal:/home/bk/mysql-4.1/ | serg@serg.mylan | 2003-08-19 | 15 | -17/+158 |
| |\ | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 | ||||
| * \ | Merge bk-internal:/home/bk/mysql-4.1/ | serg@serg.mylan | 2003-08-12 | 22 | -74/+376 |
| |\ \ | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 | ||||
| * \ \ | Merge bk-internal:/home/bk/mysql-4.1/ | serg@serg.mylan | 2003-08-11 | 16 | -84/+118 |
| |\ \ \ | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 | ||||
| | * \ \ | Merge bk-internal:/home/bk/mysql-4.1/ | serg@serg.mylan | 2003-08-09 | 16 | -84/+118 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 | ||||
| | | * | | | table checksum background: | serg@serg.mylan | 2003-08-05 | 15 | -84/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | my_checksum() mysys function NISAM checksum code moved from mysys to isam/ - it's obsolete MyISAM checksum code moved to mysys table's checksum accessible from sql layer SHOW TABLE STATUS shows checksum (WL#646) code cleanup | ||||
| | | * | | | INSTALL-WIN-SOURCE: | serg@serg.mylan | 2003-07-28 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change mode to -rw-rw-r-- | ||||
* | | | | | | Added automatically created SSL certificates from mysql-test/std_data | dlenev@dlenev.mshome | 2003-09-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | to ignore list. | ||||
* | | | | | | Updated various tests results which were missed during auto-merge | dlenev@dlenev.mshome | 2003-09-01 | 6 | -31/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | with replication over SSL patch. | ||||
* | | | | | | Manual merge fixes | dlenev@mysql.com | 2003-09-01 | 43 | -61/+402 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Implemented replication over SSL | dlenev@dlenev.mshome | 2003-09-01 | 43 | -60/+398 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 | ram@mysql.r18.ru | 2003-09-01 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.1 | ||||
| * | | | | | | | Fix for the bug #1125 mysqldump -X creates invalid XML | ram@mysql.r18.ru | 2003-08-28 | 1 | -4/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 | Sinisa@sinisa.nasamreza.org | 2003-08-30 | 2 | -10/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 | ||||
| * | | | | | | | | Two small fixes | Sinisa@sinisa.nasamreza.org | 2003-08-30 | 2 | -10/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 | miguel@hegel.local | 2003-08-30 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | into hegel.local:/home/miguel/bk/mysql-4.1 | ||||
| * | | | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 | Sinisa@sinisa.nasamreza.org | 2003-08-30 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1 | ||||
| | * | | | | | | | | Fix for a compilation problem with VC++ | Sinisa@sinisa.nasamreza.org | 2003-08-30 | 1 | -3/+3 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fix VC++ compiler error with redifinition return type | miguel@hegel.local | 2003-08-29 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 | bell@sanja.is.com.ua | 2003-08-29 | 4 | -24/+13 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-tmp_field-4.1 | ||||
| * | | | | | | | | | tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of ↵ | bell@sanja.is.com.ua | 2003-08-29 | 4 | -24/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tmp_table_field(TABLE *t_arg) | ||||
* | | | | | | | | | | comment left after merge was moved to correct | kostja@oak.local | 2003-08-29 | 1 | -1/+1 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | place | ||||
* | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 | gluh@gluh.mysql.r18.ru | 2003-08-29 | 6 | -4/+57 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix | ||||
| * | | | | | | | | | Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE | gluh@gluh.mysql.r18.ru | 2003-08-28 | 6 | -23/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | | | | Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE | gluh@gluh.mysql.r18.ru | 2003-08-27 | 3 | -0/+37 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fixed problem with absence of gmtime_r under Windows. | dlenev@dlenev.mshome | 2003-08-29 | 1 | -1/+0 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 | bell@sanja.is.com.ua | 2003-08-28 | 3 | -20/+20 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-enum-4.1 | ||||
| * | | | | | | | | | | enum renamed (asked for compilation under windows) | bell@laptop.sanja.is.com.ua | 2003-08-28 | 3 | -20/+20 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | fixed typo | bell@sanja.is.com.ua | 2003-08-28 | 1 | -1/+1 |
| |_|/ / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 | bell@laptop.sanja.is.com.ua | 2003-08-28 | 4 | -10/+10 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 | ||||
| * \ \ \ \ \ \ \ \ \ | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 | hf@deer.(none) | 2003-08-28 | 7 | -1/+203 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.clean | ||||
| * | | | | | | | | | | SCRUM: | hf@deer.(none) | 2003-08-28 | 4 | -10/+10 |
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some mess with STDCALL in function's declarations | ||||
* | | | | | | | | | | Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 | bell@laptop.sanja.is.com.ua | 2003-08-28 | 7 | -1/+203 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1 | ||||
| * | | | | | | | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 | vva@eagle.mysql.r18.ru | 2003-08-28 | 7 | -1/+203 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1 | ||||
| | * | | | | | | | | fixed merge mistake | vva@eagle.mysql.r18.ru | 2003-08-28 | 2 | -3/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge | vva@eagle.mysql.r18.ru | 2003-08-27 | 7 | -1/+206 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 | vva@eagle.mysql.r18.ru | 2003-08-27 | 7 | -0/+202 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1 | ||||
| | | | * | | | | | | | | fixed bug #910 (right type of ifnull function) | vva@eagle.mysql.r18.ru | 2003-08-27 | 7 | -0/+202 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | reset() split in 2 function clear() & add() | bell@laptop.sanja.is.com.ua | 2003-08-28 | 7 | -45/+69 |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aggregate function reinitialization (if no rows was found) made with help of clear() (fixed BUG#860) | ||||
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@narttu.mysql.fi | 2003-08-27 | 10 | -36/+67 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1 | ||||
| * | | | | | | | | | | hanged UDF interface to use clear() instead of reset() | monty@narttu.mysql.fi | 2003-08-27 | 10 | -36/+67 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge fixes | Sinisa@sinisa.nasamreza.org | 2003-08-27 | 1 | -28/+25 |
| | | | | | | | | | | |||||
* | | | | | | | | | | sql_union.cc: | Sinisa@sinisa.nasamreza.org | 2003-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post merge fixes | ||||
* | | | | | | | | | | merge fixes | Sinisa@sinisa.nasamreza.org | 2003-08-27 | 5 | -46/+55 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | symlink.result: | Sinisa@sinisa.nasamreza.org | 2003-08-25 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for a small error in the merge from 4.0 |