summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
Commit message (Expand)AuthorAgeFilesLines
* Pre-requisite patch for bug #51263 "Deadlock betweenDmitry Lenev2010-05-251-0/+10
* manual merge from mysql-trunk-bugfixingJon Olav Hauglid2010-05-181-5/+22
|\
| * Patch for Bug#27863 (excessive memory usage for many small queries in aAlexander Nozdrin2010-05-141-5/+21
* | Committing on behalf or Dmitry Lenev:Konstantin Osipov2010-04-281-13/+41
|/
* auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixingAlfranio Correia2010-04-191-0/+12
|\
| * auto-merge mysql-trunk-bugfixing (local) --> mysql-trunk-bugfixingAlfranio Correia2010-03-311-0/+12
| |\
| | * BUG#51291 Unfortunate effect around variable binlog_direct_non_transactional_...Alfranio Correia2010-03-311-0/+6
| | * BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in...Alfranio Correia2010-02-221-0/+6
* | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+19
|/ /
* | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-241-0/+2
|\ \ | |/ |/|
| * Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-02-091-0/+2
| |\
| | * Bug #45640: optimizer bug produces wrong resultsGleb Shchepa2010-02-061-0/+2
| * | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-031-25/+0
| |\ \ | | |/
| | * Revert a patch for Bug#48231, which introduced valgrind warnings.Alexander Nozdrin2010-02-021-25/+0
| * | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-0/+25
| |\ \ | | |/
| | * Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER;unknown2010-01-301-0/+25
* | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-7/+11
|\ \ \
| * \ \ Merge mysql-next-mr-marc --> mysql-next-mr-bugfixingMarc Alff2010-02-051-1/+3
| |\ \ \
| | * | | Bug#34455 Ambiguous foreign keys syntax is acceptedMarc Alff2010-01-251-1/+3
| * | | | Bug #50192 Strange effect in replication test, trigger, auto_increment Andrei Elkin2010-01-291-6/+8
| |/ / /
* | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-17/+168
|\ \ \ \ | |/ / /
| * | | Manual merge from next-mr.unknown2010-01-121-3/+11
| |\ \ \
| * \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-17/+169
| |\ \ \ \
| | * \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-3/+3
| | |\ \ \ \
| | * \ \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-7/+0
| | |\ \ \ \ \
| | * | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-0/+7
| | * | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-3/+9
| | |\ \ \ \ \ \
| | * | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-10-141-0/+5
| | * | | | | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-17/+158
| | |\ \ \ \ \ \ \
| | | * | | | | | | post-push fixes for BUG#39934Sven Sandberg2009-08-191-1/+1
| | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-42/+136
| | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-10/+57
* | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-3/+11
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-3/+11
| |/ / / / / / / /
* | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-161-6/+22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-3/+3
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Bug#49165 Remove unused/confusing code/comments in setup_conds()Tor Didriksen2009-11-271-5/+0
| * | | | | | | | | backport of:Tor Didriksen2009-11-301-1/+22
* | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-0/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-16/+23
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Bug#9801 Views: imperfect error messageMarc Alff2009-11-021-0/+11
* | | | | | | | | | Backport of:Konstantin Osipov2009-12-081-0/+17
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-3/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-3/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-3/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-7/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
* | | | | | MergeMikael Ronstrom2009-11-031-13/+20
|\ \ \ \ \ \
| * \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-3/+9
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-7/+0
| |\ \ \ \ \ \ \
View Lorry Controller Status