diff options
| author | unknown <monty@mysql.com> | 2006-05-04 15:58:30 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-05-04 15:58:30 +0300 |
| commit | 1f89605e4bd32d5e63a57288e500d9e9b569e9a7 (patch) | |
| tree | 6d293225bed8f1e3ed7c0029fbbaa3056aeb1ff4 /VC++Files | |
| parent | 79d87430db7aac8e9b763d63a2e51cc9946bdc8d (diff) | |
| parent | 63791773b166eed0958a598b5ea359b4f1b7222b (diff) | |
| download | mariadb-git-1f89605e4bd32d5e63a57288e500d9e9b569e9a7.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/myisamlog.c:
Auto merged
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/tools/delete_all.cpp:
Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
Use original file (my_user.c was already added in 5.1)
mysql-test/mysql-test-run.pl:
Manual merge
sql/handler.h:
Manual merge
sql/share/errmsg.txt:
Align error messages with 5.0
sql/sql_table.cc:
Manual merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
No changes
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/libmysqld/libmysqld.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysqld/libmysqld_ia64.dsp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp index 9c4485210a6..1c80147a8f5 100644 --- a/VC++Files/libmysqld/libmysqld.dsp +++ b/VC++Files/libmysqld/libmysqld.dsp @@ -363,6 +363,10 @@ SOURCE=..\mysys\my_getopt.c SOURCE=..\sql-common\my_time.c # End Source File # Begin Source File + +SOURCE=..\sql-common\my_user.c +# End Source File +# Begin Source File SOURCE=..\sql\net_serv.cpp
# End Source File
diff --git a/VC++Files/libmysqld/libmysqld_ia64.dsp b/VC++Files/libmysqld/libmysqld_ia64.dsp index b5223e38f2d..9668193fc1d 100644 --- a/VC++Files/libmysqld/libmysqld_ia64.dsp +++ b/VC++Files/libmysqld/libmysqld_ia64.dsp @@ -338,6 +338,10 @@ SOURCE="..\sql-common\my_time.c" # End Source File # Begin Source File +SOURCE="..\sql-common\my_user.c" +# End Source File +# Begin Source File + SOURCE=..\sql\net_serv.cpp # End Source File # Begin Source File |