summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-2033-2597/+6
| | | | | | | | | | | | | | | | | Remove some more leftovers from the initial removal: o Update relevant mentions of configure.in throughout the source code. o Remove win/configure.js, which at this point just duplicates logic already present in CMake based build system. o Remove support files which relied on the autotools build system. In any case, MySQL is no longer officially supported on SCO. o Remove files which are no longer part of the build.
* merge of 5.1-bugteamGuilhem Bichot2010-11-225-8/+19
|\
| * Fix for Bug#56138 "valgrind errors about overlapping memory when ↔Guilhem Bichot2010-11-225-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | double-assigning same variable", and related small fixes. mysql-test/t/user_var.test: test for bug sql/field_conv.cc: From the C standard, memcpy() has undefined behaviour if to->ptr==from->ptr sql/item_func.cc: In the case of BUG#56138, entry->value==ptr in which case memcpy() has undefined results per the C standard. sql/sql_select.cc: Work around a bug in old gcc
* | local mergeMarc Alff2010-11-21349-14777/+10348
|\ \
| * | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-20112-11348/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotools-based build system has been superseded and is being removed in order to ease the maintenance burden on developers tweaking and maintaining the build system. In order to support tools that need to extract the server version, a new file that (only) contains the server version, called VERSION, is introduced. The file contents are human and machine-readable. The format is: MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 MYSQL_VERSION_PATCH=8 MYSQL_VERSION_EXTRA=-rc The CMake based version extraction in cmake/mysql_version.cmake is changed to extract the version from this file. The configure to CMake wrapper is retained for backwards compatibility and to support the BUILD/ scripts. Also, a new a makefile target show-dist-name that prints the server version is introduced. VERSION: Add top-level version file. cmake/mysql_version.cmake: Get version information from the top-level VERSION file. Do not cache the version components (MAJOR_VERSION, etc). Add MYSQL_RPM_VERSION as a replacement for MYSQL_U_SCORE_VERSION.
| * | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-201-1/+1
| |\ \ | | |/
| | * Bug#57994: Compiler flag change build error : my_redel.cDavi Arnaut2010-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Although ICC identifies itself as GCC, even in version numbers, it does not support the stpcpy built-in. include/m_string.h: Work around ICC. Hacks...
| * | avoid useless system check on WindowsVladislav Vaintroub2010-11-201-0/+1
| | |
| * | mergeVladislav Vaintroub2010-11-2082-319/+1014
| |\ \
| | * | Bug#58190 BETWEEN no longer uses indexes for date or datetime fieldsAlexander Barkov2010-11-198-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced by WL#2649. Problem: queries with date/datetime columns did not use indexes: set names non_latin1_charset; select * from date_index_test where date_column between '2010-09-01' and '2010-10-01'; before WL#2649 indexes worked fine because charset of date/datetime columns was BINARY which always won. Fix: testing that collation of the operation matches collation of the field is only needed in case of "real" string data types. For DATE, DATETIME it's not needed. @ mysql-test/include/ctype_numconv.inc @ mysql-test/r/ctype_binary.result @ mysql-test/r/ctype_cp1251.result @ mysql-test/r/ctype_latin1.result @ mysql-test/r/ctype_ucs.result @ mysql-test/r/ctype_utf8.result Adding tests @ sql/field.h Adding new method Field_str::match_collation_to_optimize_range() for use in opt_range.cc to distinguish between "real string" types like CHAR, VARCHAR, TEXT (Field_string, Field_varstring, Field_blob) and "almost string" types DATE, TIME, DATETIME (Field_newdate, Field_datetime, Field_time, Field_timestamp) @ sql/opt_range.cc Using new method instead of checking result_type() against STRING result. Note: Another part of this problem (which is not regression) is submitted separately (see bug##58329).
| | * | Bug#58175 xml functions read initialized bytes when conversions happenAlexander Barkov2010-11-193-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: nr_of_decimals could read behind the end of the buffer in case of a non-null-terminated string, which caused valgring warnings. Fix: fixing nr_of_decimals not to read behind the "end" pointer. modified: @ mysql-test/r/xml.result @ mysql-test/t/xml.test @ sql/item.cc
| | * | Bug #58119: Typo in warning on log: [Warning] 'proxes_priv' entryGeorgi Kodinov2010-11-191-1/+1
| | | | | | | | | | | | | | | | Fixed a typo in an error message.
| | * | Bug #57559: Crash in Client plugin apiGeorgi Kodinov2010-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The plugin code was releasing the plugin and only then was reporting an error referencing it. Fixed by first reporting an error and then freeing up the plugin.
| | * | Bug #57551: Live upgrade fails between 5.1.52 -> 5.5.7-rcGeorgi Kodinov2010-11-194-25/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the server to treat a missing mysql.proxies_priv table as empty. Added some grants to make sure tables are correctly opened when they must be opened. Fixed a mysql_upgrade omission not adding rights to root to execute GRANT PROXY on other users. Removed a redundant CREATE TABLE from mysql_system_tables_fix.sql since it's always executed after mysql_system_tables.sql and the first file has CREATE TABLE in it. Added a test case for the above. Fixed error handling code to close the cursor
| | * | mergeGeorgi Kodinov2010-11-192-0/+2
| | |\ \
| | | * | Made tests clean up after themselves.Sven Sandberg2010-11-192-0/+2
| | | | |
| | * | | mergeGeorgi Kodinov2010-11-197-56/+35
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Bug #50021: Windows standard configuration files are showing Linux Georgi Kodinov2010-11-187-57/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options/settings 1. Changed the default value for socket on Windows to the windows default 2. Removed hard-coded trailing slashes from innodb_data_home_dir and innodb_log_group_name_dir. 3. Added extra backslashes to the innodb directory example 4. Made the tempdir platform "dependent" 5. Fixed the comments in the .ini files 6. Removed the tmpdir from the templates and the scripts
| | * | avoid compilation warning about incomplete switchBjorn Munch2010-11-191-0/+2
| | | |
| | * | null upmergeBjorn Munch2010-11-190-0/+0
| | |\ \ | | | |/
| | | * merge from 5.1-mtrBjorn Munch2010-11-193-5/+30
| | | |\
| | * | \ merge from 5.5-mtrBjorn Munch2010-11-1957-233/+619
| | |\ \ \
| | | * \ \ upmerge 58257Bjorn Munch2010-11-183-1/+14
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Bug #58257 mysqltest: in if(), ! $var with space is always falseBjorn Munch2010-11-173-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Evaluation would start with the space and thus ignore the $ Added while() to skip past white space
| | | * | | upmerge 58087Bjorn Munch2010-11-173-4/+17
| | | |\ \ \ | | | | |/ /
| | | | * | Bug #58087 mysqltest re-evaluates 'let' expressions infinitelyBjorn Munch2010-11-153-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Results from query is sent for evaluation Break recursion by asking for ` to be ignored
| | | * | | Tests: many if/while expresissons simplified after 57276Bjorn Munch2010-11-1753-182/+211
| | | | | |
| | | * | | Merge 5.5-bug58195 -> 5.5-mtrMagnus BlÄudd2010-11-151-2/+2
| | | |\ \ \
| | | | * | | Bug#58195 Make mysqltest poll for next epoch more oftenMagnus BlÄudd2010-11-151-2/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Speed up replicated NDB test by havin mysqltest poll every 100ms (instead of every second) in sync_master_with_slave. Default epoch timeout is 100ms, so that make sense.
| | | * | | Merge 5.5-bug58159 -> 5.5-mtrMagnus BlÄudd2010-11-151-6/+6
| | | |\ \ \
| | | | * | | Bug#58159 mtr.pl can't run out of source build with NDBMagnus BlÄudd2010-11-121-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use $bindir instead of $basedir when looking for binaries - NOTE! the $ENV{NDB_EXAMPLES_*} will be reworked so that mtr.pl does not need to set them up.
| | | * | | | null upmerge from 5.1-mtrBjorn Munch2010-11-140-0/+0
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | merge from 5.1 up to rev 3471Bjorn Munch2010-11-14130-602/+3116
| | | | |\ \ \
| | | * | \ \ \ merge from 5.5Bjorn Munch2010-11-14459-30155/+19148
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge from mysql-5.5.7-rc-releaseunknown2010-11-09465-30229/+19349
| | | | |\ \ \ \
| | | | | * \ \ \ Pull in fix from bug#47526 to solve bug#50047.Jonathan Perkin2010-10-141-4/+28
| | | | | |\ \ \ \
| | | | | | * | | | Bug#47526 unit.pl fails to execute binaries when using Test::Harness 3.10Magnus BlÄudd2010-01-041-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rewrite unit.pl so it prefers to use TAP::Harness directly. - Also add support for --verbose --noverbose
| | | | | * | | | | Fix typo, allow SVR4 packages to be built again.Jonathan Perkin2010-10-141-1/+1
| | | | | | | | | |
| | | * | | | | | | Bug #57276 mysqltest: add support for simple compares in if/while conditionsBjorn Munch2010-11-103-36/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added more parsing in do_block() Limitation: left operand must be variable Also changed var_set_int from 57036 to var_check_int Added tests to mysqltest.test Some tests can now be simplified but will take this later Updated after comments, now white space around operator not needed
| * | | | | | | | | Bug#58313: CMake stops with VS Express if -DBUILD_CONFIG=mysql_release.cmakeVladislav Vaintroub2010-11-202-10/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug : -DBUILD_CONFIG=mysql_release sets SIGNCODE parameter which requires singtool.exe (part of Windows SDK) in order to be able to sign the binaries ( only if valid certificate is found). However singtool is not a part of the SDK shipped with Visual Studio Express, so the build fails claiming missing singtools.exe Fix: Do not use SIGNCODE wiith VC Express. Also, fix broken nmake build (*.rc files could not be compiled due to ADD_DEFINITIONS contaning C/C++ compiler specific flags)
| * | | | | | | | mergeVladislav Vaintroub2010-11-19147-3050/+9226
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix tree name which was accidentally changedDmitry Lenev2010-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during the merge.
| | * | | | | | | | Merged recent change from mysql-5.5-bugteam intoDmitry Lenev2010-11-192-6/+6
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-5.5-runtime tree.
| | | * | | | | | | | Bug#57306 SHOW PROCESSLIST does not display string literals well.Alexander Barkov2010-11-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A post-patch fixing test failures on Windows. Host name in "SHOW PROCESSLIST" is displayed with port number for some reasons.
| | * | | | | | | | | Suppress false-positive uninitialized variable useDmitry Lenev2010-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warnings in Event_queue::get_top_for_execution_if_time() method which has caused -Werror build to fail.
| | * | | | | | | | | Fix for bug #57985 "ONLINE/FAST ALTER PARTITION can fail and Dmitry Lenev2010-11-193-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leave the table unusable". Failing ALTER statement on partitioned table could have left this table in an unusable state. This has happened in cases when ALTER was executed using "fast" algorithm, which doesn't involve copying of data between old and new versions of table, and the resulting new table was incompatible with partitioning function in some way. The problem stems from the fact that discrepancies between new table definition and partitioning function are discovered only when the table is opened. In case of "fast" algorithm this has happened too late during ALTER's execution, at the moment when all changes were already done and couldn't have been reverted. In the cases when "slow" algorithm, which copies data, is used such discrepancies are detected at the moment new table definition is opened implicitly when new version of table is created in storage engine. As result ALTER is aborted before any changes to table were done. This fix tries to address this issue by ensuring that "fast" algorithm behaves similarly to "slow" algorithm and checks compatibility between new definition and partitioning function by trying to open new definition after .FRM file for it has been created. Long term we probably should implement some way to check compatibility between partitioning function and new table definition which won't involve opening it, as this should allow much cleaner fix for this problem. mysql-test/r/partition_innodb.result: Added test for bug #57985 "ONLINE/FAST ALTER PARTITION can fail and leave the table unusable". mysql-test/t/partition_innodb.test: Added test for bug #57985 "ONLINE/FAST ALTER PARTITION can fail and leave the table unusable". sql/sql_table.cc: Ensure that in cases when .FRM for partitioned table is created without creating table in storage engine (e.g. during "fast" ALTER TABLE) we still open table definition. This allows to check that definition of created table/.FRM is compatible with its partitioning function.
| | * | | | | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtimeJon Olav Hauglid2010-11-1856-1163/+2387
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No conflicts
| | | * | | | | | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteamJon Olav Hauglid2010-11-1895-1882/+6702
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No conflicts
| | * | | | | | | | | In certain phases of query processing, a interrupted error mightDavi Arnaut2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be sent to a user even if its the connection that is actually being killed.
| | * | | | | | | | | Bug#58199 name_const in the having clause crashesMagne Mahre2010-11-183-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NAME_CONST(..) was used wrongly in a HAVING clause, and should have caused a user error. Instead, it caused a segmentation fault. During parsing, the value parameter to NAME_CONST was specified to be an uninitialized Item_ref object (it would be resolved later). During the semantic analysis, the object is tested, and since it was not initialied, the server seg.faulted. The fix is to check if the object is initialized before testing it. The same pattern has already been applied to most other methods in the Item_ref class. Bug was introduced by the optimization done as part of Bug#33546.