diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-12 12:23:17 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-12 12:23:17 +0100 |
| commit | 936bec8e2cf0362e0cf8902ab1f7ea8141b880cc (patch) | |
| tree | b30b7412d9d9617ac24a82c37545077bc476a849 /sql/sql_db.cc | |
| parent | 378cdc58c14afb7c48752f98889073fefe2c7ca7 (diff) | |
| parent | 601f4f7200f5631028350e5cedb7d135de47c140 (diff) | |
| download | mariadb-git-936bec8e2cf0362e0cf8902ab1f7ea8141b880cc.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
Text conflict in mysql-test/suite/perfschema/r/dml_setup_instruments.result
Text conflict in mysql-test/suite/perfschema/r/global_read_lock.result
Text conflict in mysql-test/suite/perfschema/r/server_init.result
Text conflict in mysql-test/suite/perfschema/t/global_read_lock.test
Text conflict in mysql-test/suite/perfschema/t/server_init.test
Diffstat (limited to 'sql/sql_db.cc')
0 files changed, 0 insertions, 0 deletions