mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/std_data
History
unknown f296bb095d Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  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/auto_increment.result:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/symlink.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/date_formats.test:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  manual merge
include/violite.h:
  Automatic
mysql-test/Makefile.am:
  manual merge
mysql-test/r/mysqldump.result:
  Automatic
mysql-test/r/rpl_user_variables.result:
  Manual merge (diff is because lars removed displaying of binlog)
mysql-test/t/disabled.def:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge
mysql-test/t/rpl_user_variables.test:
  manual merge (Changes becasue of lars removed binlog logging)
sql/mysqld.cc:
  manual merge
vio/viossl.c:
  manual merge
vio/viosslfactories.c:
  manual merge
client/client_priv.h.rej:
  merge 5.0 -> 5.1
2006-05-09 20:50:29 +03: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 ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 2006-05-09 20:50:29 +03:00
client-cert.pem Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 2006-05-09 20:50:29 +03:00
client-key.pem Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 2006-05-09 20:50:29 +03:00
des_key_file Added FLUSH DES_KEY_FILE. 2001-12-13 15:53:18 +02:00
init_file.dat symlink, not hardlink 2004-04-21 14:55:39 -05:00
loaddata1.dat Fixed that reading a DATE string of 000000 is interpreted as 0000-00-00 instead of 2000-00-00 2003-05-05 14:52:39 +03:00
loaddata2.dat Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files. 2003-08-22 04:07:40 +03:00
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 Changed binlog name padding from binlog.001 to binlog.000001 2002-10-29 15:11:13 -07:00
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 Guard against compiling without -fno-exceptions 2003-01-14 11:27:26 +02:00
rpl_loaddata2.dat Fix for BUG#1391: 2003-09-25 00:14:46 +02:00
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 ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 2006-05-09 20:50:29 +03:00
server-key.pem Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 2006-05-09 20:50:29 +03: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 update the test for LOAD DATA INFILE warnings 2003-04-22 00:54:33 -07:00
words.dat Fixed multi-table-delete for InnoDB tables 2003-02-17 02:14:37 +02:00
words2.dat WL#1012: All changes as one single changeset. 2005-12-22 06:39:02 +01:00