summaryrefslogtreecommitdiff
path: root/client
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo)Sergei Golubchik2012-01-171-1/+1
| | | | | | | | | client/CMakeLists.txt: 1. -rdynamic is a linker flag. 2. it should be used in all builds, not debug only libmysql/get_password.c: prefer a standard function, when possible (otherwise a plugin will need to load it from the client)
* mysql-5.5 mergeSergei Golubchik2012-01-164-50/+108
|\
| * Bug#12809202 61854: MYSQLDUMP --SINGLE-TRANSACTIONNirbhay Choubey2011-12-241-0/+2
| | | | | | | | | | | | | | --FLUSH-LOG BREAKS CONSISTENCY Post-fix for some failing tests.
| * Bug#12809202 61854: MYSQLDUMP --SINGLE-TRANSACTIONNirbhay Choubey2011-12-231-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --FLUSH-LOG BREAKS CONSISTENCY The transaction started by mysqldump gets committed implicitly when flush-log is specified along with single-transaction option, and hence can break consistency. This is because, COM_REFRESH is executed in order to flush logs and starting from 5.5 this command performs an implicit commit. Fixed by making sure that COM_REFRESH is executed before the transaction has started and not after it. Note : This patch triggers following behavioral changes in mysqldump : 1) After this patch we no longer flush logs before dumping each database if --single-transaction option is given like it was done before (in the absence of --lock-all-tables and --master-data options). 2) Also, after this patch, we start acquiring FTWRL before flushing logs in cases when only --single-transaction and --flush-logs are given. It becomes safe to use mysqldump with these two options and without --master-data parameter for backups. client/mysqldump.c: Bug#12809202 61854: MYSQLDUMP --SINGLE-TRANSACTION --FLUSH-LOG BREAKS CONSISTENCY Added logic to make sure that, if flush-log option is specified, mysql_refresh() is never executed after the transaction has started. Added verbose messages for all the executions of mysql_refresh() in order to track its invocation. mysql-test/r/mysqldump.result: Added test case for Bug#12809202. mysql-test/t/mysqldump.test: Added test case for Bug#12809202.
| * A patch for Bug#13023858 - MYSQL_UPGRADE PRINTSAlexander Nozdrin2011-12-211-1/+0
| | | | | | | | | | | | THE ORACLE_WELCOME_COPYRIGHT_NOTICE TWICE. Fix of a merge error.
| * Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITHNirbhay Choubey2011-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OPTION SKIP-WRITE-BINLOG System tables were not getting upgraded when mysql_upgrade was run with --skip-write-binlog option. (Same for --write-binlog.) Also, with this option, mysql_upgrade_info file was not getting created after the upgrade. mysql_upgrade makes use of mysql client tool in order to run upgrade scripts, while doing so it passes some of the command line options (used to start mysql_upgrade) directly to mysql client. The reason behind this bug being, some options like skip-write-binlog and upgrade-system-tables were being passed to mysql tool along with other options, and hence mysql execution failed due presence of these invalid options. Fixed this issue by filtering out the above mentioned options from the list of options that will be passed to mysql and mysqlcheck tools. However, since --write-binlog is supported by mysqlcheck, this option would be used explicitly while running mysqlcheck. (not part of patch, already there) Checking the contents of general log after the upgrade is not doable via an mtr test. So performed manual test. Added a test to verify the creation of mysql_upgrade_info. client/mysql_upgrade.c: Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH OPTION SKIP-WRITE-BINLOG With this patch, --upgrade-system-tables and --write-binlog options will not be added to the list of options, used to start mysql and mysqlcheck tools. mysql-test/r/mysql_upgrade.result: Added a testcase for Bug#11827359. mysql-test/t/mysql_upgrade.test: Added a testcase for Bug#11827359.
| * BUG#12929028: mysql_plugin : the --mysqld option is required, but not usedunknown2011-11-111-5/+5
| | | | | | | | | | | | | | This patch corrects a defect whereby the --mysqld, --my-print-defaults, and --plugin-ini were required. These options are not required and the code has been fixed accordingly.
| * Bug #13055685 NO WAY TO REPLACE NON-DETERMINISTIC FRAGMENTS IN OUTPUT OF ↵Bjorn Munch2011-11-081-27/+50
| | | | | | | | | | | | | | | | | | | | | | MTR'S ECHO Don't do this for echo, instead: 1) Enable replacements also for assignment from backquoted SQL 2) Allow replace_regex to take a variable for the *entire* argument list With this, the test can be amended, but only in its version in trunk
| * Bug #13096353 62712: RPM-BASED INSTALL OF THE TEST SUITE IS USELESS FOR ↵Bjorn Munch2011-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | NON-ROOT USERS Simplified fix avoiding changes to mysys: Use the MY_HOLD_ORIGINAL_MODES flag when calling my_copy(), this also stops it from attempting to chown() the file. Yes this behavior is a bit confusing.... The only case this might change the behavior is if the destination file exists, but since we also use MY_DONT_OVERWRITE_FILE, it would fail in those cases anyway.
| * Bug #11754855 46528: NEED A WAY TO PASS A VARIABLE TO MTR COMMANDSunknown2011-10-191-1/+13
| | | | | | | | | | | | | | modified function do_get_error in mysqltest.cc to handle multiple variable passed added test case to mysqltest.test to verify handling to multiple errors passed
| * BUG#12968567: mysql_plugin : incorrect return from bootstrap failureunknown2011-10-171-2/+1
| | | | | | | | | | | | | | This patch corrects a defect whereby the bootstrap_server() method was returning 0 instead of the error code generated. The code has been changed to return the correct value returned from the bootstrap command.
| * BUG#12968815: mysql_plugin : disable requires plugin name but doesn't use itunknown2011-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | This patch corrects a defect in the building of the DELETE commands for disabling a plugin whereby only the original plugin data was deleted. If there were other plugins, the delete did not remove the rows. The code has been changed to remove all rows from the mysql.plugin table that were inserted when the plugin was loaded. The test has also been changed to correctly identify if all rows have been deleted.
* | 5.3 mergeSergei Golubchik2012-01-1314-60/+137
|\ \
| * | Fixed that --sorted-result in mysql-test-run also works for execMichael Widenius2012-01-091-16/+34
| | | | | | | | | | | | | | | | | | | | | mysql-test/r/information_schema_all_engines.result: Update result mysql-test/t/information_schema_all_engines.test: Added --sorted-results as tables in information_schema are not sorted.
| * | 5.2->5.3 mergeSergei Golubchik2011-12-122-3/+48
| |\ \
| | * | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-022-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. dialog plugin now always returns mysql->password if non-empty and the first question is of password type 3. split get_tty_password into get_tty_password_buff and strdup. 4. dialog plugin now uses get_tty_password by default 5. dialog.test 6. moved small tests of individual plugins into a dedicated suite
| * | | Merge with 5.2.Michael Widenius2011-12-1117-61/+127
| |\ \ \ | | |/ / | | | | | | | | no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
| | * | Merge with 5.1Michael Widenius2011-11-301-3/+18
| | |\ \
| | | * | Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-301-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.cc: Free mutex after usage (fixes valgrind warnings in embedded server) mysql-test/include/gis_keys.inc: Fixed failure in innodb.gis_test mysql-test/r/gis.result: Updated result mysql-test/suite/innodb/r/innodb_gis.result: Updated results mysql-test/suite/innodb/t/innodb_bug38231.test: Added handling of timeouts (happend on some servers in buildbot) mysql-test/suite/innodb_plugin/r/innodb_gis.result: Updated results mysql-test/suite/innodb_plugin/t/innodb.test: Use error names instead of numbers mysql-test/suite/innodb_plugin/t/innodb_misc1.test: This test requires utf8 mysql-test/suite/innodb_plugin/t/innodb_mysql.test: This test requires Xtradb sql/sql_base.cc: Don't print table names for placeholders. sql/sql_show.cc: Temporary fix: Save and restore db and table_name in mysqld_show_create (to get rid of valgrind warning) A better solution that needs to be investgated is to not change these fields in mysql_derived_prepare() sql/sql_view.cc: Fixed valgrind warning storage/xtradb/handler/ha_innodb.cc: Don't access THD directly
| | * | | Fix testcases:Vladislav Vaintroub2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. main.merge fails with errno 13 in copy_file(). The reason for the error is that copy_file tries to create a file with the same name as recently deleted one, and there is still an open handle for the deleted file. To fix, use my_delete_allow_opened() for MTR's delete_file. On Windows, this renames file to unique name prior to deletion, and prevents EACCES errors for files opened with FILE_SHARE_DELETE. 2. innodb_bug59641 generates warnings, after server was killed and restarted in the test case. The warnings are about test_suppression table (needs to be repaired, as it that was written just prior to the crash) Fixed by using FLUSH TABLES after populating warning suppression table.
| | * | | Merge with MariaDB 5.1Michael Widenius2011-11-2417-58/+110
| | |\ \ \ | | | |/ /
| | | * | Merge with MySQL 5.1.60Michael Widenius2011-11-233-8/+28
| | | |\ \
| | | | * | Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.Tor Didriksen2011-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed possibly uninitialized use of need_copy_table_res.
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2117-49/+80
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed up copyright messages.
| | | * | | | Fix gcc 4.6 warnings about assigned but not used variables.unknown2011-10-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed my_gethwaddr.c to allow compilation on Mac OS X.
| * | | | | | Added handler and temporary table usage to mytopMichael Widenius2011-12-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed prompt on reconnect in mysql client client/mysql.cc: Free server_version for reconnect. This ensures that prompt is correct if reconnecting to a different server. scripts/mytop.sh: Added handler and temporary table usage
* | | | | | | always use sql/sql_string.* files, never - client/sql_string.*Sergei Golubchik2011-12-153-1/+2
| | | | | | |
* | | | | | | new configure option: NOT_FOR_DISTRIBUTIONSergei Golubchik2011-12-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix safemalloc to compile w/o libbfd. CMakeLists.txt: NOT_FOR_DISTRIBUTION option cmake/readline.cmake: simplify libedit/readline detection. never use bundled libedit. use system readline v6 only if NOT_FOR_DISTRIBUTION=1 configure.cmake: use libbfd only if NOT_FOR_DISTRIBUTION=1 include/my_stacktrace.h: link with libbfd even w/o safemalloc.
* | | | | | | move safemalloc out of dbug.Sergei Golubchik2011-12-126-31/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remeber a real backtrace for every allocation. make safemalloc to tract C++ new/delete too. collateral fixes to make the test suite pass.
* | | | | | | mergeVladislav Vaintroub2011-11-282-3/+3
|\ \ \ \ \ \ \
| * | | | | | | compiler warnings/errorsSergei Golubchik2011-11-232-3/+3
| | | | | | | |
* | | | | | | | Fix build and packaging on Windows:Vladislav Vaintroub2011-11-261-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - build executables we have in 5.3 (mysql_install_db.exe, mysq_upgrade_service.exe, upgrade wizard), and MSI - add some missing headers to windows specific source files. This needs to be done since 5.5 is using WIN32_LEAN_AND_MEAN preprocessor constant thus windows.h no more includes whiole Windows - do not deliver perl scripts (mysql_install_db.pl & friends) -they do not work, are not documented, and we have native executables for this functionality. do not pack echo.exe, replace.exe into MSI, they are not needed. Do not build resolveip on Windows, it is not used. - precache results of of system checks in cmake/os/WindowsCache.cmake (like it is alreay done for majority of tests to speed up cmake run with VS) - make feedback plugin DEFAULT on Windows (so MSI works if user enables plugin), fix null pointer access in PSI_register
* | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-223-9/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Compiler warning about assigned but not used variables fixed.unknown2011-10-181-1/+2
| | | | | | |
| * | | | | | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_eventsSergei Golubchik2011-09-231-6/+6
| | | | | | |
| * | | | | | Added MariaDB executable comment syntax: /*M!##### */Michael Widenius2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Don't remove MariaDB executable comments. mysql-test/r/comments.result: Test MariaDB executable comments. mysql-test/r/mysql.result: Test MariaDB executable comments. mysql-test/t/comments.test: Test MariaDB executable comments. mysql-test/t/mysql.test: Test MariaDB executable comments. sql/sql_cache.cc: Don't delete MariaDB executable comments. sql/sql_lex.cc: Handle MariaDB executable comments
* | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0318-98/+1421
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 12956584 followup fix for mysqltestBjorn Munch2011-09-301-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run_query_stmt() might use disable_xxx vars after calling handle_no_error But handle_no_error() hes reverted any ONCE settings Fix is to take revert_properties() out of handle_no_error()
| * | | | | | Merge of fix for bug#11758062 from mysql-5.1.Raghav Kapoor2011-09-281-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | BUG#11758062 - 50206: ER_TOO_BIG_SELECT REFERS TO OUTMODED Raghav Kapoor2011-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SYSTEM VARIABLE NAME SQL_MAX_JOIN_SI BACKGROUND: ER_TOO_BIG_SELECT refers to SQL_MAX_JOIN_SIZE, which is the old name for MAX_JOIN_SIZE. FIX: Support for old name SQL_MAX_JOIN_SIZE is removed in MySQL 5.6 and is renamed as MAX_JOIN_SIZE.So the errmsg.txt and mysql.cc files have been updated and the corresponding result files have also been updated.
| | * | | | | merge from 5.1 mainBjorn Munch2011-09-261-2/+4
| | |\ \ \ \ \
| | | * \ \ \ \ Manual merge from mysql-5.1.Ramil Kalimullin2011-08-099-46/+29
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | merge 5.0-security => 5.1-securityTor Didriksen2011-07-151-2/+4
| | | |\ \ \ \ \
| | | | * | | | | Bug#12406055 BUFFER OVERFLOW OF VARIABLE 'BUFF' IN STRING::SET_REALTor Didriksen2011-07-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The buffer was simply too small. In 5.5 and trunk, the size is 311 + 31, in 5.1 and below, the size is 331 client/sql_string.cc: Increase buffer size in String::set(double, ...) include/m_string.h: Increase FLOATING_POINT_BUFFER mysql-test/r/type_float.result: New test cases. mysql-test/t/type_float.test: New test cases. sql/sql_string.cc: Increase buffer size in String::set(double, ...) sql/unireg.h: Move definition of FLOATING_POINT_BUFFER
| * | | | | | | | merge from 5.5 mainBjorn Munch2011-09-261-5/+15
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge from 5.5.16Daniel Fischer2011-09-211-5/+15
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | BUG#12929631 : Execute crashes with --verbose output (Windows) Chuck Bell2011-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch corrects an error encountered in PB where Windows machines are built in release mode have an extraneous parameter added in place of the --console option. This is caused by the insert of '(null' instead of an empty string. In non-debug mode, the string is explicitly set to an empty string. Patch also fixes a result mismatch on Windows machines.
| | | * | | | | | | | BUG#12929345 : Execution aborts without any messages (Windows only)Chuck Bell2011-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the length of the buffer in the strncat operation to prevent buffer overrun.
View Lorry Controller Status