database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge rurik.mysql.com:/home/igor/tmp_merge

Browse Source 
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
This commit is contained in:
unknown
2006-06-09 17:56:08 -07:00
parent 8e418820e9 5efb70d777
commit ddd55d4349
8 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VC++Files/client/mysql.dsp
View File

@ -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