summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* typos fixedserg@serg.mylan2005-03-031-2/+2
|
* Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2005-03-036-43/+94
|\ | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * uninit variable fixedserg@serg.mylan2005-03-031-1/+1
| |
| * Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)serg@serg.mylan2005-03-036-43/+94
| |
* | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0sergefp@mysql.com2005-02-281-1/+2
|\ \ | | | | | | | | | into mysql.com:/home/psergey/mysql-4.0-look
| * | Fix for BUG#7519: Index statistics is not displayed after ANALYZE for ↵sergefp@mysql.com2005-02-051-1/+2
| | | | | | | | | | | | | | | | | | | | | temporary tables: Call file->extra() with HA_STATUS_CONST in mysqld_show_keys. The fix will not be merged into 4.1/5.0 because they don't have this problem already.
* | | Merge mysql.com:/home/bkroot/mysql-4.0mats@mysql.com2005-02-235-14/+21
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/bk/b8412-mysql-4.0
| * \ \ Merge mysql.com:/home/bkroot/mysql-4.0mats@mysql.com2005-02-182-3/+6
| |\ \ \ | | |_|/ | |/| | | | | | into mysql.com:/home/bk/b7879-mysql-4.0
| | * | Bug#7879: Using TL_READ_NO_INSERT locks instead of TL_READ locks when mats@mysql.com2005-02-152-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | reading tables in "complex" SQL statements. If inserts happen in a table being read, the statements have no serialization order and the change can therefore not be reproduced on the slave.
| * | | Merge rurik.mysql.com:/home/igor/mysql-4.0igor@rurik.mysql.com2005-02-151-0/+1
| |\ \ \ | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
| | * | | delete.result, delete.test:igor@rurik.mysql.com2005-02-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #8392. sql_delete.cc: Fixed bug #8392. The bug caused a crash for a delete statement with ORDER BY that explicitly referred to the modified table.
| * | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2005-02-151-10/+13
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.0
| | * | | | Better bug fix for #5569: "Incorrect "Access Denied" error with SAME login ↵monty@mysql.com2005-02-151-10/+13
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DIFFERENT host" This fixes also the reverse lookup bug introduced by the previous patch
| * | | | InnoDB: Create temporary files in the MySQL tmpdir instead of $TMPDIR.marko@hundin.mysql.fi2005-02-151-1/+1
| |/ / / | | | | | | | | | | | | (Bug #5822)
* | | | Bug#8412: For replication to work correctly, the prologue and mats@mysql.com2005-02-141-1/+14
|/ / / | | | | | | | | | | | | epilogue to an SQL statement should not have an error code even when the SQL statement itself has an error code.
* | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2005-02-131-1/+1
|\ \ \ | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
| * | | Fixed mistyping (thnx to Konstantin)bell@sanja.is.com.ua2005-02-111-1/+1
| | | |
* | | | select.result:igor@rurik.mysql.com2005-02-111-7/+6
|/ / / | | | | | | | | | | | | | | | | | | After revision of the fix for bug #7520. table.cc: Revised the fix for bug #7520. Made it compliant with 5.0 code where the bug does not exist.
* | | select.result, select.test:igor@rurik.mysql.com2005-02-101-0/+1
| |/ |/| | | | | | | | | | | | | Added a test case for bug #7520. table.cc: Fixed bug #7520. The bug was caused by a wrong calculation of the field max_key_length for a TABLE structure when there was an index on a blob field.
* | Fix QUOTE() to not reuse the input field for output, which resulted injimw@mysql.com2005-02-012-10/+6
| | | | | | | | | | incorrect results when the input was a constant across a multi-row SELECT statement. (Bug #8248)
* | Merge mysql.com:/home/jimw/my/mysql-4.0-5569jimw@mysql.com2005-02-011-2/+3
|\ \ | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.0-clean
| * | Always call vio_in_addr() so that thd->remote isjimw@mysql.com2005-01-251-2/+3
| | | | | | | | | | | | always initialized. (Bug #5569)
* | | Remove #if 0 as this only confuses the code withing adding anythingmonty@mysql.com2005-02-011-6/+0
| | |
* | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2005-01-313-19/+116
|\ \ \ | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.0
| * | | Bug#7011acurtis@pcgem.rdg.cyberkinetica.com2005-01-303-19/+116
| | | | | | | | | | | | | | | | | | | | Fix replication for multi-update new test - rpl_multi_update2
* | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2005-01-284-9/+20
|\ \ \ \ | |/ / / |/| | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.0
| * | | InnoDB: Tolerate negative return values from ftell().marko@hundin.mysql.fi2005-01-271-9/+9
| | | |
| * | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2005-01-261-5/+8
| |\ \ \ | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.0
| * | | | InnoDB: Backport innodb_autoextend_increment from 4.1marko@hundin.mysql.fi2005-01-253-0/+11
| | | | |
* | | | | Merge mysql.com:/home/mydev/mysql-4.0ingo@mysql.com2005-01-261-5/+8
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | into mysql.com:/home/mydev/mysql-4.0-4000
| * | | | order_by.result, order_by.test:igor@rurik.mysql.com2005-01-251-5/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #7672. sql_yacc.yy: Fixed bug #7672. Made queries of the form (SELECT ...) ORDER BY ... to be equivalent to SELECT ... ORDER BY ...
* | | | Merge mysql.com:/home/mydev/mysql-4.0ingo@mysql.com2005-01-241-3/+10
|\ \ \ \ | |/ / / | | | | | | | | into mysql.com:/home/mydev/mysql-4.0-4000
| * | | select_found.result, select_found.test:igor@rurik.mysql.com2005-01-221-3/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Added a test case for bug #7945. sql_select.cc: Fixed bug #7945. If DISTINCT is used only with constants in a query with GROUP BY, we can apply an optimization that set LIMIT to 1 only in the case when there is no SQL_CALC_FOUND_ROWS.
* | | Merge mysql.com:/home/mydev/mysql-4.0ingo@mysql.com2005-01-201-1/+25
|\ \ \ | |/ / |/| | | | | into mysql.com:/home/mydev/mysql-4.0-4000
| * | BUG#6034 - Error code 124: Wrong medium type.ingo@mysql.com2005-01-191-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version for 4.0. Committed for merge. If the result table is one of the select tables in INSERT SELECT, we must not disable the result tables indexes before selecting. mysql_execute_command() detects the match for other reasons and adds the flag OPTION_BUFFER_RESULT to the 'select_options'. In this case the result is put into a temporary table first. Hence, we can defer the preparation of the insert table until the result is to be used.
* | | Merge mysql.com:/home/jimw/my/mysql-4.0-7700jimw@mysql.com2005-01-181-0/+1
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.0-clean
| * | | Fix over-optimization that could result in an unsigned double field beingjimw@mysql.com2005-01-171-0/+1
| | | | | | | | | | | | | | | | set to a negative value. (Bug #7700)
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0dlenev@mysql.com2005-01-181-7/+7
|\ \ \ \ | |_|/ / |/| | | | | | | into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
| * | | Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum()dlenev@mysql.com2005-01-181-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | macros. It does not fixes any bugs in 4.0. But it prevents from future error in any bugfixes that may use these macros. Also after merging into 4.1 tree this cleanup will fix bug #7884 "Able to add invalid unique index on TIMESTAMP prefix".
* | | | Anoter fix for moved IO_CACHE objectmonty@mysql.com2005-01-181-0/+3
| | | |
* | | | Fixed possible access to unintialized memory in filesort when using many buffersmonty@mysql.com2005-01-151-0/+2
| |/ / |/| |
* | | ha_innodb.cc:heikki@hundin.mysql.fi2005-01-131-2/+7
| | | | | | | | | | | | Fix a theoretical hang over the adaptive hash latch in InnoDB if one runs INSERT ... SELECT ... (binlog not enabled), or a multi-table UPDATE or DELETE, and only the read tables are InnoDB type, the rest are MyISAM; this also fixes bug #7879 for InnoDB type tables
* | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2005-01-131-0/+2
|\ \ \ | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.0
| * | | InnoDB: Use system-supplied tmpfile() on Netware, as there is nomarko@hundin.mysql.fi2005-01-121-0/+2
| | | | | | | | | | | | | | | | open interface for setting the "delete-on-close" flag.
* | | | A fix for Bug#6761 "mysql_list_fields() does not work": testkonstantin@mysql.com2005-01-121-1/+1
| | | | | | | | | | | | | | | | case will be added to client_test in 4.1
* | | | Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2005-01-121-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | added missing Com_update_multi status variableserg@serg.mylan2005-01-121-0/+1
| | | |
* | | | Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]":guilhem@mysql.com2005-01-101-0/+2
| |_|/ |/| | | | | | | | | | | mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table() but fixing my_net_write() looked more future-proof.
* | | Make query_cache_wlock_invalidate visible in SHOW VARIABLES (Bug #7594)jimw@mysql.com2005-01-041-0/+2
| | |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0serg@sergbook.mysql.com2004-12-311-50/+50
|\ \ \ | |_|/ |/| | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0