mariadb/mysql-test/std_data
unknown 16d46c9cba Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  Merge 5.0 -> 5.1
include/violite.h:
  Merge 5.0 -> 5.1
mysql-test/Makefile.am:
  Merge 5.0 -> 5.1
mysql-test/t/disabled.def:
  Merge 5.0 -> 5.1
sql/mysqld.cc:
  Merge 5.0 -> 5.1
vio/viossl.c:
  Merge 5.0 -> 5.1
vio/viosslfactories.c:
  Merge 5.0 -> 5.1
2006-05-12 08:45:22 +02:00
..
ndb_backup50 added missing files 2006-04-21 02:05:27 +02:00
ndb_backup51 modified ndb backup/restore to be byte order independant 2006-04-25 14:02:15 +02:00
bug16266.000001 Fix for BUG#16266: Definer is not fully qualified error during replication. 2006-03-01 14:13:07 +03:00
cacert.pem Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02:00
client-cert.pem Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02:00
client-key.pem Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02:00
des_key_file
init_file.dat symlink, not hardlink 2004-04-21 14:55:39 -05:00
loaddata1.dat
loaddata2.dat
loaddata3.dat Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105) 2003-12-14 06:39:52 +02:00
loaddata4.dat Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105) 2003-12-14 06:39:52 +02:00
loaddata5.dat Fix LOAD DATA to handle having the escape and enclosed-by character 2005-06-22 16:14:14 -07:00
loaddata_dq.dat Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-10-26 14:11:08 -07:00
loaddata_pair.dat Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes 2005-07-05 13:55:54 +02:00
master-bin.000001
Moscow_leap Fix for bug #6387 "Queried timestamp values do not match the inserted 2004-11-03 17:59:03 +00:00
ndb_config_mycnf1.cnf ndb 2005-09-30 12:19:15 +02:00
ndb_config_mycnf2.cnf Bug #13009 No gaps allowed in node id number sequence 2005-10-12 14:17:39 +02:00
rpl_loaddata.dat
rpl_loaddata2.dat
rpl_timezone.dat testing repl of timezone with LOAD DATA INFILE (hourra!) 2005-03-24 16:43:50 +01:00
rpl_timezone2.dat WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00
server-cert.pem Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02:00
server-key.pem Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02:00
trunc_binlog.000001 fix rpl_trunc_binlog to test the new behaviour 2005-02-19 22:24:13 +01:00
untrusted-cacert.pem Add an untrusted cacert used when testing 2006-05-03 14:10:22 +02:00
vchar.frm Update results for new varchar handling 2004-12-07 15:47:00 +02:00
warnings_loaddata.dat
words.dat
words2.dat WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00