summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge from 4.1unknown2005-05-2653-103/+181
|\
| * Fix icc compiler warningunknown2005-05-261-1/+0
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-2647-47/+52
| |\
| | * Add ifdefs to control when "#pragma implementation" should be usedunknown2005-05-2646-45/+50
| | * Use one err file for each master unknown2005-05-251-2/+2
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-257-56/+132
| |\ \
| | * | Cleanup during code reviewunknown2005-05-257-56/+132
* | | | Include fix to function open_binlog from 4.1unknown2005-05-261-1/+2
* | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-267-7/+9
|\ \ \ \
| * | | | Post-review fixes: rename SHOW_DOUBLE to SHOW_DOUBLE_STATUSunknown2005-05-263-3/+4
| * | | | Change Last_query_cost status variable from global to thread-local.unknown2005-05-186-5/+6
* | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-2617-73/+149
|\ \ \ \ \
| * | | | | Corrected merge error in 'mysql-test/r/select.result': two test blocks insert...unknown2005-05-261-6/+6
| * | | | | Correction of merge mishandling in 'client/client_priv.h'.unknown2005-05-261-1/+1
| * | | | | Mergeunknown2005-05-261-11/+206
| * | | | | Manual merge.unknown2005-05-2617-270/+151
| |\ \ \ \ \
| | * \ \ \ \ Manual merge.unknown2005-05-251-15/+22
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Added a missing "make clean" to the RPM "spec" file which had caused the orig...unknown2005-05-251-0/+7
| | * | | | | BUG#10831 ndb mgmd LogDestination maxfiles does not rotate logs properlyunknown2005-05-251-23/+3
| | * | | | | BUG#10796 Incorrect check-cpu result for ppc linux gccunknown2005-05-251-0/+4
| | * | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-245-6/+66
| | |\ \ \ \ \
| | | * \ \ \ \ Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2005-05-241-1/+3
| | | |\ \ \ \ \
| | | | * | | | | simplifying new/my_arg_new wrappingunknown2005-05-241-1/+3
| | | * | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-244-5/+63
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Additions for --add-drop-databaseunknown2005-05-204-5/+63
| | * | | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-243-1/+31
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-183-1/+31
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-183-1/+31
| | | | |\ \ \ \ \ \
| | | | | * | | | | | union.result:unknown2005-04-263-1/+31
| | * | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-243-0/+16
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Added a test case for Bug#8009.unknown2005-05-243-0/+16
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-05-243-21/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | removed unneeded reserved_win_names testcaseunknown2005-05-243-21/+0
| | | |/ / / / / / / /
* | | | | | | | | | | Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0unknown2005-05-261-22/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Moved detection of wrong decimal fields before decimal field was created to a...unknown2005-05-261-22/+20
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix compiler warningunknown2005-05-261-1/+1
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-263-0/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | BUG#9879 delimiter command discrepancy (4.1 vs. 5.0, mysql vs. mysqltest)unknown2005-05-173-0/+132
* | | | | | | | | | | | | | init_db.sql:unknown2005-05-261-2/+6
* | | | | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-buildunknown2005-05-263-2/+228
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fix MERGE tables on Microsoft Windows. This a backport of theunknown2005-05-252-2/+7
| * | | | | | | | | | | | | Merge mysql.com:/data0/mysqldev/my/mysql-5.0-buildunknown2005-05-253-2/+228
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Bug #10838 CREATE TABLE produces strange DEFAULT valueunknown2005-05-253-2/+228
* | | | | | | | | | | | | | | Move function from header file to make it easier to debugunknown2005-05-262-14/+17
* | | | | | | | | | | | | | | Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0unknown2005-05-258-11/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Fix that we can read tables with the 'older' decimal format used in 5.0.3 & 5...unknown2005-05-255-6/+77
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | ha_archive.cc:unknown2005-05-243-5/+9
* | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-256-40/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Cleanup's during reviewunknown2005-05-256-40/+41