Merge mysql.com:/space/my/mysql-4.1

into mysql.com:/space/my/mysql-4.1-build
This commit is contained in:
lenz@mysql.com 2004-11-22 17:12:45 +01:00
commit e72acc4236
2 changed files with 2 additions and 1 deletions

View File

@ -939,3 +939,4 @@ ndbcluster-1186/ndb_3_cluster.log
ndbcluster-1186/ndb_3_out.log ndbcluster-1186/ndb_3_out.log
ndbcluster-1186/ndbcluster.pid ndbcluster-1186/ndbcluster.pid
ndb/tools/ndb_restore ndb/tools/ndb_restore
ac_available_languages_fragment

View File

@ -115,7 +115,7 @@ LINK32=xilink6.exe
# Name "mysqladmin - Win32 classic" # Name "mysqladmin - Win32 classic"
# Begin Source File # Begin Source File
SOURCE=.\mysqladmin.c SOURCE=.\mysqladmin.cpp
# End Source File # End Source File
# End Target # End Target
# End Project # End Project