diff options
author | unknown <serg@mysql.com> | 2006-05-24 14:22:36 +0200 |
---|---|---|
committer | unknown <serg@mysql.com> | 2006-05-24 14:22:36 +0200 |
commit | 6355f74e4d35d457771fe45f8f5331a3174226a4 (patch) | |
tree | 5161e5d5de5e25b888b1431d1b03c482421d17c3 /mysql-test/t/mysqltest.test | |
parent | 9972f4bf5d629f29ecce9b41cc7fb00181dab299 (diff) | |
parent | e1227d2bd1dea7b8d7d3ff47b7fba8e6ef11cb05 (diff) | |
download | mariadb-git-6355f74e4d35d457771fe45f8f5331a3174226a4.tar.gz |
Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
into mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
scripts/mysqld_multi.sh:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
merged
extra/comp_err.c:
merged
Diffstat (limited to 'mysql-test/t/mysqltest.test')
0 files changed, 0 insertions, 0 deletions