summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlenz@mysql.com <>2004-11-22 17:08:06 +0100
committerlenz@mysql.com <>2004-11-22 17:08:06 +0100
commit51e18c217a4b2b31d44930892d664229fbf3f9c3 (patch)
tree281ae8d28b483b598201b8ad53cfa837b29ccb94
parent9f6d5a02ca2c64600e6644957ca2d6f934bce26b (diff)
downloadmariadb-git-51e18c217a4b2b31d44930892d664229fbf3f9c3.tar.gz
- renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds
-rw-r--r--.bzrignore1
-rw-r--r--VC++Files/client/mysqladmin.dsp2
2 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index 670d46db613..10388d79013 100644
--- 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
diff --git a/VC++Files/client/mysqladmin.dsp b/VC++Files/client/mysqladmin.dsp
index a7e4404e253..7a0b3bec1a7 100644
--- 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