diff options
| author | Monty <monty@mariadb.org> | 2015-07-09 14:47:32 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2015-07-09 14:47:32 +0300 |
| commit | 9bb8b74e99adced1ccb38ced24a96cf2d1040f39 (patch) | |
| tree | c58f67cd054fa8829ca11d275f86db7691031eb2 /sql/message.rc | |
| parent | a6c801438717b815288acb72513f5e42fe736b7b (diff) | |
| parent | 77803703431d79f5dcc2b23b3f878dfdbaf01c2b (diff) | |
| download | mariadb-git-9bb8b74e99adced1ccb38ced24a96cf2d1040f39.tar.gz | |
Merge branch '10.1' of github.com:MariaDB/server into 10.1
Conflicts:
sql/item_subselect.cc
Fixed also typo in comment
Diffstat (limited to 'sql/message.rc')
0 files changed, 0 insertions, 0 deletions