diff options
| author | unknown <lenz@mysql.com> | 2004-11-22 17:12:45 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-11-22 17:12:45 +0100 |
| commit | 12c0a34205c2c8d449b388960834eb7d24ce3e97 (patch) | |
| tree | 861f4dbca77d94a11efaab671da89b2e158bfc8e | |
| parent | 25678df9b11a1515fb18e52b5200b9204a84af26 (diff) | |
| parent | 77305900805c18791b60060e676b848500e25651 (diff) | |
| download | mariadb-git-12c0a34205c2c8d449b388960834eb7d24ce3e97.tar.gz | |
Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | VC++Files/client/mysqladmin.dsp | 2 |
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 |