diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2010-02-09 12:59:38 +0500 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2010-02-09 12:59:38 +0500 |
| commit | 0888e40fa316b040cb43f6fad112a0cdcd443155 (patch) | |
| tree | 18b0423763f9cac0e0b38ba5a2175afe5f429844 /mysql-test/suite/funcs_1/t/is_columns.test | |
| parent | 7e0d0dd04037a626c0d984553473a1fed4b9fb56 (diff) | |
| parent | 6124451d9534b1a03e58724411c492d9de980cb4 (diff) | |
| download | mariadb-git-0888e40fa316b040cb43f6fad112a0cdcd443155.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_slow_query_log.result
Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test
Conflict adding files to server-tools. Created directory.
Conflict because server-tools is not versioned, but has versioned children. Versioned directory.
Conflict adding files to server-tools/instance-manager. Created directory.
Conflict because server-tools/instance-manager is not versioned, but has versioned children. Versioned directory.
Contents conflict in server-tools/instance-manager/options.cc
Text conflict in sql/mysqld.cc
Diffstat (limited to 'mysql-test/suite/funcs_1/t/is_columns.test')
0 files changed, 0 insertions, 0 deletions