← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysql-test/t/loaddata.test

  • Committer: Monty Taylor
  • Date: 2008-07-05 17:07:46 UTC
  • mto: This revision was merged to the branch mainline in revision 63.
  • Revision ID: monty@inaugust.com-20080705170746-8aq11u9fuwtfwy85
Removed my_alarm. Made my_lock only do the non-alarm version. Moved my_lock to MyISAM where it belongs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/t/loaddata.test
162
162
 
163
163
# Test "load data"
164
164
truncate table t1;
165
 
--replace_result $DRIZZLE_TEST_DIR DRIZZLE_TEST_DIR
 
165
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
166
166
--error 1290
167
 
eval load data infile '$DRIZZLE_TEST_DIR/t/loaddata.test' into table t1;
 
167
eval load data infile '$MYSQL_TEST_DIR/t/loaddata.test' into table t1;
168
168
select * from t1;
169
169
 
170
170
# Test "load_file" returns NULL
171
 
--replace_result $DRIZZLE_TEST_DIR DRIZZLE_TEST_DIR
172
 
eval select load_file("$DRIZZLE_TEST_DIR/t/loaddata.test");
 
171
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 
172
eval select load_file("$MYSQL_TEST_DIR/t/loaddata.test");
173
173
 
174
174
# cleanup
175
175
drop table t1, t2;