summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-05-091-4/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | mergejoreland@mysql.com2005-05-092-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-05-091-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | bug#10471 - ndb - potential inconsistent backupjoreland@mysql.com2005-05-091-0/+2
| | * | | | | | | | | | | | | | | | | Fixes after reviewmsvensson@neptunus.(none)2005-05-091-4/+5
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-05-0934-32/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-091-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Fix check-cpu, add more recognized cpusmsvensson@neptunus.(none)2005-05-091-0/+16
| | | * | | | | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-0933-32/+38
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-05-0924-585/+350
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1joreland@mysql.com2005-05-0924-585/+350
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | bug#10142 - ndb unique index resource shortagejoreland@mysql.com2005-05-091-1/+1
| * | | | | | | | | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2005-05-0911-28/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2005-05-093-8/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2005-05-093-8/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | after merge fixgluh@mysql.com2005-05-091-4/+3
| | | | * | | | | | | | | | | | | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2005-05-093-8/+19
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | manual mergegluh@mysql.com2005-05-093-8/+19
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | Fix for bug #9404: information_schema: Weird error messages with SELECT SUM()...gluh@mysql.com2005-05-093-8/+17
| | * | | | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-05-098-20/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-05-098-20/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | Manual merge of fix for bug #9913 into 5.0 tree.dlenev@mysql.com2005-05-098-20/+49
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | / / / / / / / / / / / / / / / / / | | | | | | |/ / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | 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 bk-internal:/home/bk/mysql-4.1serg@sergbook.mylan2005-05-092-30/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|/ / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | - added "--skip-comments" to the "mysqldump" test to avoid printing comments ...lenz@mysql.com2005-05-092-30/+2
| | | | | * | | | | | | | | | | | | | | | | | don't use tmp file for such a trivialityserg@sergbook.mylan2005-05-091-4/+1
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-05-092-1/+3
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | - fix the range test to pass when InnoDB is note enabled (e.g. in the "-class...lenz@mysql.com2005-05-091-0/+2
| | | | | | * | | | | | | | | | | | | | | | | Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-05-091-1/+1
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | | | - added cmd-line-utils/libedit/vis.h to the source distributionlenz@mysql.com2005-05-091-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2005-05-091-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0mwagner@ultrafly.mysql.com2005-05-091-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | make_binary_distribution.sh:mwagner@ultrafly.mysql.com2005-05-091-0/+9
| * | | | | | | | | | | | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2005-05-092-8/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-5.0.cleanholyfoot@mysql.com2005-05-092-8/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Fix for bug #9632 (strict.test fails in -embedded-server mode)holyfoot@hf-ibm.(none)2005-05-092-8/+11
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0joreland@mysql.com2005-05-09199-1914/+4241
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-05-0931-30/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-091-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | After review fixesmsvensson@neptunus.(none)2005-05-091-1/+1
| | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug10241msvensson@neptunus.(none)2005-05-0931-30/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | BUG#10241 cygwin port: invalid pragma interface directivesmsvensson@neptunus.(none)2005-05-0433-32/+38
| | * | | | | | | | | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-05-091-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0mwagner@ultrafly.mysql.com2005-05-091-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | make_binary_distribution.sh:mwagner@ultrafly.mysql.com2005-05-091-0/+4
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Brian's mysqldump test modifications made on Ramil's laptop.ramil@ram-book.(none)2005-05-092-40/+12