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 | b4c0c1550cd3aa53851b0344a433d8b7eea67d9c (patch) | |
| tree | 9909bd321761de0c8085748ac06b4a431906e670 /mysql-test/include/is_embedded.inc | |
| parent | 18a8f3c8cc00f8bfa59f982fcf39edb89d941ef0 (diff) | |
| parent | a6165accb3279fe64b672fa0eeaa30ef12cf6557 (diff) | |
| download | mariadb-git-b4c0c1550cd3aa53851b0344a433d8b7eea67d9c.tar.gz | |
merge mysql-next-mr --> mysql-5.1-rpl-merge
Conflicts:
Text conflict in sql/sql_insert.cc
Diffstat (limited to 'mysql-test/include/is_embedded.inc')
0 files changed, 0 insertions, 0 deletions