diff options
| author | unknown <igor@rurik.mysql.com> | 2006-06-14 20:00:36 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-06-14 20:00:36 -0700 |
| commit | e8288ff926cfa2e4c635c88e706c921a6f7b9235 (patch) | |
| tree | 7a6447d7f6b379ba8e955cb4521598b60bf22c5e /VC++Files | |
| parent | 1b3ffa03f223ec12dba9db63c73be29c1d2b2765 (diff) | |
| parent | a74154f4de0b4f3765eb06932fb9ec3e79f764e0 (diff) | |
| download | mariadb-git-e8288ff926cfa2e4c635c88e706c921a6f7b9235.tar.gz | |
Merge rurik.mysql.com:/home/igor/tmp_merge
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
client/mysqldump.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
Manual merge
mysql-test/r/func_time.result:
Manual merge
mysql-test/t/func_time.test:
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 |