summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
Commit message (Expand)AuthorAgeFilesLines
* merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-77/+159
|\
| * Bug#40657: assertion with out of range variables and traditional sql_modeTatiana A. Nurnberg2009-03-111-2/+3
| * manual mergeTatiana A. Nurnberg2009-03-061-1/+12
| |\
| | * BUG#41980 SBL, INSERT .. SELECT .. LIMIT = ERROR, even when @@SQL_LOG_BIN is 0 !Guangbao Ni2009-03-051-1/+12
| * | Bug#40657: assertion with out of range variables and traditional sql_modeTatiana A. Nurnberg2009-03-051-9/+8
| * | automergeTatiana A. Nurnberg2009-02-271-74/+145
| |\ \ | | |/ | |/|
| | * Bug#40657: assertion with out of range variables and traditional sql_modeTatiana A. Nurnberg2009-02-271-24/+42
| | * Bug#40657: assertion with out of range variables and traditional sql_modeTatiana A. Nurnberg2009-02-241-102/+80
| | * Bug#40657: assertion with out of range variables and traditional sql_modeTatiana A. Nurnberg2009-02-031-50/+125
| * | Bug#41077: Warning contains wrong future versionDavi Arnaut2009-02-161-2/+2
* | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-0/+5
|\ \ \ | |/ /
| * | Bug#42610 Dynamic plugin broken in 5.1.31Sergey Glukhov2009-02-091-0/+5
* | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-121-3/+11
|\ \ \ | |/ /
| * | Auto-merge from upstream 5.1-bugteamTimothy Smith2009-01-081-1/+8
| |\ \
| | * \ merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-051-1/+1
| | |\ \
| | | * \ Merge main 5.1 into 5.1-buildJoerg Bruehe2008-12-101-108/+168
| | | |\ \ | | | | |/
| | | * | Merge from mysql-5.1.30-releaseunknown2008-11-271-1/+1
| | | |\ \
| | | | * | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
| | * | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-12-241-0/+7
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Bug#41456 SET PASSWORD hates CURRENT_USER()Sergey Glukhov2008-12-241-0/+7
| * | | | | Fix a few problems after latest bunch of InnoDB snapshot changes:Timothy Smith2009-01-081-2/+3
| |/ / / /
* | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-28/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge with base MySQL-5.1-mariaMichael Widenius2008-12-031-116/+13
| |\ \ \ \
| | * \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-116/+14
| | |\ \ \ \ | | | | |/ / | | | |/| |
| * | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de...Michael Widenius2008-12-031-15/+9
| |/ / / /
| * | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-21/+74
| |\ \ \ \
| * | | | | wt_thd_lazy_init(), per-thread deadlock search depths and timeoutsSergei Golubchik2008-08-081-1/+14
| * | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-57/+139
| |\ \ \ \ \
| * | | | | | No more 'have_maria' variable, use information schema.engines.unknown2008-04-241-1/+0
| * | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-6/+6
| |\ \ \ \ \ \
| * | | | | | | Add warning of TRANSACTIONAL=1 is used with handler that doesn't support itunknown2008-02-111-1/+1
| * | | | | | | midding DBUG_RETURNunknown2008-02-071-1/+2
| * | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-0/+100
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed compiler warnings by adding casts and changing variable typesunknown2008-01-111-1/+1
| * | | | | | | | Added --loose-skip-maria to MYSQLD_BOOTSTRAP_CMD to get bootstrap.test to workunknown2008-01-111-1/+1
| * | | | | | | | after mergeunknown2007-12-281-9/+1
| * | | | | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-271-8/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixes to merge.unknown2007-12-201-6/+13
| | * | | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-6/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | make maria more pluggableunknown2007-10-121-167/+0
| | | * | | | | | | | remove maria_* variables from the server, declare them in ha_maria.ccunknown2007-10-061-23/+2
| | | * | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-2/+190
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Merged with mysql-5.1 main tree.unknown2007-07-021-7/+7
| | | | * | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+190
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fixed dubug info.unknown2007-04-181-6/+5
| | | | | * | | | | | | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bakunknown2007-04-161-2/+174
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Pagecache integration for review.unknown2007-04-041-2/+174
| | | | | * | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-3/+37
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | merge of recent MyISAM changes into Maria.unknown2006-12-201-0/+2
| | | | | | * | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-201-3/+35
| | | | | | |\ \ \ \ \ \ \ \
View Lorry Controller Status