diff options
author | unknown <serg@janus.mylan> | 2007-11-01 12:30:45 +0100 |
---|---|---|
committer | unknown <serg@janus.mylan> | 2007-11-01 12:30:45 +0100 |
commit | 4f7f5941ed617ffab9f6763ea0ec229c3601741f (patch) | |
tree | 76c1a51eb7958fad227e2ac06551e27609490b1c /mysql-test/t/udf.test | |
parent | 41c2a2c490522da0f163aa25ac88da9db74e0c66 (diff) | |
parent | 969332eac05358b384f626c66a86a21888e6a83a (diff) | |
download | mariadb-git-4f7f5941ed617ffab9f6763ea0ec229c3601741f.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
client/mysqldump.c:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'mysql-test/t/udf.test')
0 files changed, 0 insertions, 0 deletions