summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* typo fixed: s/MSYQL/MYSQL/Sergei Golubchik2016-12-035-17/+17
|
* MDEV-11171 Assertion `m_cpp_buf <= ptr && ptr <= m_cpp_buf + m_buf_length' ↵Alexander Barkov2016-11-283-1/+20
| | | | failed in Lex_input_stream::body_utf8_append(const char*, const char*)
* Restore MY_WME flag for my_pread in read_ddl_log_entry, fix errors in buildbotVladislav Vaintroub2016-11-141-1/+1
|
* Fixed bug mdev-11161.Igor Babaev2016-11-113-0/+139
| | | | | | | The flag TABLE_LIST::fill_me must be reset to false at the prepare phase for any materialized derived table used in the executed query. Otherwise if the optimizer decides to generate a key for such a table it is generated only for the first execution of the query.
* MDEV-11248 Fix passing offset parameter to my_file_pread in ↵Vladislav Vaintroub2016-11-101-2/+2
| | | | read_ddl_log_file_entry
* MDEV-11214 Windows : MSI installation fails, if run by a service user (e.g ↵Vladislav Vaintroub2016-11-031-1/+16
| | | | | | | | LocalSystem) Skip permission for data directory for LogonUser, if installation runs by one of the service accounts (determined from their well-known SID). There is no real LogonUser in this case.
* MDEV-11157 Windows - Upgrade installer to use HeidiSQL 9.4Vladislav Vaintroub2016-10-272-4/+12
|
* VS2015 build fixesVladislav Vaintroub2016-10-272-1/+2
| | | | | | - new location of signtool - silence a nonsensical warning from stl header (complain about noexcept() function attribute, if /EHsc is not set)
* MDEV-9409 Windows - workaround VS2015 CRT bug that makesVladislav Vaintroub2016-10-272-6/+28
| | | | | | | | | | | mysqldump/mysql_install_db.exe fail The bug is described in https://connect.microsoft.com/VisualStudio/Feedback/Details/1902345 When reading from a pipe in text mode, using CRT function such as fread(), some newlines may be lost. Workaround is to use binary mode on reading side and if necessary, replace \r\n with \n.
* bump the VERSIONDaniel Bartholomew2016-10-171-1/+1
|
* MDEV-11069 main.information_schema test fails if hostname includes 'user'Elena Stepanova2016-10-172-8/+8
| | | | Patch provided by Honza Horak
* compilation warning after xtradb mergemariadb-5.5.53Sergei Golubchik2016-10-141-1/+1
|
* mysqldump: comments and identifiers with new linesSergei Golubchik2016-10-143-17/+207
| | | | don't let identifiers with new lines to break a comment
* mysqltest: don't eat new lines in --execSergei Golubchik2016-10-145-19/+15
| | | | pass them through as is
* mysql cli: fix USE command quotingSergei Golubchik2016-10-133-26/+46
| | | | | | * use proper sql quoting rules for USE, while preserving as much of historical behavior as possible * short commands (\u) behave as before
* Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-10-1311-50/+179
|\
| * 5.5.52-38.3Sergei Golubchik2016-10-1311-46/+179
| |
* | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-10-1311-122/+274
|\ \
| * | Bug #24740291: YASSL UPDATE TO 2.4.2mysql-5.5.53Robert Golebiowski2016-09-2811-122/+274
| | |
| * | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BEArun Kuruvila2016-09-2829-37/+786
| | | | | | | | | | | | | | | | | | | | | | | | | | | RESTRICTED IN ALL GA RELEASES Back port of WL#6782 to 5.5 and 5.6. This also includes back port of Bug#20771331, Bug#20741572 and Bug#20770671. Bug#24695274 and Bug#24679907 are also handled along with this.
| * | Merge branch 'mysql-5.5.52-release' into mysql-5.5.53-releaseNawaz Nazeer Ahamed2016-09-2614-78/+258
| |\ \
| * | | Raise version number after cloning 5.5.52Balasubramanian Kandasamy2016-08-081-1/+1
| | | |
* | | | mysqld_safe: close stdout and stderrSergei Golubchik2016-09-292-2/+6
| | | | | | | | | | | | | | | | | | | | when they're not needed anymore. Helps when daemonizing it from mysql.init
* | | | Feedback plugin : add support for Windows 10 / Server 2016.Vladislav Vaintroub2016-09-281-2/+11
| | | | | | | | | | | | | | | | Also add fallback version string for unknown future versions.
* | | | MDEV-10907 MTR and server writes can interleave in the error logVladislav Vaintroub2016-09-273-8/+56
| | | | | | | | | | | | | | | | | | | | Ensure atomic appends to the error log by using CreateFile with FILE_APPEND_DATA flag to open error log file (both MTR and server)
* | | | MDEV-10441 Document the server_audit_loc_info variableSergei Golubchik2016-09-264-93/+69
| | | | | | | | | | | | | | | | | | | | fix PLUGIN_VAR_NOSYSVAR | PLUGIN_VAR_NOCMDOPT plugin thdvars to work. use that for server_audit_loc_info
* | | | Windows , mtr : allow cdb to print core dumps also if --parallel > 1Vladislav Vaintroub2016-09-261-5/+1
| | | |
* | | | report correct write error on log writesSergei Golubchik2016-09-261-1/+1
| | | |
* | | | MDEV-10725 Server 10.1.17 fails to build using clang with c++11Sergei Golubchik2016-09-262-5/+4
| | | | | | | | | | | | | | | | | | | | my_offsetof() returns a difference of two pointers, it must use the appropriate return type (my_ptrdiff_t, not size_t)
* | | | Fix free() after my_malloc() (should be my_free()).Kristian Nielsen2016-09-241-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
* | | | bump the VERSIONDaniel Bartholomew2016-09-131-1/+1
| | | |
* | | | fix BIGINT+MEDIUMINT type aggregationmariadb-5.5.52Sergei Golubchik2016-09-123-1/+28
| | | |
* | | | don't use my_copystat in the serverSergei Golubchik2016-09-124-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it was supposed to be used in command-line tools only. Different fix for 4e5473862e: Bug#24388746: PRIVILEGE ESCALATION AND RACE CONDITION USING CREATE TABLE
* | | | missing element in prelocked_mode_name[] arraySergei Golubchik2016-09-122-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | different fix for a63a250d40: BUG#23509275 :DBUG_PRINT in THD::decide_logging_format prints incorrectly, access out-of-bound
* | | | potential signedness issueSergei Golubchik2016-09-124-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | different fix for 07a33cdcef: Bug #23296299 : HANDLE_FATAL_SIGNAL (SIG=11) IN MY_TOSORT_UTF32
* | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-09-118-288/+25
|\ \ \ \ | | |/ / | |/| | | | | | 80% reverted
| * | | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFEmysql-5.5.52Terje Rosten2016-08-261-2/+2
| | | | | | | | | | | | | | | | Post push fix: Solaris 10 /bin/sh don't understand $().
| * | | Bug#24388753: PRIVILEGE ESCALATION USING MYSQLD_SAFESivert Sorumgard2016-08-254-11/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [This is the 5.5/5.6 version of the bugfix]. The problem was that it was possible to write log files ending in .ini/.cnf that later could be parsed as an options file. This made it possible for users to specify startup options without the permissions to do so. This patch fixes the problem by disallowing general query log and slow query log to be written to files ending in .ini and .cnf.
| * | | Bug#24388746: PRIVILEGE ESCALATION AND RACE CONDITION USING CREATE TABLEJon Olav Hauglid2016-08-256-32/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During REPAIR TABLE of a MyISAM table, a temporary data file (.TMD) is created. When repair finishes, this file is renamed to the original .MYD file. The problem was that during this rename, we copied the stats from the old file to the new file with chmod/chown. If a user managed to replace the temporary file before chmod/chown was executed, it was possible to get an arbitrary file with the privileges of the mysql user. This patch fixes the problem by not copying stats from the old file to the new file. This is not needed as the new file was created with the correct stats. This fix only changes server behavior - external utilities such as myisamchk still does chmod/chown. No test case provided since the problem involves synchronization with file system operations.
| * | | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFETerje Rosten2016-08-254-35/+50
| |/ / | | | | | | | | | | | | | | | | | | Argument to malloc-lib must be included in restricted list of directories, symlink guards added, and mysqld and mysqld-version options restricted to command line only. Don't redirect errors to stderr.
| * | Bug#23540182:MYSQLBINLOG DOES NOT FREE THE EXISTING CONNECTION BEFORE ↵Neha Kumari2016-08-051-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OPENING NEW REMOTE ONE It happens when you are trying to read two or more log files from a remote server using mysqlbinlog utility. The reason for this is no matching mysql_close() that concludes the life time of 'mysql' struct describing connection to the server. This happens when mysqlbinlog is invoked with connecting to the server and requesting more than one binlog file. In such case dump_remote_log_entries() keeps calling safe_connect() per eachfile, never caring to invoke mysql_close(). Only the final safe_connect()'s allocation effect are cleaned by the base code. That is with 2 files there's one 'mysql' connection descriptor struct uncleaned/deallocated. We are backporting the bug 21255763 (pushed in mysql-trunk) in the earlier version of MySQL starting from 5.5 to 5.7. which was pushed in mysql-trunk. Fix: Invoke mysql_close() just before mysql_init() in safe_connect() defined in mysqlbinlog.cc. That makes possibly previously used 'mysql' be reclaimed prior a new one is allocated.
| * | Bug #19984392 : MEDIUMINT: STACK BUFFER OVERFLOW IN PROTOCOL_TEXT::STORE_LONGKailasnath Nagarkar2016-08-041-1/+1
| | | | | | | | | | | | Reverting the patch due to some issues.
| * | Bug #19984392 : MEDIUMINT: STACK BUFFER OVERFLOW IN PROTOCOL_TEXT::STORE_LONGKailasnath Nagarkar2016-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ISSUE: Queries with mediumint as column when operated with long long type of data results in buffer overflow in store_long function. The merging rule specified for (MYSQL_TYPE_LONGLONG MYSQL_TYPE_INT24) is MYSQL_TYPE_LONG. Due to this store_long function was getting called which resulted in buffer overflow. SOLUTION: The correct merging rule for (MYSQL_TYPE_LONGLONG, MYSQL_TYPE_INT24) should be MYSQL_TYPE_LONGLONG. So, instead of function store_long, function store_longlong is called which correctly handles the type MYSQL_TYPE_LONGLONG. External Bug #23645238 is a duplicate of this issue.
| * | Bug #24380263: INCORRECT BEHAVIOR WITH PARAMETER ANDSreeharsha Ramanavarapu2016-08-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DERIVED TABLE IN JOIN ISSUE: ------ This problem occurs under the following conditions: 1) A parameter is used in the select-list of a derived table. 2) The derived table is part of a JOIN. SOLUTION: --------- When a derived table is materialized, a temporary table is created. This temporary table creates a field each for the items in the select-list of the derived table. This set of fields is later used to setup the join. Currently no field is created in the temporary table if a parameter is used in the select-list. Create a field for the parameter. By default Item_param's result type in a prepared statement is set to STRING_RESULT. This can change during the execute phase depending on the user variable. But since the execute phase creates its own temporary table, it will be handled separately. This is a backport of the fix for BUG#22392374.
| * | Merge branch 'mysql-5.5.51-release' into mysql-5.5Nawaz Nazeer Ahamed2016-07-290-0/+0
| |\ \
| * | | BUG#23509275 :DBUG_PRINT in THD::decide_logging_format prints incorrectly, ↵Neha Kumari2016-07-252-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access out-of-bound Problem: In debug builds, there is a chance that an out-of-bounds read is performed when tables are locked in LTM_PRELOCKED_UNDER_LOCK_TABLES mode. It can happen because the debug code uses enum values as index for an array of mode descriptions, but it only takes into consideration 3 out of 4 of the enum values. Fix: This patch fixes it by implementing a getter for the enum which returns a string representation of the enum, effectively removing the out-of-bounds read. Moreover, it also fixes the lock mode descriptions that would be print out in debug builds.
| * | | BUG#23703568 - IS CLIENT LIBRARY SUPPOSED TO RETRY EINTR INDEFINITELY OR NOTThayumanavar S2016-07-251-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit#ebd24626ca38e7fa1e3da2acdcf88540be70fabe obsoleted the THREAD and THREAD_SAFE_CLIENT preprocessor symbols. This is not removed in the sql/net_serv.cc thereby the code that retries on EINTR became dead code. Remove the THREAD_SAFE_CLIENT preprocessor directive form sql/net_serv.cc. Also check errno for EINTR only if there is an error in preceding read call.
| * | | Bug #23295288: HANDLE_FATAL_SIGNAL (SIG=11) INArun Kuruvila2016-07-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GET_SERVER_FROM_TABLE_TO_CACHE Description:- Server received SIG11 in the function, "get_server_from_table_to_cache()". Analysis:- Defining a server with a blank name is not handled properly. Fix:- Modified "get_server_from_table_to_cache()" to take care of blank server name.
| * | | Bug #23280699: MYSQLD GOT SIGNAL 11 IN IS_NULL ON SELECTSreeharsha Ramanavarapu2016-07-223-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FROM I_S Issue: ------ There is a difference in the field type created when the following DDLs are used: 1) CREATE TABLE t0 AS SELECT NULL; 2) CREATE TABLE t0 AS SELECT GREATEST(NULL,NULL); The first statement creates field of type Field_string and the second one creates a field of type Field_null. This creates a problem when the query mentioned in this bug is used. Since the null_ptr is calculated differently for Field_null. Solution: --------- When there is a function returning null in the select list as mentioned above, the field should be of type Field_string. This was fixed in 5.6+ as part of Bug#14021323. This is a backport to mysql-5.5. An incorrect comment in innodb_bug54044.test has been corrected in all versions.
| * | | Bug#23280059: ITEM_ROW::ILLEGAL_METHOD_CALL(CONST CHAR*):Chaithra Gopalareddy2016-07-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASSERTION `0' FAILED ON SELECT AREA Problem: Optimizer tries to get the points to calculate area without checking the return value of uint4korr for 0 "points". As a result server exits. Solution: Check the return value from uint4korr().