diff options
| author | unknown <lenz@mysql.com> | 2005-06-01 15:11:14 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-06-01 15:11:14 +0200 |
| commit | 29fb604ddf9477142a1a1ca044d37572921f5799 (patch) | |
| tree | e1aefa8a0b44cfe02ff518c8f5a95210aef9dd02 /VC++Files/libmysql | |
| parent | bac98672ee5e325c91a2b2f5f7a3126d4362ba10 (diff) | |
| parent | 853a55ad215db4f44bee4281de57054bf2f7da17 (diff) | |
| download | mariadb-git-29fb604ddf9477142a1a1ca044d37572921f5799.tar.gz | |
Merge of 4.1 -> 5.0
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/client/mysqltest.dsp:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/strings/strings.dsp:
Auto merged
VC++Files/strings/strings_ia64.dsp:
Auto merged
include/config-win.h:
Auto merged
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge, fixed NDB_VERSION_BUILD
Diffstat (limited to 'VC++Files/libmysql')
| -rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysql/libmysql_ia64.dsp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index 1db5ed538a4..473aa60d8af 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -147,6 +147,10 @@ SOURCE="..\strings\ctype-czech.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-cp932.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-euc_kr.c" # End Source File # Begin Source File diff --git a/VC++Files/libmysql/libmysql_ia64.dsp b/VC++Files/libmysql/libmysql_ia64.dsp index fa851cb81c5..75586ef2cf6 100644 --- a/VC++Files/libmysql/libmysql_ia64.dsp +++ b/VC++Files/libmysql/libmysql_ia64.dsp @@ -146,6 +146,10 @@ SOURCE="..\strings\ctype-czech.c" # End Source File # Begin Source File +SOURCE="..\strings\ctype-cp932.c" +# End Source File +# Begin Source File + SOURCE="..\strings\ctype-euc_kr.c" # End Source File # Begin Source File |