diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:27:53 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:27:53 +0400 |
| commit | db9672cfded3403f4145564bad8e6b78f47ba13c (patch) | |
| tree | a082c9a70425283b10f95421a2d3c2f680aa939c /sql/sql_base.cc | |
| parent | d83cb8c7a331438d3321510dd514a19e026333c9 (diff) | |
| parent | 1c5200f67d3a5669b987979227d5e314082b00db (diff) | |
| download | mariadb-git-db9672cfded3403f4145564bad8e6b78f47ba13c.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in tests/mysql_client_test.c
Diffstat (limited to 'sql/sql_base.cc')
0 files changed, 0 insertions, 0 deletions