summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* MWL#182: Explain running statementsSergey Petrunya2012-06-151-3/+22
|\ | | | | | | - Merge with current 5.5-main
| * MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-3/+22
| |\
| | * MWL#182: Explain running statements: merge with 5.3-main (needs fixing)Sergey Petrunya2012-01-031-3/+22
| | |\
| | | * MWL#182: Explain running statementsSergey Petrunya2011-10-271-3/+22
| | | |\ | | | | | | | | | | | | | | | - Merge with 5.3-main
| | | | * MWL#182: Explain running statementsSergey Petrunya2011-09-241-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Implement new approach to testing (the DBUG_EXECUTE_IF variant) - add an 'evalp' mysqltest command that is like 'eval' except that it prints the original query. - Fix select_describe() not to change join_tab[i]->type - More tests
* | | | | Building RPMs with CPackSergei Golubchik2012-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | configure with cmake -DRPM=distro
* | | | | 5.3 mergeSergei Golubchik2012-05-211-5/+40
|\ \ \ \ \
| * \ \ \ \ 5.2 mergeSergei Golubchik2012-05-201-1/+2
| |\ \ \ \ \
| | * \ \ \ \ 5.1 mergeSergei Golubchik2012-05-181-1/+2
| | |\ \ \ \ \
| | | * \ \ \ \ merge with mysql-5.1.63Sergei Golubchik2012-05-171-1/+2
| | | |\ \ \ \ \
| | | | * | | | | Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWSVenkata Sidagam2012-04-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is a duplicate of Bug #31173, which was pushed to the mysql-trunk 5.6 on 4th Aug, 2010. This is just a back-port of the fix mysql-test/r/mysqlslap.result: A test added as part of the fix for Bug #59107 mysql-test/t/mysqlslap.test: A test added as part of the fix for Bug #59107
| * | | | | | | | Merge 5.2->5.3unknown2012-05-111-5/+40
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fixed typounknown2012-05-101-1/+1
| | | | | | | | |
| | * | | | | | | MDEV-261 : mysqtest crashes when assigning variable to result of select , like Vladislav Vaintroub2012-05-081-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | let x = `SELECT <something>` The fix is to detect the condition "no active connection", to report error and die. Note, that the check for no active connection was already in place for ordinary commands, and was missing only for assign-variable command.
| * | | | | | | | 5.2 mergeSergei Golubchik2012-05-021-1/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | 5.1 mergeSergei Golubchik2012-05-021-1/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | lp:986120 Problem installing mariadb 5 on solaris 10Sergei Golubchik2012-04-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove a redundant line in Makefile.am
| * | | | | | | | mergeSergei Golubchik2012-04-052-127/+333
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | mergeSergei Golubchik2012-04-052-130/+335
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | mysql-5.1.62 mergeSergei Golubchik2012-04-052-130/+335
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | * | | | | | Fix main.merge testcase on WindowsVladislav Vaintroub2011-12-011-1/+1
| | | | | | | | |
* | | | | | | | | cSergei Golubchik2012-05-211-1/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merged from 5.1 to 5.5Venkata Sidagam2012-04-091-1/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #11766072 59107: MYSQLSLAP CRASHES IF STARTED WITH NO ARGUMENTS ON WINDOWSVenkata Sidagam2012-04-091-1/+2
| | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug is a duplicate of Bug #31173, which was pushed to the mysql-trunk 5.6 on 4th Aug, 2010. This is just a back-port of the fix mysql-test/r/mysqlslap.result: A test added as part of the fix for Bug #59107 mysql-test/t/mysqlslap.test: A test added as part of the fix for Bug #59107
* | | | | | | | | | Added --continue-on-error to mysqltest and mysql-test-runSergei Golubchik2012-05-151-116/+237
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will contune the test case even if there was an error and makes it easier to run a test that contains many sub tests against one engine. (originally by Monty)
* | | | | | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-284-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/innodb/t/group_commit_crash.test: remove autoincrement to avoid rbr being used for insert ... select mysql-test/suite/innodb/t/group_commit_crash_no_optimize_thread.test: remove autoincrement to avoid rbr being used for insert ... select mysys/my_addr_resolve.c: a pointer to a buffer is returned to the caller -> the buffer cannot be on the stack mysys/stacktrace.c: my_vsnprintf() is ok here, in 5.5
| * | | | | | | | Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5.Joerg Bruehe2012-03-021-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, take a syntax fix (C++ style comment in C file) in client/mysqldump.c.
| | * | | | | | | AIX builds fail for comments using //Karen Langford2012-02-281-2/+2
| | | | | | | | |
| * | | | | | | | Updated/added copyright headersMySQL Build Team2012-02-164-4/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Updated/added copyright headersKent Boortz2012-02-152-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Updated/added copyright headersMySQL Build Team2012-02-151-2/+1
| | | | | | | | | |
| | | * | | | | | | auto-merge mysql-5.0->mysql-5.0-securityGeorgi Kodinov2011-10-129-60/+39
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | Bug #11760384 52792: MYSQLDUMP IN XML MODE DOES NOTNirbhay Choubey2012-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DUMP ROUTINES Minor post-fix to avoid build failure when built with Werror.
* | | | | | | | | | | MDEV-186 Client programs throw warnings about memory loss when executed with ↵Sergei Golubchik2012-03-238-26/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --help or alike suppress these harmless but confusing warnings. fix the program name (MY_INIT) in mysqldump client/mysqldump.c: for backward compatibility, prefix mysqldump error messages with "mysqldump", not with the full path of the executable
* | | | | | | | | | | merge with mysql-5.5.21Sergei Golubchik2012-03-092-134/+342
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge with main for BUG#12969301unknown2012-01-302-142/+369
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fix compile warning: may be used uninitializedTor Didriksen2012-01-121-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge of fix for bug#11760384 from mysql-5.1.Nirbhay Choubey2012-01-101-131/+335
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | BUG#11760384 - 52792: mysqldump in XML mode does not dumpNirbhay Choubey2012-01-101-128/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | routines. mysqldump in xml mode did not dump routines, events or triggers. This patch fixes this issue by fixing the if conditions that disallowed the dump of above mentioned objects in xml mode, and added the required code to enable dump in xml format. client/mysqldump.c: BUG#11760384 - 52792: mysqldump in XML mode does not dump routines. Fixed some if conditions to allow execution of dump methods for xml and further added the relevant code at places to produce the dump in xml format. mysql-test/r/mysqldump.result: Added a test case for Bug#11760384. mysql-test/t/mysqldump.test: Added a test case for Bug#11760384.
| | | * | | | | | | | | Build broken for gcc 4.5.1 in optimized mode.Tor Didriksen2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readline.cc: In function char* batch_readline(LINE_BUFFER*): readline.cc:60:9: error: out_length may be used uninitialized in this function log.cc: In function int find_uniq_filename(char*): log.cc:1857:8: error: number may be used uninitialized in this function
| * | | | | | | | | | | BUG#12969301 : mysql_plugin: enable is ignored if plugin existsunknown2012-01-241-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the mechanism by which the client enables a plugin. Instead of using INSERT IGNORE to reload a plugin library, it now uses REPLACE INTO. This allows users to load a library multiple times replacing the existing values in the mysql.plugin table. This allows users to replace the symbol reference to a different dl name in the table. Thus permitting enabling of multiple versions of the same library without first disabling the old version. A regression test was added to ensure this feature works.
* | | | | | | | | | | | Merge MWL#234: @@skip_replication, into latest MariaDB 5.5 for pushunknown2012-03-021-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge MWL#234: @@skip_replication feature to MariaDB 5.5.unknown2012-03-011-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | MWL#234: After-review fixes, including better names for the new system ↵unknown2011-08-121-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables.
| | * | | | | | | | | | | | MWL#234: Support for marking binlog events to not be replicated, and for ↵unknown2011-08-111-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | telling slaves not to replicate events with such mark
* | | | | | | | | | | | | | overlay support for mysql-test-run and mysqltestSergei Golubchik2012-02-231-50/+144
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test-run auto-disables all optional plugins. mysql-test/include/default_client.cnf: no @OPT.plugindir anymore mysql-test/include/default_mysqld.cnf: don't disable plugins manually - mtr can do it better mysql-test/suite/innodb/t/innodb_bug47167.test: mtr now uses suite-dir as an include path mysql-test/suite/innodb/t/innodb_file_format.test: mtr now uses suite-dir as an include path mysql-test/t/partition_binlog.test: this test uses partitions storage/example/mysql-test/mtr/t/source.result: update results. as mysqltest includes the correct overlayed include storage/innobase/handler/ha_innodb.cc: the assert is wrong
* | | | | | | | | | | | | MWL#192 after-merge fixes.unknown2012-02-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix memory leak in one error case in mysqldump. Fix that HAVE_VALGRIND_VALGRIND_H is now HAVE_VALGRIND in 5.5. Fix that @have_ssl should not be set in embedded (introduced when removing #undef HAVE_OPENSSL from my_global.h).
* | | | | | | | | | | | | Merge latest MariaDB 5.5 into MWL#192: Non-blocking client library.unknown2012-02-221-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add SET_TARGET_PROPERTIES(ENABLE_EXPORTS) for mysqltest so plugins.dialog Vladislav Vaintroub2012-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test passes.
| * | | | | | | | | | | | | Fix portability problemsVladislav Vaintroub2012-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Solaris readline always needs curses - -rdynamic is not portable, replaced by SET_TARGET_PROPERTIES(...ENABLE_EXPORTS)
View Lorry Controller Status