diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 00:33:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-30 00:33:06 +0400 |
| commit | 940ad61b712cb2f10bf5ff62330b0c9c4d8473ba (patch) | |
| tree | a2457e79f43173dfb97236266c5bb7a47fdbf65f /sql/rpl_utility.h | |
| parent | 72ae25b11ea922c018953053e3c3cdd5fd80f971 (diff) | |
| parent | e287445d416044a7004ba2da289350f5c6dfb546 (diff) | |
| download | mariadb-git-940ad61b712cb2f10bf5ff62330b0c9c4d8473ba.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in configure.in
Text conflict in dbug/dbug.c
Text conflict in mysql-test/r/ps.result
Text conflict in mysql-test/t/ps.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/ha_ndbcluster.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_table.cc
Diffstat (limited to 'sql/rpl_utility.h')
0 files changed, 0 insertions, 0 deletions