mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/VC++Files
History
unknown 4ad51359c1 Merge with 4.1 
(Includes merge of arena code in 4.1 and 5.0)



BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/client_settings.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/func_like.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/rpl_charset.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqlbinlog.cc:
  Merge with 4.1
configure.in:
  Merge with 4.1
include/mysqld_error.h:
  Add new error message (1) from 4.1
mysql-test/mysql-test-run.sh:
  Merge with 4.1
mysql-test/r/func_gconcat.result:
  Merge with 4.1
mysql-test/r/func_if.result:
  Merge with 4.1
mysql-test/r/grant.result:
  Merge with 4.1
mysql-test/r/join_outer.result:
  Merge with 4.1
mysql-test/r/rpl_charset.result:
  Merge with 4.1 (This has to be fixed before pushing)
mysql-test/r/system_mysql_db.result:
  Merge with 4.1.
  Added collation to new privileges
mysql-test/t/grant.test:
  Merge with 4.1
mysql-test/t/grant_cache.test:
  Merge with 4.1
mysql-test/t/show_check.test:
  Merge with 4.1
sql/Makefile.am:
  Merge with 4.1
sql/item.cc:
  Merge with 4.1
sql/item_cmpfunc.cc:
  Merge with 4.1 (arena code)
sql/item_subselect.cc:
  Merge with 4.1
sql/item_subselect.h:
  Merge with 4.1
sql/item_sum.cc:
  Merge with 4.1
sql/item_sum.h:
  Merge with 4.1
sql/log.cc:
  Merge with 4.1 (Remove code that is not relevant for 5.0)
sql/mysqld.cc:
  Merge with 4.1
sql/opt_range.cc:
  Merge with 4.1
sql/share/czech/errmsg.txt:
  Merge with 4.1
sql/share/danish/errmsg.txt:
  Merge with 4.1
sql/share/dutch/errmsg.txt:
  Merge with 4.1
sql/share/english/errmsg.txt:
  Merge with 4.1
sql/share/estonian/errmsg.txt:
  Merge with 4.1
sql/share/french/errmsg.txt:
  Merge with 4.1
sql/share/german/errmsg.txt:
  Merge with 4.1
sql/share/greek/errmsg.txt:
  Merge with 4.1
sql/share/hungarian/errmsg.txt:
  Merge with 4.1
sql/share/italian/errmsg.txt:
  Merge with 4.1
sql/share/japanese/errmsg.txt:
  Merge with 4.1
sql/share/korean/errmsg.txt:
  Merge with 4.1
sql/share/norwegian-ny/errmsg.txt:
  Merge with 4.1
sql/share/norwegian/errmsg.txt:
  Merge with 4.1
sql/share/polish/errmsg.txt:
  Merge with 4.1
sql/share/portuguese/errmsg.txt:
  Merge with 4.1
sql/share/romanian/errmsg.txt:
  Merge with 4.1
sql/share/russian/errmsg.txt:
  Merge with 4.1
sql/share/serbian/errmsg.txt:
  Merge with 4.1
sql/share/slovak/errmsg.txt:
  Merge with 4.1
sql/share/spanish/errmsg.txt:
  Merge with 4.1
sql/share/swedish/errmsg.txt:
  Merge with 4.1
sql/share/ukrainian/errmsg.txt:
  Merge with 4.1
sql/sql_base.cc:
  Merge with 4.1
sql/sql_class.cc:
  Merge with 4.1
  Use arena code from 4.1
sql/sql_class.h:
  Merge with 4.1
  Use arena code from 4.1
sql/sql_derived.cc:
  Merge with 4.1
sql/sql_lex.cc:
  Merge with 4.1
sql/sql_lex.h:
  Merge with 4.1
sql/sql_parse.cc:
  Merge with 4.1
sql/sql_prepare.cc:
  Merge with 4.1
sql/sql_select.cc:
  Merge with 4.1
sql/sql_table.cc:
  Merge with 4.1
sql/sql_union.cc:
  Merge with 4.1
sql/sql_yacc.yy:
  Merge with 4.1
sql/tztime.cc:
  Merge with 4.1
tests/client_test.c:
  Merge with 4.1
2004-09-06 15:14:10 +03:00
..
bdb Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
client Added missing my_time.c file to mysqlclient project 2004-06-28 00:42:02 +03:00
comp_err removed reference to not existing library lib_release\dbug.lib 2004-05-27 22:53:36 +03:00
contrib
dbug Proposed fix for bug #3818 (libmysqld.dll leads to program's crash) 2004-05-26 00:27:00 +05:00
examples/udf_example BUG#3439 problem with UDF functions 2004-06-08 12:35:22 +06:00
heap Proposed fix for bug #3818 (libmysqld.dll leads to program's crash) 2004-05-26 00:27:00 +05:00
innobase - Windows compile fix: added srv/srv0que.c to the innobase project 2004-08-05 16:50:03 +02:00
isam Proposed fix for bug #3818 (libmysqld.dll leads to program's crash) 2004-05-26 00:27:00 +05:00
isamchk Fixed typo 2004-05-25 02:49:43 +03:00
libmysql Fix for Bug#4030 "Client side conversion string -> date type doesn't 2004-06-24 19:08:36 +04:00
libmysqld - Added sql/parse_file.cpp and sql/sql_view.cpp to the mysqld and 2004-07-16 20:59:09 +02:00
libmysqltest Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
merge Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 2004-05-19 16:38:12 +03:00
my_print_defaults Fixed typo 2004-05-25 02:49:43 +03:00
myisam merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
myisam_ftdump Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
myisamchk Merge with 4.0 to get typo-fix 2004-05-25 02:57:51 +03:00
myisamlog Merge with 4.0 to get typo-fix 2004-05-25 02:57:51 +03:00
myisammrg merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
myisampack Merge with 4.0 to get typo-fix 2004-05-25 02:57:51 +03:00
mysqlbinlog Merge with 4.0 to get typo-fix 2004-05-25 02:57:51 +03:00
mysqlcheck Fixed typo 2004-05-25 02:49:43 +03:00
mysqldemb Merge with 4.0 to get fixes for project files 2004-05-25 16:01:37 +03:00
mysqlmanager Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
mysqlserver Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
mysqlshutdown Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
mysqlwatch Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 2004-05-19 16:38:12 +03:00
mysys merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
pack_isam Fixed typo 2004-05-25 02:49:43 +03:00
perror Fixed typo 2004-05-25 02:49:43 +03:00
regex Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 2004-05-19 16:38:12 +03:00
replace Fixed typo 2004-05-25 02:49:43 +03:00
sql Merge with 4.1 2004-09-06 15:14:10 +03:00
strings After merge fixes 2004-05-24 14:42:34 +03:00
test1 Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 2004-05-19 16:38:12 +03:00
thr_insert_test
thr_test Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 2004-05-19 16:38:12 +03:00
vio Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 2004-05-19 16:38:12 +03:00
winmysqladmin mysql_com.h: 2004-08-19 15:15:52 +02:00
zlib First step of implementation of WL#1518 "make bundled zlib 2004-07-21 17:36:26 -07:00
copy_mysql_files.bat Fixed VC++ project files 2004-05-25 15:53:29 +03:00
fix-project-files
mysql.dsp
mysql.dsw Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
prepare
README.build-files Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' 2004-05-19 16:38:12 +03:00

README.build-files 

Some notes about building MySQL with VC++

- After bulding all projects, you get the files in the following directories:

Directory		Content

lib_debug		Debug libraries
lib_release		Release libraries
lib_classic		Embedded server libraries for classic
lib_pro			Embedded server libraries for pro
client_debug		Debug executables
client_release		Client release
client_classic		Commerical binaries (classic)
client_pro		Commerical binaries (unique for pro version)
include			Include files

The copy_mysql_files.bat script can be used to copy the generated
files to c:\mysql