summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-10-261-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fixed bug #31663: if the FIELDS TERMINATED BY stringunknown2007-10-231-0/+7
| | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-communityunknown2007-11-091-5/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Cleanup: rename select_send::status to select_send::is_result_set_started.unknown2007-10-311-2/+8
| * | | | | | | | | | | | | | | In ha_delete_table, use a standard mechanism to intercept the error messageunknown2007-10-301-1/+2
| * | | | | | | | | | | | | | | Use an inline getter method (thd->is_error()) to query if there is an error unknown2007-10-301-1/+15
| * | | | | | | | | | | | | | | Merge lambda.weblab:/home/malff/TREE/mysql-5.1-baseunknown2007-10-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Rename: query_error -> is_slave_error.unknown2007-10-201-2/+9
* | | | | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmergeunknown2007-10-291-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-10-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge sunlight.local:/local_work/27216-bug-5.0-opt-mysqlunknown2007-09-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | / / / / / / / / / / / / | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Bug#30384: Having SQL_BUFFER_RESULT option in the CREATE .. KEY(..) .. SELECTunknown2007-09-211-1/+1
| | | |/ / / / / / / / / / /
| * | | | | | | | | | | | | Post-merge fix for Bug 21136, initial merge missed the modifications forunknown2007-09-281-1/+6
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationunknown2007-10-171-155/+374
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-08-311-22/+38
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix for BUG#25843: changing default database between PREPARE and EXECUTEunknown2007-08-311-22/+38
| * | | | | | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-08-301-5/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Cleanup-patch for BUG#25843: changing default database betweenunknown2007-08-301-5/+34
| * | | | | | | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-08-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-08-141-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarisunknown2007-08-131-2/+2
| * | | | | | | | | | | | | | Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplunknown2007-08-171-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Renaming RELAY_LOG_INFO and st_relay_log_info to follow coding standardsunknown2007-08-161-3/+2
| * | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-08-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.1unknown2007-08-041-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | sql_class.h:unknown2007-08-021-1/+2
| | | * | | | | | | | | | | | | Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysqlunknown2007-08-021-1/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.1-marvelunknown2007-08-031-30/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | / / / / / / / / / / / / | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-08-021-30/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Slow query log to file now displays queries with microsecond precissionunknown2007-07-301-30/+33
| * | | | | | | | | | | | | | | | Merge 50 -> 51 (-opt changesets)unknown2007-08-011-1/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-08-011-6/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-08-011-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-311-5/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-301-1/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Bug#24989: The DEADLOCK error is improperly handled by InnoDB.unknown2007-07-301-1/+29
| * | | | | | | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-08-011-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | (Pushing for Andrei)unknown2007-07-301-5/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | (pushing for Andrei)unknown2007-07-301-5/+1
| | | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-08-011-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | After-merge fixup.unknown2007-08-011-1/+0
| | * | | | | | | | | | | | | | | | | Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0unknown2007-08-011-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | / / / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect unknown2007-08-011-0/+3
| * | | | | | | | | | | | | | | | | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-07-311-6/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | A fix and a test case for Bug#24918 drop table and lock / inconsistentunknown2007-07-271-6/+18
| | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-07-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0unknown2007-07-201-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | WL#3984 (Revise locking of mysql.general_log and mysql.slow_log)unknown2007-07-271-0/+1
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-07-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtimeunknown2007-07-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |