summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Manual mergekonstantin@mysql.com2005-05-054-12/+31
|\
| * A fix and test case for Bug#9777 " Empty set returned by Prepared Statement ↵konstantin@mysql.com2005-05-052-6/+25
| | | | | | | | | | | | | | when it should return a non empty one" (see comments for the changed files for details).
| * Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2005-05-051-1/+1
| |\ | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| | * terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:kent@mysql.com2005-05-051-1/+1
| | | | | | | | | | | | Initial Metrowerks CodeWarrior compiler support
| * | Fig compiler error.jan@hundin.mysql.fi2005-05-051-0/+1
| | |
| * | Initial value for a auto_increment can now be set using ALTER TABLEjan@hundin.mysql.fi2005-05-041-3/+18
| | | | | | | | | | | | | | | AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This change is backported from 5.0 (Bug #7061).
| * | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2005-05-043-9/+141
| |\ \ | | |/ | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| * | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2005-05-033-1/+8
| |\ \ | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| * \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2005-05-021-4/+3
| |\ \ \ | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| | * \ \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1jan@hundin.mysql.fi2005-04-291-4/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-4.1
| | | * | | Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200).jan@hundin.mysql.fi2005-04-271-4/+3
| | | | | |
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-05-044-1/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * \ \ \ \ \ Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0bell@book.sanja.is.com.ua2005-05-034-1/+87
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0
| | * \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-04-309-24/+122
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
| | * | | | | | | postreview changesbell@sanja.is.com.ua2005-04-303-5/+8
| | | | | | | | |
| | * | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-04-303-356/+398
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
| | * \ \ \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-04-304-1/+84
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
| | | * | | | | | | | if outer refernce (identifier) was resolved with help of cache all ↵bell@sanja.is.com.ua2005-04-294-1/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subqueries and resolved item itseld have to be correctly marked as dependent (BUG#10041)
* | | | | | | | | | | Post-merge fixes for Bug#9096 "select doesn't return all matchedkonstantin@mysql.com2005-05-042-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | records if prepared statements is used" (see comments to the changed files).
* | | | | | | | | | | Manual merge of Bug#9096konstantin@mysql.com2005-05-033-7/+140
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2005-05-033-9/+141
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-4.1-9096-fresh
| | * | | | | | | | A fix and test case for Bug#9096 "select doesn't return all matched konstantin@mysql.com2005-05-033-9/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | records if prepared statements is used". This fix changes equality evaluation method of basic constants from by-name to by-value, thus effectively enabling use of parameter markers in some optimizations (constants propagation, evaluation of possible keys for query).
* | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-05-033-9/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-5.0-test-valgrind
| * \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-05-033-9/+25
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-5.0-test-valgrind
| | * | | | | | | | | | Fix for BUG#10244:sergefp@mysql.com2005-04-293-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make get_quick_select_for_ref() accept estimated # records as parameter and set QUICK_RANGE_SELECT::records, as this value is used to allocate buffers in Multi-Range Read.
* | | | | | | | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2005-05-031-0/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a value from innobase_repl_report_sent_binlog()
* | | | | | | | | | | Clean up merge from 4.1jimw@mysql.com2005-05-023-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9947jimw@mysql.com2005-05-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | | | | | | | | | Clean up error message for connections-per-hour user limitjimw@mysql.com2005-04-271-1/+1
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being exceeded. (Bug #9947)
| * | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9761jimw@mysql.com2005-05-021-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | | | | | | | | | Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_namesjimw@mysql.com2005-04-281-0/+2
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is set on case-sensitive file systems and the source table was specified in something other than lowercase. (Bug #9761)
| * | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1jimw@mysql.com2005-05-021-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| | * | | | | | | | | Manually resolve mergejimw@mysql.com2005-04-291-0/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix crash in embedded server due to incorrect storage of resultsjimw@mysql.com2005-03-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the query cache. (Bug #9549)
* | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-05-0112-381/+521
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/psergey/mysql-4.1-bug9228sergefp@mysql.com2005-05-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | into mysql.com:/home/psergey/mysql-5.0-bug10274-merge
| | * | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-05-011-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9228
| | | * | | | | | | | | | Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions ↵sergefp@mysql.com2005-04-301-1/+1
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about relative sizes of int/long/longlong.
| * | | | | | | | | | | Merge with 4.1monty@mysql.com2005-04-307-15/+101
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-04-305-27/+109
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | | * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-04-291-0/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into moonbone.local:/usr/src/mysql-4.1
| | | | * | | | | | | | Fix bug #9703 "Error 1032 with GROUP BY query and large tables"evgen@moonbone.local2005-04-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset old error if tmp table was successfully created. Test data is large and can be found in bug report along with test query.
| | | * | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-292-22/+79
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | | | * \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-04-292-22/+79
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
| | | * | | | | | | | | | Merge mysql.com:/home/mydev/mysql-4.1ingo@mysql.com2005-04-291-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100
| | | | * | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-281-1/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9298
| | | | | * \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-271-20/+55
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9298
| | | | | * \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-271-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9298
| | | | | | * \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-04-271-1/+1
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-bug9298
| | * | | | | | | | | | | | | | | CAST(string_argument AS UNSIGNED) didn't work for big integers above the ↵monty@mysql.com2005-04-295-8/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signed range. (Bug #7036) Produce warnings of wrong cast of strings to signed/unsigned. Don't block not resolved IP's if DNS server is down (Bug #8467) Fix compiler problems with MinGW (Bug #8872)
View Lorry Controller Status