diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-20 16:34:59 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-20 16:34:59 -0500 |
| commit | 606d8a5ab0000ccf1120201db21f92ef69b52a5c (patch) | |
| tree | 1467155c10e8996d9cce3ec39db813852687c942 /VC++Files/mysys | |
| parent | 03e26e50b9829124246ffb6b755e3809c126cb95 (diff) | |
| parent | c1ae672adda45a1b8c5637b8f4d6a3f91378ea20 (diff) | |
| download | mariadb-git-606d8a5ab0000ccf1120201db21f92ef69b52a5c.tar.gz | |
fixed conflicts
VC++Files/mysys/mysys.dsp:
Auto merged
include/my_sys.h:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'VC++Files/mysys')
| -rw-r--r-- | VC++Files/mysys/mysys.dsp | 5 | ||||
| -rw-r--r-- | VC++Files/mysys/mysys_ia64.dsp | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp index 64c4378b678..428f75d0045 100644 --- a/VC++Files/mysys/mysys.dsp +++ b/VC++Files/mysys/mysys.dsp @@ -186,6 +186,11 @@ SOURCE=.\array.c !ENDIF # End Source File + +# Begin Source File +SOURCE=".\my_access.c" +# End Source File + # Begin Source File SOURCE=".\charset-def.c" diff --git a/VC++Files/mysys/mysys_ia64.dsp b/VC++Files/mysys/mysys_ia64.dsp index ed2dac53579..a0877457286 100644 --- a/VC++Files/mysys/mysys_ia64.dsp +++ b/VC++Files/mysys/mysys_ia64.dsp @@ -163,6 +163,13 @@ LIB32=link.exe -lib # Name "mysys - WinIA64 Max" # Name "mysys - WinIA64 TLS_DEBUG" # Name "mysys - WinIA64 TLS" + +# Begin Source File + +SOURCE=.\my_access.c + +# End Source File + # Begin Source File SOURCE=.\array.c |