diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-02 19:17:43 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-02 19:17:43 +0400 |
| commit | 5a59d706be5f38768fc861388d92c0f985a5fa1a (patch) | |
| tree | 6d057eab12491f577608f07bd6097f0b71bfa88a /mysql-test/std_data | |
| parent | 5bfa2e8dbeb5c8c41ad33fbef392aa5cdfecac56 (diff) | |
| parent | d5325c7793a640d0f32d62088f84d3d19166add7 (diff) | |
| download | mariadb-git-5a59d706be5f38768fc861388d92c0f985a5fa1a.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in mysql-test/r/func_str.result
Text conflict in mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_32.result
Text conflict in mysql-test/suite/sys_vars/r/myisam_sort_buffer_size_basic_64.result
Text conflict in mysql-test/t/func_str.test
Text conflict in sql/mysqld.cc
Text conflict in sql/protocol.cc
Text conflict in storage/myisam/mi_open.c
Diffstat (limited to 'mysql-test/std_data')
0 files changed, 0 insertions, 0 deletions