summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Manual merge (again)konstantin@mysql.com2005-05-142-2/+3
|\
| * Fix wrong format specifier in error messages.konstantin@mysql.com2005-05-142-2/+2
| * sql/ha_blackhole.ccserg@serg.mylan2005-05-132-2/+3
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-05-132-24/+16
|\ \
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-05-132-24/+16
| |\ \
| | * | concurrent-insert can now be set to 2 for concurrent inserts when there is ho...monty@mishka.local2005-05-132-24/+16
* | | | Fixup from 4.1 to 5.0 mergejimw@mysql.com2005-05-131-1/+1
* | | | Mergekonstantin@mysql.com2005-05-131-1/+1
|\ \ \ \ | |/ / /
| * | | Fix for valgrind bug in decimal codehf@deer.(none)2005-05-131-1/+1
* | | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0bell@book.sanja.is.com.ua2005-05-136-23/+76
|\ \ \ \ | |/ / / |/| | |
| * | | Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0bell@book.sanja.is.com.ua2005-05-096-23/+76
| |\ \ \
| | * \ \ Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0bell@book.sanja.is.com.ua2005-05-096-23/+76
| | |\ \ \
| | | * \ \ mergebell@book.sanja.is.com.ua2005-05-096-23/+76
| | | |\ \ \
| | | | * | | Item::fix_field need correct pointer on item reference to chnge it if itis ne...bell@book.sanja.is.com.ua2005-05-096-23/+76
* | | | | | | Fixed bug 10465.jani@a193-229-222-105.elisa-laajakaista.fi2005-05-121-1/+6
* | | | | | | fix (Bug #8295 and #8296: varchar and varbinary conversion)ramil@mysql.com2005-05-121-2/+3
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-05-124-21/+40
|\ \ \ \ \ \ \
| * | | | | | | A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"konstantin@mysql.com2005-05-124-21/+40
* | | | | | | | Manual mergeigor@rurik.mysql.com2005-05-1010-41/+38
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Many files:igor@rurik.mysql.com2005-05-1010-41/+38
* | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0gbichot@quadita2.mysql.com2005-05-101-22/+59
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2005-05-101-22/+59
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bug#10018: use INFORMATION_SCHEMA works, but show tables in it returns errorgluh@mysql.com2005-05-101-3/+16
| | * | | | | | | | Fix for bug #10018:use INFORMATION_SCHEMA works, but show tables in it return...gluh@mysql.com2005-05-061-22/+46
* | | | | | | | | | comment change (post-review of "replication of triggers"). Btw date_formats s...gbichot@quadita2.mysql.com2005-05-101-4/+4
* | | | | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0gbichot@quadita2.mysql.com2005-05-1041-71/+139
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-05-101-1/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Remove testcodemsvensson@neptunus.(none)2005-05-101-1/+0
| * | | | | | | | | Mergejimw@mysql.com2005-05-094-6/+36
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | SUBSTR with negative argument didn't workbar@noter.(none)2005-05-091-1/+1
| | * | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1antony@ltantony.mysql.com2005-05-092-2/+21
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug#8733 - server accepts malformed query (multiply mentioned distinct)antony@ltantony.mysql.com2005-05-092-2/+21
| | * | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-05-091-2/+13
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-10435jimw@mysql.com2005-05-091-2/+13
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Add special error message for .frm files with an un-understood version, likejimw@mysql.com2005-05-071-2/+13
| | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-05-0931-31/+32
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-0931-31/+32
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-05-095-15/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Manual merge of fix for bug #9913 into 5.0 tree.dlenev@mysql.com2005-05-095-15/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2005-05-095-0/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Fix for Bug #9913 "udf_deinit is not called after execution of PS"dlenev@brandersnatch.localdomain2005-04-305-0/+29
| * | | | | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-5.0.cleanholyfoot@mysql.com2005-05-091-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix for bug #9632 (strict.test fails in -embedded-server mode)holyfoot@hf-ibm.(none)2005-05-091-3/+3
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-05-0929-29/+30
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-0929-29/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | / / / / / / / / | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | BUG#10241 cygwin port: invalid pragma interface directivesmsvensson@neptunus.(none)2005-05-0431-31/+32
| * | | | | | | | | | | | Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs().ramil@ram-book.(none)2005-05-091-1/+6
| |/ / / / / / / / / / /
| * | | | | | | | | | | Mergemskold@mysql.com2005-05-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-05-081-0/+4
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-05-071-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |