summaryrefslogtreecommitdiff
path: root/sql/share/errmsg.txt
Commit message (Expand)AuthorAgeFilesLines
* Remove errmsg.txt and errmsg-cnv.sh. Use errmsg-utf8.txt instead.Alexander Nozdrin2010-02-051-6312/+0
* Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-021-0/+4
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-301-1/+2
|\
| * Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-5/+6
| |\
| | * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-4/+4
* | | Removes duplicate entry for ER_SLAVE_IGNORE_SERVER_IDSLuis Soares2010-01-201-2/+0
* | | Fix for perfschema.binlog_stmt failure:unknown2010-01-151-1/+1
* | | Manual merge from next-mr.unknown2010-01-121-1/+7
|\ \ \
| * | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-1/+7
* | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-0/+2
|\ \ \ \
| * \ \ \ merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-231-0/+2
| |\ \ \ \
| | * | | | Bug #47863 binlog_format should be writable only at transaction boundariesunknown2009-12-231-0/+2
* | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-2/+41
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-5/+38
| |\ \ \ \ | | |/ / /
| | * | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-4/+4
| | |\ \ \
| | * \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-1/+7
| | |\ \ \ \
| | * | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-0/+2
| | * | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-181-1/+4
| | |\ \ \ \ \
| | * | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-10-141-6/+4
| | * | | | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-2/+36
| | |\ \ \ \ \ \
| | | * | | | | | post-push fixes for BUG#39934Sven Sandberg2009-08-191-0/+20
| | | * | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-2/+16
| * | | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-151-0/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-0/+5
* | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-2/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | AutomergeAlexey Kopytov2009-12-131-2/+2
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Bug #42849: innodb crash with varying time_zone on partitioned Alexey Kopytov2009-12-131-2/+2
* | | | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-4/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-4/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-4/+4
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-061-1/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
* | | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Backport of Bug#36785 to mysql-next-mrDavi Arnaut2009-11-101-0/+1
* | | | | | | Merged WL#3352 into mysql-next-mrMikael Ronstrom2009-10-281-0/+18
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | BUG#48165, needed to introduce length restrictions on partitioning fields to ...Mikael Ronstrom2009-10-281-0/+2
| * | | | | | A lot of fixes to make character set work ok, first step to fixing BUG#48163Mikael Ronstrom2009-10-221-1/+3
| * | | | | | Added checks for no NULL values in VALUES LESS THAN, added tests for no MAXVA...Mikael Ronstrom2009-10-211-2/+2
| * | | | | | MergeMikael Ronstrom2009-10-211-22/+22
| |\ \ \ \ \ \
| | * | | | | | WL#3352: Extending Partitioning Types and new partition functionMattias Jonsson2009-10-201-10/+10
| | * | | | | | Manual merge mysql-trunk -> mysql-trunk-wl3352Mattias Jonsson2009-10-191-8/+8
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| * | | | | | | Merged in latest changesMikael Ronstrom2009-10-161-2/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Removed GLOBAL INDEX syntax, need to develop GLOBAL indexes before adding syn...Mikael Ronstrom2009-10-161-2/+0
| * | | | | | | Fixed removal of column_list keyword for VALUES part, retained for PARTITION ...Mikael Ronstrom2009-10-161-2/+6
| |/ / / / / /
| * | | | | | BUG#47837, Duplicate field names were allowed in both column list partitionin...Mikael Ronstrom2009-10-061-0/+2
| * | | | | | WL#3352, Introducing Column list partitioning, makes it possible to partition...Mikael Ronstrom2009-09-151-0/+10
* | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-1/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Backport BUG#34227 Replication permission error message is misleadingHe Zhenxing2009-10-021-1/+1
| * | | | | | backporting bug@27808 fixesAndrei Elkin2009-10-011-0/+3
| | |/ / / / | |/| | | |
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-1/+8
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |