summaryrefslogtreecommitdiff
path: root/sql/share
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-222-2/+55
|\
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-211-0/+2
| |\
| * \ mergeVladislav Vaintroub2010-02-161-0/+2
| |\ \
| * \ \ mergeVladislav Vaintroub2010-02-131-2/+5
| |\ \ \
| * \ \ \ mergeVladislav Vaintroub2010-02-063-6372/+9
| |\ \ \ \
| * | | | | Handle different installation layouts.Vladislav Vaintroub2010-01-241-3/+3
| * | | | | mergeVladislav Vaintroub2010-01-221-2/+0
| |\ \ \ \ \
| * \ \ \ \ \ mergeVladislav Vaintroub2010-01-182-4/+85
| |\ \ \ \ \ \
| * \ \ \ \ \ \ mergeVladislav Vaintroub2010-01-131-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ mergeVladislav Vaintroub2010-01-111-0/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-252-7/+19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-192-4/+4
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-161-2/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-021-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-11-201-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-092-2/+55
* | | | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Patch for WL#3736: Extended Table, Column and Index Comments.Alexander Nozdrin2010-02-201-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-151-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-063-6374/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | next-mr -> next-4284 merge:Konstantin Osipov2010-02-051-2/+2
| * | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-052-4/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-032-8/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-022-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Backport of:Konstantin Osipov2009-12-092-2/+5
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-02-171-3/+1
| |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
* | | | | | | | | | | | merge from mysql-trunk-bugfixingMagne Mahre2010-02-111-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug#50574 5.5.x allows spatial indexes on non-spatial columns, Magne Mahre2010-02-111-0/+2
* | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-052-6373/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Remove errmsg.txt and errmsg-cnv.sh. Use errmsg-utf8.txt instead.Alexander Nozdrin2010-02-052-6373/+0
* | | | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-052-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-022-0/+9
| * | | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-302-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | / / / / | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-242-9/+10
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-4/+4
* | | | | | | | | | | | | Bug #50192 Strange effect in replication test, trigger, auto_increment Andrei Elkin2010-01-292-4/+4
* | | | | | | | | | | | | Backport from mysql-6.0-codebase of:Jon Olav Hauglid2010-01-221-1/+1
* | | | | | | | | | | | | BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-212-0/+9
|/ / / / / / / / / / / /
* | | | | | | | | | | | Removes duplicate entry for ER_SLAVE_IGNORE_SERVER_IDSLuis Soares2010-01-201-2/+0
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Fix for perfschema.binlog_stmt failure:unknown2010-01-152-2/+2
* | | | | | | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-132-2/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-111-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-0/+5
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | fixing wrong indentation in two Makefile.am, which prevented the Anjuta IDE f...Guilhem Bichot2010-01-061-2/+2
| |/ / / / / / / /
* | | | | | | | | Manual merge from next-mr.unknown2010-01-122-8/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase ...Sergei Golubchik2009-12-221-6/+6
View Lorry Controller Status