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

into mysql.com:/space/my/mysql-4.1-build

Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
e72acc42 · lenz@mysql.com · 4edd0f3a · 51e18c21 · e72acc42 · e72acc42
Commit e72acc42 authored Nov 22, 2004 by lenz@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.bzrignore .bzrignore +1 -0

VC++Files/client/mysqladmin.dsp VC++Files/client/mysqladmin.dsp +1 -1

No files found.
--- a/.bzrignore
+++ b/.bzrignore
@@ -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
--- a/VC++Files/client/mysqladmin.dsp
+++ b/VC++Files/client/mysqladmin.dsp
@@ -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