summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-12-161-1/+1
|\
| * 5.5 mergeSergei Golubchik2013-12-151-1/+1
| |\
| | * Fixed compiler errors and warningsMichael Widenius2013-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/jemalloc/src/ctl.c: Fixed compiler warning include/mysql/service_logger.h: Fixed compile failure with clang compiler storage/maria/ma_check.c: Fixed compiler warning support-files/compiler_warnings.supp: Suppressed warnings in jemalloc tests/bug25714.c: Fixed compiler warning
* | | 10.0-base merge.Sergei Golubchik2013-09-211-0/+2
|\ \ \ | |/ / | | | | | | | | | Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
| * | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-0/+2
| |\ \ | | |/
| | * MDEV-4941 make: AIX fails with 'Identifier not allowed in cast'; syntax ↵Sergei Golubchik2013-09-091-0/+2
| | | | | | | | | | | | | | | | | | error in include/my_global.h C++ comments in C files, and a typo in my_global.h
* | | MDEV-4865 Change related to --log option/variable was merged partiallySergei Golubchik2013-08-131-2/+4
| | | | | | | | | | | | | | | Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk (WL#5185 Remove deprecated 5.1 features)
* | | 10.0-monty mergeSergei Golubchik2013-07-213-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
| * | | fix mysql_client_test failure, sometimes we do warnings differentlySergei Golubchik2013-07-091-3/+2
| | | |
| * | | Fix compilation: tests/async_queries links againist client library, and Sergey Petrunya2013-07-051-0/+2
| | | | | | | | | | | | | | | | | | | | must use C++ linking due to client library using SSL library, which needs C++ linking
| * | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-1/+1
| | | |
* | | | 10.0-base mergeSergei Golubchik2013-07-1822-23/+95
|\ \ \ \ | | |/ / | |/| |
| * | | 5.5 mergeSergei Golubchik2013-07-1722-23/+95
| |\ \ \ | | | |/ | | |/|
| | * | mysql-5.5.32 mergeSergei Golubchik2013-07-1622-22/+22
| | |\ \
| | | * | Correcting the permissions of the executable files.Murthy Narkedimilli2013-03-2012-0/+0
| | | | |
| | | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1922-22/+22
| | | | |
| | | * | merge 5.1 => 5.5Tor Didriksen2012-11-011-0/+1
| | | |\ \
| | | | * | Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIENT_TESTTor Didriksen2012-11-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing DBUG_RETURNs, otherwise the debug-stack gets messed up, and _db_enter_ and _db_exit_ will access data outside the current stack frame.
| | * | | | MDEV-4601 : Allow MariaDB to be build without non-blocking client.Vladislav Vaintroub2013-06-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-blocking client currently can be build on Windows, GCC on i386 and x64, or any OS wth ucontext.h header. Prior to this patch, build failed if neither of these conditions is true. Fix to avoid compiler errors in these case - non-blocking API would not be useful on , but otherwise everything will work as before.
| | * | | | MDEV-4604 Wrong server status when sending out parametersSergei Golubchik2013-06-121-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset SERVER_MORE_RESULTS_EXISTS *after* sending the OUT packet to the client. the next packet will be the last one. patch by Georg Richter.
* | | | | | 10.0-base mergeSergei Golubchik2013-06-061-5/+114
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | (without InnoDB - all InnoDB changes were ignored)
| * | | | | 5.5 mergeSergei Golubchik2013-06-061-5/+114
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.3 merge.Sergei Golubchik2013-05-201-1/+109
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | change maria.distinct to use a function that doesn't require ssl-enabled builds
| | | * \ \ \ 5.2 mergeSergei Golubchik2013-05-201-1/+109
| | | |\ \ \ \
| | | | * \ \ \ 5.1 mergeSergei Golubchik2013-05-201-1/+109
| | | | |\ \ \ \
| | | | | * | | | MDEV-4326 fix.unknown2013-04-091-1/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed "optimization" which caused preoblems on second execution of PS with string parameter in LIMIT clause. Fixed test_bug43560 to be able to skipp it if connection is UNIX socket.
| | * | | | | | | MDEV-4332 Increase username length from 16 charactersSergei Golubchik2013-04-181-4/+5
| | | | | | | | |
* | | | | | | | | 10.0-base mergeSergei Golubchik2013-04-151-9/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | 5.5 mergeSergei Golubchik2013-04-141-4/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 5.3 mergeSergei Golubchik2013-04-121-4/+5
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | 5.2 mergeSergei Golubchik2013-04-111-4/+5
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | 5.1 mergeSergei Golubchik2013-04-111-4/+5
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | MDEV-4244 [PATCH] Buffer overruns and use-after-free errorsSergei Golubchik2013-04-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes for gcc 4.8 - compilation warnings and -fsanitize=address
| * | | | | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-071-5/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | and sometimes harmful (used with expressions)
* | | | | | | 10.0-base mergeSergei Golubchik2013-01-311-72/+108
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.3 mergeSergei Golubchik2013-01-251-72/+108
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | client/mysqltest.cc: make --error to work for --change_user errors
| | * | | | | 5.2 mergeSergei Golubchik2013-01-251-72/+108
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | MDEV-3915 COM_CHANGE_USER allows fast password brute-forcingSergei Golubchik2013-01-251-72/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow only three failed change_user per connection. successful change_user do NOT reset the counter tests/mysql_client_test.c: make --error to work for --change_user errors
| | * | | | | 5.2 merge.Sergei Golubchik2012-08-223-1363/+1388
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two tests still fail: main.innodb_icp and main.range_vs_index_merge_innodb call records_in_range() with both range ends being open (which triggers an assert)
| | | * | | | 5.1 mergeSergei Golubchik2012-08-223-1363/+1388
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | increase xtradb verson from 13.0 to 13.01
| | | | * | | merge with MySQL 5.1.65Sergei Golubchik2012-08-223-1361/+1386
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
* | | | | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-101-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Also fixed a bug in sql_update.cc: the code of mysql_update() lacked a call of set_statistics_for_table().
| * | | | | | typoSergei Golubchik2012-12-061-1/+1
| | | | | | |
* | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-0/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix yet another regression after MDEV-3885.Vladislav Vaintroub2012-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If connection kills itself (or own query), it will get an error consistently, with both COM_PROCESSKILL and with "KILL [QUERY] id"
| * | | | | | MDEV-3885 - connection suicide via mysql_kill() causes assertion in serverVladislav Vaintroub2012-11-271-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assertion happened because sql_kill did not set OK status in diagnostic area in the case of connection suicide (id to kill == thd->thread_id), issued via COM_PROCESS_KILL , e.g using mysql_kill() This patch ensures that diagnostic area is initialized in this specific case.
* | | | | | | merge with 5.5Sergei Golubchik2012-11-032-32/+42
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mysql-5.5.28Sergei Golubchik2012-10-162-32/+42
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge from 5.1 to 5.5Praveenkumar Hulakund2012-07-262-7/+16
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | mysql_client_fw.c was not included in make distBjorn Munch2012-07-101-0/+1
| | | | | | |