diff options
author | unknown <monty@mysql.com> | 2004-05-25 02:47:25 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-05-25 02:47:25 +0300 |
commit | 656e6e55f063cf6b22e096140cfe5a51d2d1b7d5 (patch) | |
tree | cd40ef99e52fbe99be97d88ef663df2fa69b8ddb /VC++Files/mysql.dsw | |
parent | 64abbed63bcbeed4be01caaafa8363809a005aee (diff) | |
parent | da1623ddbb4dba3c4b2c56bcad52fd6bd5fb8836 (diff) | |
download | mariadb-git-656e6e55f063cf6b22e096140cfe5a51d2d1b7d5.tar.gz |
Merge with 4.0 to get fixes for Windows project files
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqldump.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/client/mysqlimport.dsp:
Auto merged
VC++Files/client/mysqlshow.dsp:
Auto merged
VC++Files/isamchk/isamchk.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisamchk/myisamchk.dsp:
Auto merged
VC++Files/myisamlog/myisamlog.dsp:
Auto merged
VC++Files/myisampack/myisampack.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/pack_isam/pack_isam.dsp:
Auto merged
VC++Files/perror/perror.dsp:
Auto merged
VC++Files/replace/replace.dsp:
Auto merged
include/my_global.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/eval/eval0eval.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
libmysql/libmysql.c:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/limits/mysql-4.0.cfg:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'VC++Files/mysql.dsw')
-rw-r--r-- | VC++Files/mysql.dsw | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/VC++Files/mysql.dsw b/VC++Files/mysql.dsw index 2bb093935d4..61a466174b6 100644 --- a/VC++Files/mysql.dsw +++ b/VC++Files/mysql.dsw @@ -41,6 +41,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name mysys End Project Dependency + Begin Project Dependency + Project_Dep_Name strings + End Project Dependency }}} ############################################################################### |