Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge (again) | konstantin@mysql.com | 2005-05-14 | 2 | -2/+3 |
|\ | |||||
| * | Fix wrong format specifier in error messages. | konstantin@mysql.com | 2005-05-14 | 2 | -2/+2 |
| * | sql/ha_blackhole.cc | serg@serg.mylan | 2005-05-13 | 2 | -2/+3 |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mishka.local | 2005-05-13 | 2 | -24/+16 |
|\ \ | |||||
| * \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mishka.local | 2005-05-13 | 2 | -24/+16 |
| |\ \ | |||||
| | * | | concurrent-insert can now be set to 2 for concurrent inserts when there is ho... | monty@mishka.local | 2005-05-13 | 2 | -24/+16 |
* | | | | Fixup from 4.1 to 5.0 merge | jimw@mysql.com | 2005-05-13 | 1 | -1/+1 |
* | | | | Merge | konstantin@mysql.com | 2005-05-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix for valgrind bug in decimal code | hf@deer.(none) | 2005-05-13 | 1 | -1/+1 |
* | | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 | bell@book.sanja.is.com.ua | 2005-05-13 | 6 | -23/+76 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 | bell@book.sanja.is.com.ua | 2005-05-09 | 6 | -23/+76 |
| |\ \ \ | |||||
| | * \ \ | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 | bell@book.sanja.is.com.ua | 2005-05-09 | 6 | -23/+76 |
| | |\ \ \ | |||||
| | | * \ \ | merge | bell@book.sanja.is.com.ua | 2005-05-09 | 6 | -23/+76 |
| | | |\ \ \ | |||||
| | | | * | | | Item::fix_field need correct pointer on item reference to chnge it if itis ne... | bell@book.sanja.is.com.ua | 2005-05-09 | 6 | -23/+76 |
* | | | | | | | Fixed bug 10465. | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-05-12 | 1 | -1/+6 |
* | | | | | | | fix (Bug #8295 and #8296: varchar and varbinary conversion) | ramil@mysql.com | 2005-05-12 | 1 | -2/+3 |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | konstantin@mysql.com | 2005-05-12 | 4 | -21/+40 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute" | konstantin@mysql.com | 2005-05-12 | 4 | -21/+40 |
* | | | | | | | | Manual merge | igor@rurik.mysql.com | 2005-05-10 | 10 | -41/+38 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Many files: | igor@rurik.mysql.com | 2005-05-10 | 10 | -41/+38 |
* | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 | gbichot@quadita2.mysql.com | 2005-05-10 | 1 | -22/+59 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 | gluh@mysql.com | 2005-05-10 | 1 | -22/+59 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Bug#10018: use INFORMATION_SCHEMA works, but show tables in it returns error | gluh@mysql.com | 2005-05-10 | 1 | -3/+16 |
| | * | | | | | | | | Fix for bug #10018:use INFORMATION_SCHEMA works, but show tables in it return... | gluh@mysql.com | 2005-05-06 | 1 | -22/+46 |
* | | | | | | | | | | comment change (post-review of "replication of triggers"). Btw date_formats s... | gbichot@quadita2.mysql.com | 2005-05-10 | 1 | -4/+4 |
* | | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 | gbichot@quadita2.mysql.com | 2005-05-10 | 41 | -71/+139 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 | msvensson@neptunus.(none) | 2005-05-10 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | Remove testcode | msvensson@neptunus.(none) | 2005-05-10 | 1 | -1/+0 |
| * | | | | | | | | | Merge | jimw@mysql.com | 2005-05-09 | 4 | -6/+36 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | SUBSTR with negative argument didn't work | bar@noter.(none) | 2005-05-09 | 1 | -1/+1 |
| | * | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 | antony@ltantony.mysql.com | 2005-05-09 | 2 | -2/+21 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Bug#8733 - server accepts malformed query (multiply mentioned distinct) | antony@ltantony.mysql.com | 2005-05-09 | 2 | -2/+21 |
| | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1 | jimw@mysql.com | 2005-05-09 | 1 | -2/+13 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge mysql.com:/home/jimw/my/mysql-4.1-10435 | jimw@mysql.com | 2005-05-09 | 1 | -2/+13 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | Add special error message for .frm files with an un-understood version, like | jimw@mysql.com | 2005-05-07 | 1 | -2/+13 |
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | msvensson@neptunus.(none) | 2005-05-09 | 31 | -31/+32 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge neptunus.(none):/home/msvensson/mysql/bug10241 | msvensson@neptunus.(none) | 2005-05-09 | 31 | -31/+32 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | dlenev@mysql.com | 2005-05-09 | 5 | -15/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Manual merge of fix for bug #9913 into 5.0 tree. | dlenev@mysql.com | 2005-05-09 | 5 | -15/+45 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | dlenev@mysql.com | 2005-05-09 | 5 | -0/+29 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Fix for Bug #9913 "udf_deinit is not called after execution of PS" | dlenev@brandersnatch.localdomain | 2005-04-30 | 5 | -0/+29 |
| * | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-5.0.clean | holyfoot@mysql.com | 2005-05-09 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fix for bug #9632 (strict.test fails in -embedded-server mode) | holyfoot@hf-ibm.(none) | 2005-05-09 | 1 | -3/+3 |
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | msvensson@neptunus.(none) | 2005-05-09 | 29 | -29/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge neptunus.(none):/home/msvensson/mysql/bug10241 | msvensson@neptunus.(none) | 2005-05-09 | 29 | -29/+30 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | / / / / / / / / | | | | |_|/ / / / / / / / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | BUG#10241 cygwin port: invalid pragma interface directives | msvensson@neptunus.(none) | 2005-05-04 | 31 | -31/+32 |
| * | | | | | | | | | | | | Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs(). | ramil@ram-book.(none) | 2005-05-09 | 1 | -1/+6 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge | mskold@mysql.com | 2005-05-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 | mskold@mysql.com | 2005-05-08 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 | mskold@mysql.com | 2005-05-07 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | | |