mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 08:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/VC++Files/client
History
unknown c3c5f8d6d7 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
  Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
  Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
  Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysql.sln:
  Auto merged
VC++Files/mysql_ia64.dsw:
  Auto merged
client/mysql.cc:
  Auto merged
config/ac-macros/zlib.m4:
  Auto merged
configure.in:
  Auto merged
extra/yassl/Makefile.am:
  Auto merged
extra/yassl/taocrypt/Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.def:
  Auto merged
libmysqld/libmysqld.def:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
client/Makefile.am:
  Resolve conflict
config/ac-macros/yassl.m4:
  Resolve conflict
mysql-test/include/have_udf.inc:
  Resolve conflict
mysql-test/lib/mtr_process.pl:
  Resolve conflict
mysql-test/mysql-test-run.pl:
  Resolve conflict
mysql-test/r/have_udf.require:
  Resolve conflict
mysql-test/r/rpl_openssl.result:
  Resolve conflict
mysql-test/t/disabled.def:
  Resolve conflict
mysql-test/t/information_schema.test:
  Resolve conflict
server-tools/instance-manager/instance_options.cc:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
support-files/mysql.spec.sh:
  Resolve conflict
2006-04-30 13:27:38 -07:00
..
mysql.dsp Many files: 2005-06-09 16:53:08 +02:00
mysql.vcproj Removed all Visual Studio .Net .vcproj files to be able to 2005-09-30 16:33:27 +02:00
mysql_ia64.dsp - applied more changes to enable the CP932 charset on Windows 2005-05-24 22:42:43 +02:00
mysql_upgrade.dsp bug #18115 (mysql_upgrade on Windows) 2006-04-28 09:07:25 +05:00
mysql_upgrade.vcproj bug #18115 (mysql_upgrade on Windows) 2006-04-28 09:07:25 +05:00
mysql_upgrade_ia64.dsp bug #18115 (mysql_upgrade on Windows) 2006-04-28 09:07:25 +05:00
mysqladmin.dsp Many files: 2005-06-09 16:53:08 +02:00
mysqladmin.vcproj Removed all Visual Studio .Net .vcproj files to be able to 2005-09-30 16:33:27 +02:00
mysqladmin_ia64.dsp - applied more changes to enable the CP932 charset on Windows 2005-05-24 22:42:43 +02:00
mysqlcheck.dsp - applied more changes to enable the CP932 charset on Windows 2005-05-24 22:42:43 +02:00
mysqlcheck_ia64.dsp - applied more changes to enable the CP932 charset on Windows 2005-05-24 22:42:43 +02:00
mysqlclient.dsp Merge mysql.com:/home/jimw/my/mysql-5.0-7003 2005-08-02 16:50:09 -07:00
mysqlclient.dsw LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
mysqlclient.vcproj mysqlimport.c: 2006-02-18 08:46:18 +01:00
mysqlclient_ia64.dsp Merge mysql.com:/home/jimw/my/mysql-5.0-7003 2005-08-02 16:50:09 -07:00
mysqldump.dsp Many files: 2005-06-09 16:53:08 +02:00
mysqldump.vcproj Windows compile fixes in preparation for 5.1.6 beta. 2006-01-30 13:09:08 +01:00
mysqldump_ia64.dsp - applied more changes to enable the CP932 charset on Windows 2005-05-24 22:42:43 +02:00
mysqlimport.dsp Many files: 2005-06-09 16:53:08 +02:00
mysqlimport.vcproj Removed all Visual Studio .Net .vcproj files to be able to 2005-09-30 16:33:27 +02:00
mysqlimport_ia64.dsp - applied more changes to enable the CP932 charset on Windows 2005-05-24 22:42:43 +02:00
mysqlshow.dsp Many files: 2005-06-09 16:53:08 +02:00
mysqlshow.vcproj Removed all Visual Studio .Net .vcproj files to be able to 2005-09-30 16:33:27 +02:00
mysqlshow_ia64.dsp - applied more changes to enable the CP932 charset on Windows 2005-05-24 22:42:43 +02:00
mysqlslap.vcproj Fix mysqlslap.vcproj dependencies also for Release and classic configuration. 2006-01-30 14:10:12 +01:00
mysqltest.dsp mysqld.dsp: 2005-08-18 17:29:24 +02:00
mysqltest.vcproj Removed all Visual Studio .Net .vcproj files to be able to 2005-09-30 16:33:27 +02:00
mysqltest_ia64.dsp - applied more changes to enable the CP932 charset on Windows 2005-05-24 22:42:43 +02:00