Commit 12c0a342 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/space/my/mysql-4.1-build
parents 25678df9 77305900

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -939,3 +939,4 @@ ndbcluster-1186/ndb_3_cluster.log 
ndbcluster-1186/ndb_3_out.log

ndbcluster-1186/ndbcluster.pid

ndb/tools/ndb_restore

ac_available_languages_fragment

VC++Files/client/mysqladmin.dsp

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ LINK32=xilink6.exe 
# Name "mysqladmin - Win32 classic"

# Begin Source File



SOURCE=.\mysqladmin.c

SOURCE=.\mysqladmin.cpp

# End Source File

# End Target

# End Project