summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed wrong error message from federatedx (which could lead to assert in ↵Michael Widenius2010-07-163-8/+5
| | | | | | | | | | | DBUG code) mysql-test/suite/federated/federated_server.result: Update to new error message mysql-test/suite/federated/federated_server.test: Update to new error message storage/federatedx/ha_federatedx.cc: Return real error code, not 0, as in some cases before.
* mysql client: Ignore --comments at start of command line. This allows one to ↵Michael Widenius2010-07-165-7/+181
| | | | | | | | | | | | | | | | | | | more easily run mysqltest tests trough the command line. Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table client/mysql.cc: Removed Oracle copyright from stdout, as Oracle doesn't have copyright to all code in this file. Ignore --comments at start of command line. This allows one to more easily run mysqltest tests trough the command line. mysql-test/suite/maria/r/optimize.result: Added test for LP#603026 mysql-test/suite/maria/t/optimize.test: Added test for LP#603026 sql/net_serv.cc: Removed DBUG_ASSERT(), as this code can happen during testing. storage/maria/ma_check.c: Fixed bug: LP#603026 RQG: pagecache_read: Assertion `pageno < ((1ULL) << 40)' on OPTIMIZE TABLE of a Maria table The problem was duplicated memory usage with long packed keys.
* Add 64 bit packages to the pack script. 32 bit is still the defaultBo Thorsen2010-07-071-5/+56
|
* Fix bug 600744Bo Thorsen2010-07-022-5/+7
|
* bug lp:578117 - Wrong usage of mutex LOCK_sync and LOCK_active in XASergei Golubchik2010-07-013-60/+77
| | | | redone locking in TC_LOG_MMAP::log_xid
* Remove the file libmysqld.exp from the installerBo Thorsen2010-07-011-2/+0
|
* Hardcode the build path for the installer temporarilyBo Thorsen2010-07-012-6/+2
|
* Fix cpack runBo Thorsen2010-07-012-1/+6
|
* Install MariaDB as a service with the installerBo Thorsen2010-06-302-0/+998
|
* Install MTR and SQL-bench with CPack and NSISBo Thorsen2010-06-291-2/+44
|
* Install the files for the embedded serverBo Thorsen2010-06-282-2/+10
|
* Install the storage engine pluginsBo Thorsen2010-06-281-0/+2
|
* Fix a loop and install more script files. Renames the perlscripts component ↵Bo Thorsen2010-06-282-7/+11
| | | | to scripts, since it now also has sql scripts.
* Fix installing the localized error messages with cpackBo Thorsen2010-06-281-6/+6
|
* Implement an NSIS based installerBo Thorsen2010-06-2514-0/+114
|
* Fixed trival bug introduced in last patch (buffer was not extended)Michael Widenius2010-06-231-1/+5
|
* Fixes for Opensolaris (to get buildbot green)Michael Widenius2010-06-237-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed memory leaks in mysqldump - Fixed printf of NULL which caused crashes on OpenSolaris when using --debug - Fixed realloc() problem that caused out of memory when running mysqldump.test on OpenSolaris client/mysqldump.c: Fixed memory leaks Fixed printf of NULL which caused crashes on OpenSolaris when using --debug client/mysqltest.cc: Fixed printf of NULL which caused crashes on OpenSolaris when using --debug include/my_global.h: Added simple macro val_or_null() to simplify detecting of NULL strings for printf sql/handler.cc: Fixed printf of NULL which caused crashes on OpenSolaris when using --debug sql/sql_db.cc: Fixed printf of NULL which caused crashes on OpenSolaris when using --debug Removed testing of 'new_db_name' as this is guranteed never NULL sql/sql_show.cc: Fixed printf of NULL which caused crashes on OpenSolaris when using --debug storage/csv/ha_tina.cc: Fixed realloc() problem that caused out of memory when running mysqldump.test on OpenSolaris (OpenSolaris default malloc() can't handle a lot of reallocs() of strings that are growing one byte at a time) This did speed up logging to cvs with a magnitude for large strings.
* Fixed compiler warningsMichael Widenius2010-06-165-9/+11
| | | | | | | | | | | | | sql/log_event.cc: Fixed compiler warning on windows storage/maria/ma_state.c: Fixed compiler warning storage/maria/maria_chk.c: Fixed compiler warning storage/myisam/mi_dynrec.c: Fixed compiler warning support-files/compiler_warnings.supp: Fixed suppression rule
* Don't flush pinned pages in checkpoint (fix for my last push)Michael Widenius2010-06-162-12/+103
| | | | | | storage/maria/unittest/ma_pagecache_single.c: Check if we can flush write locked page for normal flush Check that we can't flush read locked page with FLUSH_KEEP_LAZY (used by checkpoint)
* mergedSergei Golubchik2010-06-1418-65/+220
|\
| * mysqltest: use setenv, not putenv, to make gcov happy.Sergei Golubchik2010-06-141-13/+31
| | | | | | | | (backport from MySQL)
| * Remove a warning on Windows. There is no CMakeLists.txt in the unittest ↵Bo Thorsen2010-06-141-1/+0
| | | | | | | | examples dir
| * Fixed some bugs in the Maria storage engineMichael Widenius2010-06-1417-52/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed default recovery mode from OFF to NORMAL to get automatic repair of not properly closed tables. - Fixed a rase condition when two threads calls external_lock and thr_lock() in different order. When this happend the transaction that called external lock first and thr_lock() last did not see see the rows from the other transaction, even if if it had to wait in thr_lock() for other to complete. - Fixed that one can run maria_chk on an automatcally recovered tables without warnings about too small transaction id - Don't give warning that crashed table could not be repaired if repair was disabled (and thus not run) - Fixed a error result from flush_key_cache() which caused a DBUG_ASSERT() when one was using concurrent reads on non transactional tables that was updated. client/mysqldump.c: Add "" around error message to make it more readable client/mysqltest.cc: Free environment variables mysql-test/r/mysqldump.result: Updated results mysql-test/r/openssl_1.result: Updated results mysql-test/suite/maria/r/maria-recover.result: Updated results mysql-test/suite/maria/r/maria3.result: Updated results mysql-test/suite/maria/t/maria3.test: Added more test of temporary tables storage/maria/ha_maria.cc: Changed default recovery mode from OFF to NORMAL to get automatic repair of not properly closed tables. Start transaction in ma_block_get_status() instead of in ha_maria::external_lock(). - This fixes a rase condition when two threads calls external lock and thr_lock() in different order. When this happend the transaction that called external lock first and thr_lock() last did not see see the rows from the other transaction, even if if it had to wait in thr_lock() for other to complete. Store latest transaction id in controll file if recovery was done. - This allows one to run maria_chk on an automatcally recovered tables without warnings about too small transaction id storage/maria/ha_maria.h: Don't give warning that crashed table could not be repaired if repair was disabled (and thus not run) storage/maria/ma_blockrec.h: Added new function "_ma_block_get_status_no_versioning()" storage/maria/ma_init.c: Added hook to create trn in ma_block_get_status() if we are using MariaDB storage/maria/ma_open.c: Ensure we call _ma_block_get_status_no_versioning() for transactional tables without versioning (like tables with fulltext) storage/maria/ma_pagecache.c: Allow one to flush blocks that are pinned for read. This fixed a error result from flush_key_cache() which caused a DBUG_ASSERT() when one was using concurrent reads on non transactional tables that was updated. storage/maria/ma_recovery.c: Set maria_recovery_changed_data to 1 if recover changed something. Set max_trid_in_control_file to max found trn if we found a bigger trn. The allows will ensure that the control file is up to date after recovery which allows one to run maria_chk on the tables without warnings about too big trn storage/maria/ma_state.c: Call maria_create_trn_hook() in _ma_setup_live_state() instead of ha_maria::external_lock() This ensures that 'state' and trn are in sync and thus fixes the race condition mentioned for ha_maria.cc storage/maria/ma_static.c: Added maria_create_trn_hook() and maria_recovery_changed_data storage/maria/maria_def.h: Added MARIA_HANDLER->external_ptr, which is used to hold MariaDB thd. Added some new external variables Removed reference to non existing function: maria_concurrent_inserts()
* | mtr: when applying @opt_extra_mysqld_opt for --help,Sergei Golubchik2010-06-141-1/+3
|/ | | | | filter out --binlog-format - it makes mysqld to fail without --log-bin, and we don't need either anyway for --help to work.
* ugly-ugly. $with_plugin_innobase was hard-coded in configure.in inSergei Golubchik2010-06-101-1/+2
|
* fixed for mysql-test-run toSergei Golubchik2010-06-1030-299/+208
| | | | | | | * fully support --mysqld=--plugin-load=xxxx * uniformly support all loadable plugins, no need to hard-code every new plugin in mtr * autodetect MTR_VS_CONFIG on windows
* allow federated and innodb_plugin to be builtSergei Golubchik2010-06-0910-38/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage/federated/Makefile.am: federated needs functions from mysys/string.c. mysqld does not use them, so they don't get into the binary. storage/federated/plug.in: enable federated again. remove it from all configurations. storage/federatedx/Makefile.am: federatedx is now called federatedx in configure storage/federatedx/ha_federatedx.cc: federatedx is now called federatedx in configure storage/federatedx/plug.in: federatedx is now called federatedx in configure storage/innodb_plugin/plug.in: enable innodb plugin again. remove it from all configurations. storage/xtradb/CMakeLists.txt: xtradb is now called xtradb in configure, and builds libxtradb.a and ha_xtradb.so storage/xtradb/Makefile.am: xtradb is now called xtradb in configure, and builds libxtradb.a and ha_xtradb.so storage/xtradb/handler/ha_innodb.cc: xtradb is now called xtradb in configure, and builds libxtradb.a and ha_xtradb.so storage/xtradb/plug.in: xtradb is now called xtradb in configure, and builds libxtradb.a and ha_xtradb.so
* fix questionable UNIV_EXPECT's in the xtradb that confused old gcc.Sergei Golubchik2010-06-091-4/+4
|
* Automerge MariaDB 5.1.47 release into main.unknown2010-05-311855-11422/+994656
|\
| * Fixed compiler warningsMichael Widenius2010-05-2710-1917/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing test innodb.innodb-autoinc.test Enabled innodb test suite mysql-test/mysql-test-run.pl: Enabled innodb test suite mysql-test/r/innodb-autoinc.result: Removed test as it exists in suite innodb mysql-test/suite/innodb/t/disabled.def: Removed innodb-autoinc mysql-test/suite/innodb/t/innodb-autoinc.test: Update to be able to run with plugin mysql-test/t/innodb-autoinc.test: Removed test as it exists in suite innodb sql/filesort.cc: Removed not used variable sql/slave.cc: Remove compiler warnings storage/pbxt/src/ha_pbxt.cc: Removed not used variable storage/xtradb/dict/dict0crea.c: Fixed compiler warning about unsigned comparison support-files/compiler_warnings.supp: Disable some not relevant warnings
| * Added macros to inform valgrind that memory is uninitializedMichael Widenius2010-05-265-11/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | include/Makefile.am: Make my_valgrind.h global (as it's used by my_global.h) include/my_global.h: Include my_valgrind.h include/my_sys.h: TRASH() moved to my_valgrind.h include/my_valgrind.h: Add VALGRIND defines to mark memory mysys/my_alloc.c: Mark internal freed memory as undefined
| * Resolve bzr conflictsMichael Widenius2010-05-262-4/+50
| | | | | | | | | | storage/pbxt/src/ha_pbxt.cc: LOCK_plugin is not locked anymore as part of plugin initialization
| * Merge with MySQL 5.1.47Michael Widenius2010-05-26309-5067/+7466
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some bugs introduced in 5.1.47 Disabled some tests until we have merged with latest Xtradb configure.in: Added testing if valgrind/memcheck.h exists storage/pbxt/src/ha_pbxt.cc: LOCK_plugin is not anymore locked in init
| | * MergeKaren Langford2010-05-063-13/+21
| | |\
| | | * btr_page_split_and_insert(): Correct the fix of Bug #52964.Marko Mäkelä2010-05-041-1/+9
| | | | | | | | | | | | | | | | When split_rec==NULL, choose the correct node pointer key (first_rec).
| | | * buf_zip_decompress(): Allow BUF_NO_CHECKSUM_MAGIC as the stamped checksum.Marko Mäkelä2010-05-032-12/+12
| | | | | | | | | | | | | | | | | | | | buf_page_get_gen(): Assert that buf_zip_decompress() succeeds. Callers are not prepared for a NULL return value. (Bug #53248)
| | * | tree name changeGeorgi Kodinov2010-05-051-1/+1
| | |\ \
| | | * \ mergeGeorgi Kodinov2010-05-051-2/+2
| | | |\ \
| | | | * | Raise version number after cloning 5.0.91unknown2010-05-031-2/+2
| | | | | |
| | | | * | tree name changeGeorgi Kodinov2010-05-011-1/+1
| | | | | |
| | | * | | tree name changeGeorgi Kodinov2010-05-051-1/+1
| | | | | |
| | * | | | On behalf of Kristofer :Georgi Kodinov2010-05-055-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#53417 my_getwd() makes assumptions on the buffer sizes which not always hold true The mysys library contains many functions for rewriting file paths. Most of these functions makes implicit assumptions on the buffer sizes they write to. If a path is put in my_realpath() it will propagate to my_getwd() which assumes that the buffer holding the path name is greater than 2. This is not true in cases. In the special case where a VARBIN_ITEM is passed as argument to the LOAD_FILE function this can lead to a crash. This patch fixes the issue by introduce more safe guards agaist buffer overruns.
| | * | | | merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2010-05-042-0/+55
| | |\ \ \ \
| | | * | | | BUG#43407 SET GLOBAL SQL_SLAVE_SKIP_COUNTER should log previous state in ↵Alfranio Correia2010-05-041-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error log When issuing a 'SET GLOBAL SQL_SLAVE_SKIP_COUNTER' statement, the previous position along with the new position is dumped into the error log. Namely, the following information is printed out: skip_counter, group_relay_log_name and group_relay_log_pos.
| | | * | | | BUG#43406 CHANGE MASTER TO should log previous state in error logAlfranio Correia2010-05-041-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When issuing a 'CHANGE MASTER TO' statement, key elements of the previous state, namely the host, port, the master_log_file and the master_log_pos are dumped into the error log.
| | * | | | | Updates to README file of the 'engines' test suitesOmer BarNir2010-05-041-6/+6
| | | | | | |
| | * | | | | Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants.Georgi Kodinov2010-05-049-8/+138
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the 5.1 merge and extension of the fix. The server was happily accepting paths in table name in all places a table name is accepted (e.g. a SELECT). This allowed all users that have some privilege over some database to read all tables in all databases in all mysql server instances that the server file system has access to. Fixed by : 1. making sure no path elements are allowed in quoted table name when constructing the path (note that the path symbols are still valid in table names when they're properly escaped by the server). 2. checking the #mysql50# prefixed names the same way they're checked for path elements in mysql-5.0.
| | | * | | Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants.Georgi Kodinov2010-05-032-0/+49
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The server was not checking the supplied to COM_FIELD_LIST table name for validity and compliance to acceptable table names standards. Fixed by checking the table name for compliance similar to how it's normally checked by the parser and returning an error message if it's not compliant.
| | * | | AutomergeKristofer Pettersson2010-05-03230-6993/+4199
| | |\ \ \
| | | * \ \ merged 5.1-innodb Georgi Kodinov2010-05-01230-6993/+4199
| | | |\ \ \ | | | | | |/ | | | | |/|