summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* mergedserg@serg.mylan2003-09-0337-219/+498
|\
| * CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ]serg@serg.mylan2003-09-0311-28/+138
| |
| * added support for --libs_rserg@serg.mylan2003-08-221-0/+4
| |
| * bug #1078. two innodb+delayed crashesserg@serg.mylan2003-08-223-0/+30
| |
| * use crc32() from bundled zlib if system zlib is unavailableserg@serg.mylan2003-08-217-42/+62
| |
| * fixed a crash on COMPRESS() and other zlib-dependent functions when compiled ↵serg@serg.mylan2003-08-2112-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.mylan2003-08-1915-17/+158
| |\ | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * \ Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2003-08-1222-74/+376
| |\ \ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * \ \ Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2003-08-1116-84/+118
| |\ \ \ | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * \ \ Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2003-08-0916-84/+118
| | |\ \ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | | * | | table checksum background:serg@serg.mylan2003-08-0515-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.mylan2003-07-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change mode to -rw-rw-r--
* | | | | | Added automatically created SSL certificates from mysql-test/std_data dlenev@dlenev.mshome2003-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | to ignore list.
* | | | | | Updated various tests results which were missed during auto-merge dlenev@dlenev.mshome2003-09-016-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | with replication over SSL patch.
* | | | | | Manual merge fixesdlenev@mysql.com2003-09-0143-61/+402
|\ \ \ \ \ \
| * | | | | | Implemented replication over SSLdlenev@dlenev.mshome2003-09-0143-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.1ram@mysql.r18.ru2003-09-011-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.r18.ru:/usr/home/ram/work/4.1
| * | | | | | | Fix for the bug #1125 mysqldump -X creates invalid XMLram@mysql.r18.ru2003-08-281-4/+4
| | | | | | | |
* | | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2003-08-302-10/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| * | | | | | | | Two small fixesSinisa@sinisa.nasamreza.org2003-08-302-10/+2
| | | | | | | | |
* | | | | | | | | Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1miguel@hegel.local2003-08-301-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | into hegel.local:/home/miguel/bk/mysql-4.1
| * | | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1Sinisa@sinisa.nasamreza.org2003-08-301-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| | * | | | | | | | Fix for a compilation problem with VC++Sinisa@sinisa.nasamreza.org2003-08-301-3/+3
| | | | | | | | | |
* | | | | | | | | | Fix VC++ compiler error with redifinition return typemiguel@hegel.local2003-08-291-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-08-294-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.ua2003-08-294-24/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tmp_table_field(TABLE *t_arg)
* | | | | | | | | | comment left after merge was moved to correctkostja@oak.local2003-08-291-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | place
* | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2003-08-296-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 TABLEgluh@gluh.mysql.r18.ru2003-08-286-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 TABLEgluh@gluh.mysql.r18.ru2003-08-273-0/+37
| | | | | | | | | |
* | | | | | | | | | Fixed problem with absence of gmtime_r under Windows.dlenev@dlenev.mshome2003-08-291-1/+0
| | | | | | | | | |
* | | | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-08-283-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.ua2003-08-283-20/+20
| | | | | | | | | | |
* | | | | | | | | | | fixed typobell@sanja.is.com.ua2003-08-281-1/+1
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1bell@laptop.sanja.is.com.ua2003-08-284-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.1hf@deer.(none)2003-08-287-1/+203
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.clean
| * | | | | | | | | | SCRUM:hf@deer.(none)2003-08-284-10/+10
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some mess with STDCALL in function's declarations
* | | | | | | | | | Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@laptop.sanja.is.com.ua2003-08-287-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.1vva@eagle.mysql.r18.ru2003-08-287-1/+203
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
| | * | | | | | | | fixed merge mistake vva@eagle.mysql.r18.ru2003-08-282-3/+0
| | | | | | | | | |
| | * | | | | | | | Mergevva@eagle.mysql.r18.ru2003-08-277-1/+206
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1vva@eagle.mysql.r18.ru2003-08-277-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.ru2003-08-277-0/+202
| | | | | | | | | | | |
* | | | | | | | | | | | reset() split in 2 function clear() & add()bell@laptop.sanja.is.com.ua2003-08-287-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.1monty@narttu.mysql.fi2003-08-2710-36/+67
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.1
| * | | | | | | | | | hanged UDF interface to use clear() instead of reset()monty@narttu.mysql.fi2003-08-2710-36/+67
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge fixesSinisa@sinisa.nasamreza.org2003-08-271-28/+25
| | | | | | | | | |
* | | | | | | | | | sql_union.cc:Sinisa@sinisa.nasamreza.org2003-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Post merge fixes
* | | | | | | | | | merge fixesSinisa@sinisa.nasamreza.org2003-08-275-46/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | symlink.result:Sinisa@sinisa.nasamreza.org2003-08-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for a small error in the merge from 4.0