diff options
| author | unknown <jimw@mysql.com> | 2005-11-30 12:17:01 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-30 12:17:01 -0800 |
| commit | 6653213a71b2df0540c97dddcc3d7ee9e710be90 (patch) | |
| tree | 0842357ad78347a6ab54d08343e906c55f7b72b0 /VC++Files | |
| parent | fc289724bba5f689dbe46666a70866ee0d297777 (diff) | |
| parent | 03e057cd9ec2feb08f00578a9f22801f8656d92d (diff) | |
| download | mariadb-git-6653213a71b2df0540c97dddcc3d7ee9e710be90.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
VC++Files/sql/mysqld.dsp:
Auto merged
sql/item.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/alter_table.result:
Resolve conflict
mysql-test/t/alter_table.test:
Resolve conflict
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/sql/mysqld.dsp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index db0ba956c41..ce8e36fde56 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -456,7 +456,7 @@ SOURCE=.\gstream.cpp # End Source File # Begin Source File -SOURCE=.\examples\ha_archive.cpp +SOURCE=.\ha_archive.cpp # End Source File # Begin Source File |