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/mysql-test/std_data
History
unknown 5fab3969af Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


BitKeeper/deleted/.del-im_check_os.inc:
  Auto merged
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
  Auto merged
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/im_utils.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/type_varchar.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_error.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use local. Alik will merge his changes manually.
mysql-test/lib/mtr_process.pl:
  Use local.
mysql-test/r/grant.result:
  Use local.
mysql-test/r/sp.result:
  Use local.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/t/grant.test:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/field.cc:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
sql/sp.cc:
  Manual merge.
sql/sp_head.h:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_view.cc:
  Manual merge.
2006-08-30 03:00:19 +04: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
14897.frm A fix for Bug#14897 "ResultSet.getString("table.column") sometimes 2006-08-30 00:38:58 +04:00
bug15328.cnf Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence 2006-05-11 14:13:14 +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
init_file.dat A fix and a test case for Bug#17843 "Certain stored procedures fail to 2006-07-04 23:46:15 +04: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
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