diff options
author | unknown <monty@mysql.com> | 2006-05-03 16:03:19 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2006-05-03 16:03:19 +0300 |
commit | 8e2650ab3d97791db40d6dc5630bc89f343ffa09 (patch) | |
tree | 2d8cd4167b64bdfd12e7569d8b03491f418362ae /sql/sql_test.cc | |
parent | 339a7085b89588f44651adb5f690f9597a2d4fdd (diff) | |
parent | d50ae1656932907a9414b713372cf1c6c40c97a0 (diff) | |
download | mariadb-git-8e2650ab3d97791db40d6dc5630bc89f343ffa09.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/my/mysql-5.1
include/my_sys.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_test.cc')
0 files changed, 0 insertions, 0 deletions