diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:23:57 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-11 12:23:57 +0400 |
| commit | c7fbc8c67c6739b900e19e0091b28adc11bd5d58 (patch) | |
| tree | 703aceeb455a79b6ec6291bdc71ff13ffa24a2c0 /sql-common | |
| parent | 5ef2bdea81a68a5440235bb5c841fff5dcc2b2c7 (diff) | |
| parent | df0b6707dabf49ed09e798c6ace1d860320ab11c (diff) | |
| download | mariadb-git-c7fbc8c67c6739b900e19e0091b28adc11bd5d58.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Text conflict in sql/log.cc
Text conflict in sql/log.h
Text conflict in sql/sql_class.cc
Text conflict in sql/sql_load.cc
Diffstat (limited to 'sql-common')
0 files changed, 0 insertions, 0 deletions