mirror of
https://github.com/MariaDB/server.git
synced 2026-05-10 00:54:30 +02:00
Merge of 4.1 -> 5.0
VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/client/mysqlclient_ia64.dsp: Auto merged VC++Files/client/mysqltest.dsp: Auto merged BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/libmysql/libmysql_ia64.dsp: Auto merged VC++Files/strings/strings.dsp: Auto merged VC++Files/strings/strings_ia64.dsp: Auto merged include/config-win.h: Auto merged myisammrg/myrg_open.c: Auto merged mysys/my_getwd.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisammrg.cc: Auto merged configure.in: - manual merge, fixed NDB_VERSION_BUILD
This commit is contained in:
commit
29fb604ddf
29 changed files with 76 additions and 327 deletions
Loading…
Add table
Add a link
Reference in a new issue