summaryrefslogtreecommitdiff
path: root/tests/regressiontests
diff options
context:
space:
mode:
authorJason Pellerin <jpellerin@gmail.com>2006-11-29 20:10:10 +0000
committerJason Pellerin <jpellerin@gmail.com>2006-11-29 20:10:10 +0000
commit08fe1b64afbb237e4e6c74bf22be80f2b7f3977e (patch)
tree94a6bca49bd1a95276446bd0a79b92a911923d77 /tests/regressiontests
parent71012a4be3830b1040815243ebb7c0d48dbd8e57 (diff)
[multi-db] Merge trunk to [3825]. Some tests still failing.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
-rw-r--r--tests/regressiontests/initial_sql_regress/sql/simple.sql1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/regressiontests/initial_sql_regress/sql/simple.sql b/tests/regressiontests/initial_sql_regress/sql/simple.sql
index ddb08bc91f..ca9bd40dab 100644
--- a/tests/regressiontests/initial_sql_regress/sql/simple.sql
+++ b/tests/regressiontests/initial_sql_regress/sql/simple.sql
@@ -4,4 +4,5 @@ INSERT INTO initial_sql_regress_simple (name) VALUES ('Ringo');
INSERT INTO initial_sql_regress_simple (name) VALUES ('George');
INSERT INTO initial_sql_regress_simple (name) VALUES ('Miles O''Brien');
INSERT INTO initial_sql_regress_simple (name) VALUES ('Semicolon;Man');
+INSERT INTO initial_sql_regress_simple (name) VALUES ('This line has a Windows line ending');