summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-211-8/+11
|\
| * merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-141-6/+8
| |\
| | * Merge mysql-next-mr (revno 2958) --> mysql-next-mr-marcMarc Alff2010-01-121-7/+10
| | |\
| | * | WL#2360 Performance schemaMarc Alff2010-01-111-6/+8
| * | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-35/+110
| |\ \ \ | | | |/ | | |/|
| * | | Manual merge from next-mr.unknown2010-01-121-61/+137
| |\ \ \
| * \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-2/+3
| |\ \ \ \
| | * \ \ \ merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-2/+2
| | |\ \ \ \
| | | * \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-10/+29
| | | |\ \ \ \
| | | * \ \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-3/+3
| | | |\ \ \ \ \
| | | * | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-1/+2
| | | * | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-95/+4
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-1/+0
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-1/+0
| | * | | | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-151-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-0/+1
* | | | | | | | | | | backported:Sergey Glukhov2010-01-151-0/+4
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-111-28/+100
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-28/+100
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"Guilhem Bichot2010-01-061-7/+10
|/ / / / / / / /
* | | | | | | | Manual merge of WL#4738 from mysql-next-mr: Alexey Kopytov2009-12-281-60/+135
|\ \ \ \ \ \ \ \
| * | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-60/+135
| |/ / / / / / /
* | | | | | | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-221-0/+1
|/ / / / / / /
* | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-171-3/+53
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ MergeMikael Ronstrom2009-12-141-17/+54
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-271-11/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | WL#5138, fixed review commentsMikael Ronstrom2009-11-231-0/+11
| * | | | | | | | | WL#5138, reverted some review fixesMikael Ronstrom2009-11-201-2/+2
| * | | | | | | | | WL#5138, review fixesMikael Ronstrom2009-11-201-2/+2
| * | | | | | | | | WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-201-3/+42
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-121-3/+42
* | | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-2/+15
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2009-12-101-2/+4
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-101-1/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-031-4/+8
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-10/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-11/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Auto mergeHe Zhenxing2009-11-211-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-2/+2
| | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-29/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | #Alexander Barkov2009-11-091-0/+2
| * | | | | | | | | | | | | | | Merge mysql-next-mr to mysql-next-mr-svoj.Sergey Vojtovich2009-12-091-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | WL#2511 - Add a new table to the Information Schema for TABLESPACE'sSergey Vojtovich2009-12-071-0/+11
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-7/+10
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-041-1/+2
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-021-10/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-10/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | / / / / / / | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-10/+29
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-10/+29
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
View Lorry Controller Status