diff options
| author | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
| commit | 8b2b219fb5e1374abdd816d9d0911d37087c86a5 (patch) | |
| tree | e13a23a1c9f28ed5eb2d903ba59a153cda3355ac /VC++Files/mysql.dsw | |
| parent | 51a6b4f47ad03031105b0f8ac810d522a804695e (diff) | |
| parent | 9bc5cdba41a0d2bc3c391469b14168f82e636a6b (diff) | |
| download | mariadb-git-8b2b219fb5e1374abdd816d9d0911d37087c86a5.tar.gz | |
merge with 4.0 to get security fixes and latest bug fixes
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/include/srv0start.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0rw.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysql/manager.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Removed wrong define USE_SYMLINK
include/config-win.h:
Use original code
innobase/srv/srv0srv.c:
merge
innobase/usr/usr0sess.c:
merge
libmysql/libmysql.c:
merge
mysql-test/r/func_test.result:
merge
mysql-test/t/func_test.test:
merge
sql/log.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'VC++Files/mysql.dsw')
| -rw-r--r-- | VC++Files/mysql.dsw | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/VC++Files/mysql.dsw b/VC++Files/mysql.dsw index ea391362b84..4db81e31755 100644 --- a/VC++Files/mysql.dsw +++ b/VC++Files/mysql.dsw @@ -231,6 +231,30 @@ Package=<4> ############################################################################### +Project: "myisam_ftdump"=".\myisam_ftdump\myisam_ftdump.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name dbug + End Project Dependency + Begin Project Dependency + Project_Dep_Name myisam + End Project Dependency + Begin Project Dependency + Project_Dep_Name mysys + End Project Dependency + Begin Project Dependency + Project_Dep_Name strings + End Project Dependency +}}} + +############################################################################### + Project: "myisamchk"=".\myisamchk\myisamchk.dsp" - Package Owner=<4> Package=<5> @@ -797,3 +821,4 @@ Package=<3> }}} ############################################################################### + |