diff options
| author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-16 15:43:16 -0600 |
|---|---|---|
| committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-16 15:43:16 -0600 |
| commit | 1dc0efc606bf7f66402e7f9728b7e4a0a1fd82ec (patch) | |
| tree | cd392457a794060b12c7e5bcea34b7bffb75708d /mysql-test/std_data/loaddata3.dat | |
| parent | 3c6d858b6c1ee7b2f475e184b28a1af04ae256e3 (diff) | |
| parent | 42b6424327763192c7fb4701f0ae93b7a52af89d (diff) | |
| download | mariadb-git-1dc0efc606bf7f66402e7f9728b7e4a0a1fd82ec.tar.gz | |
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
mysql-test/r/sp-error.result:
failed auto merge
mysql-test/r/sp.result:
failed auto merge
mysql-test/r/udf.result:
failed auto merge
mysql-test/t/sp.test:
failed auto merge
sql/sp_head.cc:
failed auto merge
sql/sql_yacc.yy:
failed auto merge
Diffstat (limited to 'mysql-test/std_data/loaddata3.dat')
0 files changed, 0 insertions, 0 deletions