summaryrefslogtreecommitdiff
path: root/sql/sql_profile.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2013-01-151-10/+19
|\
| * 5.2->5.3 mergeSergei Golubchik2013-01-101-10/+19
| |\
| | * mysql-5.1.67 mergeSergei Golubchik2013-01-091-10/+19
| | |\
| | | * Bug#14629232 SECURITY VULNERABILITY WITH SHOW PROFILEMarc Alff2012-10-121-10/+19
| * | | 5.2 merge.Sergei Golubchik2012-08-221-4/+4
| |\ \ \ | | |/ /
| | * | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-4/+4
| | |\ \ | | | |/
* | | | merge with MySQL 5.5.27Sergei Golubchik2012-08-091-4/+4
|\ \ \ \
| * \ \ \ Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-3/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING)Jon Olav Hauglid2012-06-291-3/+3
* | | | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-3/+2
|\ \ \ \ \ | |/ / / /
| * | | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| |\ \ \ \ | | |/ / /
* | | | | 5.3 mergeSergei Golubchik2012-01-131-1/+3
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge with 5.2.Michael Widenius2011-12-111-2/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+5
| | |\ \ \ | | | | |/ | | | |/|
* | | | | Fix build and packaging on Windows:Vladislav Vaintroub2011-11-261-0/+4
* | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bug#12756017 - PROFILING: SET_THD_PROC_INFO DOES NOT NEED TO CALL DIRNAME_LEN...Tor Didriksen2011-07-201-1/+1
| * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \
| | | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | * | | Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-161-1/+1
| | | * | | backported a change from 5.1Georgi Kodinov2009-05-151-2/+2
| | | * | | fixed a win32 compile errorGeorgi Kodinov2009-05-151-2/+3
| | | * | | Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-2/+2
| | | * | | Push history-limiting code until after the code that adds new unknown2007-11-141-206/+217
* | | | | | merge with 5.3Sergei Golubchik2011-10-191-2/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | many changes to my_getsystime.c:Sergei Golubchik2011-05-191-1/+1
| | | |/ / | | |/| |
| * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-1/+1
| |\ \ \ \ | | |/ / /
* | | | | merge.Sergei Golubchik2010-11-251-1/+21
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-6/+6
| |\ \ \ | | |/ /
| * | | Patch set contributed by Alex Budovski (MCA)Michael Widenius2010-01-291-0/+57
| * | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-1/+1
| |\ \ \
| * \ \ \ Merged with mysql-5.1 tree.Michael Widenius2009-04-251-1/+1
| |\ \ \ \ | | |/ / /
| * | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-2/+2
| |\ \ \ \
| * | | | | proc_info_hook, mysys access to thd->proc_infoSergei Golubchik2008-08-271-3/+0
* | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-4/+2
* | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+5
* | | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-5/+45
|\ \ \ \ \ \
| * \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-0/+43
| |\ \ \ \ \ \
| | * | | | | | Bug#50057: 'SHOW PROFILE CPU' port for Windows.Vladislav Vaintroub2010-02-051-0/+43
| * | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-2/+2
| * | | | | | | Backport of:Konstantin Osipov2009-12-031-3/+0
| |/ / / / / /
* | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-201-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Bug #49829 Many "hides virtual function" warnings withStaale Smedseng2010-03-141-6/+6
| | |_|/ / | |/| | |
* | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-1/+1
* | | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-2/+2
|/ / / /
* | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-1/+1
| |/ / |/| |
* | | Fixed a warning in sql_profile.ccGeorgi Kodinov2009-01-121-2/+2
|/ /