summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed a bug in the code of the patch for WL#24 that manifestedIgor Babaev2009-10-291-11/+12
* Replaced a lame implementation of the function sel_trees_must_be_oredIgor Babaev2009-10-294-21/+214
* Merge of the latest 5.1 changes.Igor Babaev2009-10-26126-1022/+4260
|\
| * Automatic merge with maria-mergeMichael Widenius2009-10-2623-83/+308
| |\
| | * Automatic mergeMichael Widenius2009-10-2315-66/+260
| | |\
| | | * Fixes for binary distribution in tar fileMichael Widenius2009-10-2315-66/+260
| | * | Merge Peter Lieverdink's fixes:unknown2009-10-238-10/+37
| | |\ \ | | | |/ | | |/|
| | | * Merged with itself. Win!Peter Lieverdink2009-10-167-8/+8
| | | |\
| | | | * Typo fixes for "usefull" -> "useful".Peter Lieverdink2009-10-017-8/+8
| | | * | Add `configtest' option to the init script to check for a valid my.cnf file.Peter Lieverdink2009-10-161-2/+29
| | * | | Updated make_binary_distribution for MariaDBMichael Widenius2009-10-211-2/+5
| | * | | MBUG#452116: MariaDB: mysql_install_db causes server segfaultSergey Petrunya2009-10-164-4/+5
| | |/ /
| | * | backport the patch: Georgi Kodinov 2009-09-17:Sergey Petrunya2009-10-161-1/+1
| * | | Fixed compiler warning messageMichael Widenius2009-10-2640-126/+2333
| * | | Automatic merge with 5.1-mergeMichael Widenius2009-10-1467-802/+1610
| |\ \ \ | | |/ /
| | * | Cosmetic fixes to win/make_mariadb_win_distSergey Petrunya2009-10-121-1/+2
| | * | Fix typo bug in make_mariadb_win_distSergey Petrunya2009-10-121-1/+1
| | * | Fix win32 binary zipfile name and contents to match the usual expectationsSergey Petrunya2009-10-121-6/+19
| | * | Fix typo bug, s/$ZIPFILE/$ZIPNAME/Sergey Petrunya2009-10-121-1/+2
| | * | Remove leftover "echo"Sergey Petrunya2009-10-121-1/+1
| | * | Make devenv print the build log to stdout (otherwise buildbot times out Sergey Petrunya2009-10-121-2/+2
| | * | Make devenv print the build log to stdout (otherwise buildbot times out Sergey Petrunya2009-10-111-2/+2
| | * | Modify the `test-bt` target for OurDelta packaging.unknown2009-10-111-2/+2
| | * | Add win/make_mariadb_win_dist which is to be used to make windowsSergey Petrunya2009-10-112-1/+59
| | * | Fix test failures in variables-big in --embedded.unknown2009-10-111-0/+6
| | * | Bug#37635: Test read_many_rows_innodb is failing w/ wrong error message (lock...unknown2009-10-112-10/+10
| | * | Fix failures in the funcs_1 test suite.unknown2009-10-108-746/+1210
| | * | Fix many test failures in parts test suite with --embedded-server.unknown2009-10-0924-2/+69
| | * | Merge Sanja's fix of BUG#39249 into MariaDB 5.1.38 release clone.unknown2009-10-099-3/+44
| | |\ \
| | | * | comment addedunknown2009-10-071-0/+1
| | | * | mergeunknown2009-10-069-3/+43
| | | |\ \
| | | | * | BUG#39249 Maria:query cache returns out of date resultsunknown2009-10-069-3/+43
| | * | | | Implement mysqltest --enable_prepare_warnings to properly fix some test failu...unknown2009-10-095-6/+97
| | * | | | Fix make_win_bin_dist:Sergey Petrunya2009-10-091-3/+21
| | * | | | Include configure-mariadb.sh in source tarballSergey Petrunya2009-10-081-1/+1
| | * | | | Added win/configure-mariadb.sh - the standard way to configure on Windows.Sergey Petrunya2009-10-081-0/+23
| | * | | | Revert change of package name in configure.in, as it breaks too much stuff.unknown2009-10-081-2/+2
| | * | | | Merge.unknown2009-10-081-0/+12
| | |\ \ \ \
| | | * | | | MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt fil...Sergey Petrunya2009-10-081-0/+12
| | * | | | | Fixes for package name change mysql -> mariadb.unknown2009-10-084-5/+12
| | |/ / / /
| | * | | | Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...)Sergey Petrunya2009-10-081-1/+5
| | * | | | Fix win/configure.js: now configure.in has AM_INIT_AUTOMAKE(mariadb, ...)Sergey Petrunya2009-10-072-0/+5
| | * | | | Fix pbxt test suite failures:Sergey Petrunya2009-10-076-19/+12
| | * | | | Merge Arjen's fix for new slow log functionality.unknown2009-10-071-2/+2
| | |\ \ \ \
| | | * | | | Fix log_slow_filter/log_slow_verbosity code typos (Monty?)Arjen Lentz2009-10-071-2/+2
| | * | | | | Change naming of our package to mariadb rather than mysql.unknown2009-10-071-2/+2
| | |/ / / /
| | * | | | Fix test case partition_recover_myisam for --embedded-server.unknown2009-10-071-0/+4
| | * | | | Add missing PBXT windows file to `make dist`.unknown2009-10-071-1/+1
| * | | | | Removed not used declarationsMichael Widenius2009-10-131-8/+0
| * | | | | Force restart before maria_showlog_error to get rid of status from previous c...Michael Widenius2009-10-134-3/+9