Permalink
Browse files

test

  • Loading branch information...
1 parent 2e53f63 commit 56ab8e8d18b213c86831dd59237e07458bee00d7 @neilkod neilkod committed Jun 21, 2011
Showing with 7 additions and 0 deletions.
  1. +7 −0 load_data.sql
View
@@ -23,7 +23,10 @@ name varchar(100)
);
<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
=======
+>>>>>>> Stashed changes
LOAD DATA LOCAL INFILE 'data/sessions.dat' INTO TABLE sessions FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"';
LOAD DATA LOCAL INFILE 'data/votes.dat' INTO TABLE votes FIELDS TERMINATED BY '|' (session_id, user_id);
LOAD DATA LOCAL INFILE 'data/users.dat' INTO TABLE users FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"';
@@ -36,10 +39,14 @@ total_votes int
);
<<<<<<< Updated upstream
+<<<<<<< Updated upstream
LOAD DATA LOCAL INFILE 'sessions.dat' INTO TABLE sessions FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"';
LOAD DATA LOCAL INFILE 'votes.dat' INTO TABLE votes FIELDS TERMINATED BY '|' (session_id, user_id);
LOAD DATA LOCAL INFILE 'users.dat' INTO TABLE users FIELDS TERMINATED BY '|' OPTIONALLY ENCLOSED BY '"';
LOAD DATA LOCAL INFILE 'final_vote_count.dat' INTO TABLE final_vote_count FIELDS TERMINATED BY '|';
=======
LOAD DATA LOCAL INFILE 'data/final_vote_count.dat' INTO TABLE final_vote_count FIELDS TERMINATED BY '|';
>>>>>>> Stashed changes
+=======
+LOAD DATA LOCAL INFILE 'data/final_vote_count.dat' INTO TABLE final_vote_count FIELDS TERMINATED BY '|';
+>>>>>>> Stashed changes

0 comments on commit 56ab8e8

Please sign in to comment.