mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-28 11:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/VC++Files/sql
History
unknown 173e5df37f Merge mishka.local:/home/my/mysql-4.1 
into  mishka.local:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
  Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
configure.in:
  Auto merged
mysql-test/include/ps_conv.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/client/mysqltest.dsp:
  manual merge
VC++Files/sql/mysqld.dsp:
  manual merge
mysql-test/r/grant2.result:
  patch merge
mysql-test/r/subselect2.result:
  manual merge
mysql-test/t/grant2.test:
  patch merge
mysys/charset.c:
  Remove already deleted function
sql/examples/ha_archive.h:
  Manual merge
sql/sql_acl.cc:
  manual merge
sql/sql_db.cc:
  merge (no differences)
sql/sql_select.cc:
  manual merge
sql/table.h:
  merge (no differences)
tests/mysql_client_test.c:
  patch merge
2005-08-25 06:55:48 +03:00
..
old LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
message.mc Adding the file needed for windows build (on behalf of Reggie) 2004-08-27 03:27:16 +04:00
mysqld.dsp Merge mishka.local:/home/my/mysql-4.1 2005-08-25 06:55:48 +03:00
mysqld.dsw LOAD DATA INFILE is not replicated if replicate_*_table is set 2003-02-28 22:24:00 +02:00
mysqld.vcproj Conversions of dsp files to vcproj. These files are compatible with 2005-08-02 18:47:02 -05:00
mysqld_ia64.dsp Various fixes for Windows 2003 Platform SDK SP1 beta 2005-03-07 13:04:05 +01:00
mysqldmax.dsp prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw: 2005-01-01 20:27:51 +01:00
mysqldmax_ia64.dsp Various fixes for Windows 2003 Platform SDK SP1 beta 2005-03-07 13:04:05 +01:00