Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix after manual merge. | kroki/tomash@moonlight.intranet | 2006-07-29 | 1 | -0/+44 |
* | Merge mysql.com:/home/hf/work/mysql-4.1.mrg | holyfoot/hf@mysql.com/deer.(none) | 2006-07-25 | 1 | -0/+2 |
|\ | |||||
| * | Merge bk@192.168.21.1:mysql-4.1 | holyfoot/hf@mysql.com/deer.(none) | 2006-07-20 | 1 | -0/+2 |
| |\ | |||||
| | * | bug #19983 (mysql_client_test_embedded fails) | holyfoot@deer.(none) | 2006-06-02 | 1 | -0/+2 |
* | | | merging | holyfoot/hf@mysql.com/deer.(none) | 2006-07-18 | 1 | -1/+1 |
* | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 | cmiller@zippy.(none) | 2006-07-13 | 1 | -2/+12 |
|\ \ \ | |||||
| * | | | A patch to Bug#17667 didn't take into consideration that the vardir, which co... | cmiller@zippy.(none) | 2006-07-10 | 1 | -3/+13 |
* | | | | Merge mysqldev@production:my/mysql-5.0-release | knielsen@rt.int.sifira.dk | 2006-07-04 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Makefile.am: | kent@suse9-x86.mysql.com | 2006-07-03 | 1 | -0/+6 |
| |/ / / | |||||
* | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 | gluh@mysql.com | 2006-07-03 | 1 | -0/+34 |
|\ \ \ \ | |||||
| * | | | | Bug#19671 mysql_list_fields returns incorrect table name for VIEWs | gluh@eagle.intranet.mysql.r18.ru | 2006-06-29 | 1 | -0/+34 |
| |/ / / | |||||
* | | | | Merge mysql.com:/home/my/mysql-4.1 | monty@mysql.com | 2006-06-30 | 1 | -6/+65 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | bug #20152: mysql_stmt_execute() overwrites parameter buffers | kroki@mysql.com | 2006-06-30 | 1 | -0/+53 |
| * | | Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release | serg@mysql.com | 2006-05-24 | 1 | -7/+14 |
| |\ \ | | |/ | |/| | |||||
* | | | Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release | kent@mysql.com | 2006-05-26 | 1 | -7/+14 |
|\ \ \ | |||||
| * \ \ | Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release | serg@mysql.com | 2006-05-24 | 1 | -7/+14 |
| |\ \ \ | |||||
| | * \ \ | Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release | serg@mysql.com | 2006-05-24 | 1 | -7/+14 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | don't let bugfix for bug#8303 break the bugfix for bug#8378 | kent@mysql.com | 2006-05-24 | 1 | -7/+14 |
* | | | | | Fix a bunch of non-Linux compile failures. | knielsen@mysql.com | 2006-05-02 | 2 | -2/+3 |
* | | | | | SECURITY FIX | cmiller@zippy.(none) | 2006-05-01 | 2 | -1/+67 |
* | | | | | Fix incorrect merge: put '/*' comment start back. | sergefp@mysql.com | 2006-03-30 | 1 | -0/+1 |
* | | | | | Manual merge | evgen@sunlight.local | 2006-03-30 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Cleanup during review of new pushed code | monty@mysql.com | 2006-03-30 | 1 | -3/+3 |
| * | | | Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error": | konstantin@mysql.com | 2006-03-05 | 1 | -20/+0 |
* | | | | Undo the patch for Bug#16144 "mysql_stmt_attr_get type error", | konstantin@mysql.com | 2006-03-04 | 1 | -19/+0 |
* | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 | evgen@sunlight.local | 2006-02-28 | 1 | -0/+35 |
|\ \ \ \ | |||||
| * | | | | Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was | evgen@moonbone.local | 2006-02-28 | 1 | -0/+35 |
* | | | | | Fixed new introduced bug in binlog.test with --ps-protocol | monty@mysql.com | 2006-02-25 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | msvensson@neptunus.(none) | 2006-02-15 | 1 | -0/+16 |
|\ \ \ \ | |||||
| * | | | | Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000' | msvensson@devsrv-b.mysql.com | 2006-02-15 | 1 | -0/+16 |
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | msvensson@neptunus.(none) | 2006-02-13 | 1 | -3/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013 | msvensson@neptunus.(none) | 2006-02-13 | 1 | -3/+17 |
| |\ \ \ \ | |||||
| | * | | | | Bug#14013 mysql_stmt_store_result() bombs if a cursor is open | msvensson@neptunus.(none) | 2006-02-10 | 1 | -3/+17 |
* | | | | | | fix test of bug 12744 on OSX | andrey@lmy004. | 2006-02-10 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Post-merge fixes. | konstantin@mysql.com | 2006-02-03 | 1 | -17/+0 |
* | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-root | konstantin@mysql.com | 2006-02-02 | 1 | -1/+51 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection re... | andrey@lmy004. | 2006-02-01 | 1 | -0/+32 |
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719 | msvensson@neptunus.(none) | 2006-01-30 | 1 | -2/+77 |
|\ \ \ \ \ | |||||
| * | | | | | Bug #15719 MYSQL_OPT_RECONNECT option is modified by mysql_real_connect | msvensson@neptunus.(none) | 2006-01-26 | 1 | -2/+78 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-15613 | konstantin@mysql.com | 2006-01-19 | 1 | -0/+64 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | A fix and a test case for Bug#15613 "libmysqlclient API function | konstantin@mysql.com | 2006-01-18 | 1 | -0/+65 |
* | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-root | konstantin@mysql.com | 2006-01-18 | 1 | -0/+19 |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | |||||
| * | | | A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error": | konstantin@mysql.com | 2006-01-17 | 1 | -0/+20 |
| | |/ | |/| | |||||
* | | | Merge mysql.com:/home/mydev/mysql-5.0 | ingo@mysql.com | 2005-12-08 | 1 | -0/+35 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix value returned by mysql_warning_count() after fetching a prepared | jimw@mysql.com | 2005-12-06 | 1 | -0/+35 |
* | | | Bug#10932 - Building server with key limit of 128, makes test cases fail | ingo@mysql.com | 2005-12-02 | 1 | -1/+1 |
|/ / | |||||
* | | A test case for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA | konstantin@mysql.com | 2005-11-18 | 1 | -0/+44 |
* | | A fix and a test case for Bug#13524 "lock timeout gives | konstantin@mysql.com | 2005-11-17 | 1 | -1/+62 |
* | | A fix and a test case for Bug#13488 "Left outer join query incorrectly | konstantin@mysql.com | 2005-11-09 | 1 | -0/+69 |
* | | A fix and a test case for Bug#14210 "Simple query with > operator on | konstantin@mysql.com | 2005-11-03 | 1 | -0/+54 |