diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:02:55 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2010-01-14 16:02:55 +0000 |
| commit | fb0ee3ab8ed62428d4b92f4134dcdee6a66fd0c6 (patch) | |
| tree | 9909bd321761de0c8085748ac06b4a431906e670 /mysql-test/r/init_connect.result | |
| parent | 0f90f1dee7b45d47d3e1e77f66e4af74c795370f (diff) | |
| parent | 9c820e637e886d0b67384e04107e4ca3f53f990b (diff) | |
| download | mariadb-git-fb0ee3ab8ed62428d4b92f4134dcdee6a66fd0c6.tar.gz | |
merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
Text conflict in sql/sql_insert.cc
Diffstat (limited to 'mysql-test/r/init_connect.result')
0 files changed, 0 insertions, 0 deletions