diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-09 17:56:08 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-09 17:56:08 -0700 |
| commit | ddd55d4349cef4002d8724eac7f2735538d55d02 (patch) | |
| tree | a35d4a02dd33f64c0522f3313f41b5814ac15fbf /VC++Files | |
| parent | 8e418820e9f6e82691a3b489a951e78af4feaba2 (diff) | |
| parent | 5efb70d7771c905b61e5e01e2f0643a5953adb83 (diff) | |
| download | mariadb-git-ddd55d4349cef4002d8724eac7f2735538d55d02.tar.gz | |
Merge rurik.mysql.com:/home/igor/tmp_merge
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
VC++Files/client/mysql.dsp:
Auto merged
mysql-test/t/func_time.test:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
client/mysqldump.c:
Manual merge
mysql-test/r/func_time.result:
Manual merge
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/client/mysql.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/client/mysql_ia64.dsp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/VC++Files/client/mysql.dsp b/VC++Files/client/mysql.dsp index ac74515b588..510107c8308 100644 --- a/VC++Files/client/mysql.dsp +++ b/VC++Files/client/mysql.dsp @@ -144,6 +144,10 @@ SOURCE=.\readline.cpp # End Source File # Begin Source File +SOURCE=..\mysys\my_conio.c +# End Source File +# Begin Source File + SOURCE=.\sql_string.cpp # End Source File # End Target diff --git a/VC++Files/client/mysql_ia64.dsp b/VC++Files/client/mysql_ia64.dsp index 3fe2e2a2328..8de283d1e0b 100644 --- a/VC++Files/client/mysql_ia64.dsp +++ b/VC++Files/client/mysql_ia64.dsp @@ -130,6 +130,10 @@ SOURCE=.\readline.cpp # End Source File # Begin Source File +SOURCE=..\mysys\my_conio.c +# End Source File +# Begin Source File + SOURCE=.\sql_string.cpp # End Source File # End Target |