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 | 017c9698965ea4eac378d5ff9d8f9312e5b51e8e (patch) | |
| tree | 18b0423763f9cac0e0b38ba5a2175afe5f429844 /sql/sql_update.cc | |
| parent | a93d838a12ff605af124615c7dc4c31935f3213f (diff) | |
| parent | 29b733873670a2938497b5c6bdb4ec3d1d4eb4f0 (diff) | |
| download | mariadb-git-017c9698965ea4eac378d5ff9d8f9312e5b51e8e.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 'sql/sql_update.cc')
0 files changed, 0 insertions, 0 deletions