diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 22:49:22 +0200 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-06-05 22:49:22 +0200 |
| commit | 01609990ca075a198473be3cd9dc4ccf580a4483 (patch) | |
| tree | 50b7ef6b918f2c9add6a6f5f3237ef8e777f57e8 /mysql-test/r/sp_notembedded.result | |
| parent | 72ba6bba75564d90fc3beafda900e1356776a631 (diff) | |
| parent | 027f7f8c2d78f02ca3d321bbe772370c7cfae5da (diff) | |
| download | mariadb-git-01609990ca075a198473be3cd9dc4ccf580a4483.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/r/sp_notembedded.result')
0 files changed, 0 insertions, 0 deletions