diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-05-02 09:59:39 -0600 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-05-02 09:59:39 -0600 |
| commit | 03e76835653dc03b870ade2bdefa2a53c5891800 (patch) | |
| tree | 2a371d2e72261b7378916064459dcbca9ddbef1b /mysql-test/t/create.test | |
| parent | 589ae7b4e090aa866b492a823f7e773bda03e1ec (diff) | |
| parent | 1700feaa0296250b10882bd421f555776614120c (diff) | |
| download | mariadb-git-03e76835653dc03b870ade2bdefa2a53c5891800.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
mysql-test/t/sp.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/create.test')
0 files changed, 0 insertions, 0 deletions