diff options
| author | unknown <kent@mysql.com> | 2005-02-09 16:56:58 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-02-09 16:56:58 +0100 |
| commit | 43d3c554d4fc96cc2a04c026a71fbe74699566ba (patch) | |
| tree | 6c8e0b6612247dcc81204c2130ce63ff4ce2b348 /VC++Files/mysql.dsw | |
| parent | 9d3f6a2573a5c73af3fae1c4e69b507a75a62a8c (diff) | |
| parent | 5de673901f291668fa577a55faeb57d06016eb8b (diff) | |
| download | mariadb-git-43d3c554d4fc96cc2a04c026a71fbe74699566ba.tar.gz | |
Merge
VC++Files/mysql.dsw:
Auto merged
mysql-test/my_create_tables.c:
Auto merged
mysql-test/my_manage.c:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
Diffstat (limited to 'VC++Files/mysql.dsw')
| -rw-r--r-- | VC++Files/mysql.dsw | 56 |
1 files changed, 36 insertions, 20 deletions
diff --git a/VC++Files/mysql.dsw b/VC++Files/mysql.dsw index b0a36f1bd24..43cfab4b915 100644 --- a/VC++Files/mysql.dsw +++ b/VC++Files/mysql.dsw @@ -735,15 +735,15 @@ Package=<4> ############################################################################### -Project: "mysqltest"=.\client\mysqltest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency +Project: "mysqltest"=.\client\mysqltest.dsp - Package Owner=<4>
+
+Package=<5>
+{{{ +
}}} +
+
+Package=<4>
+{{{
Begin Project Dependency Project_Dep_Name libmysql End Project Dependency Begin Project Dependency @@ -754,24 +754,40 @@ Package=<4> End Project Dependency }}} -############################################################################### - -Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency +###############################################################################
+
+Project: "mysql_client_test"=.\tests\mysql_client_test.dsp - Package Owner=<4> +
+
Package=<5>
+{{{
+
}}} +
+
Package=<4> +
{{{ +
}}} + +
############################################################################### + +
+Project: "mysql_test_run_new"=".\mysql-test\mysql_test_run_new.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
Begin Project Dependency Project_Dep_Name mysqltest End Project Dependency Begin Project Dependency Project_Dep_Name mysqladmin End Project Dependency + Begin Project Dependency + Project_Dep_Name mysql_client_test + End Project Dependency }}} + ############################################################################### Global: |