mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/ndb
History
unknown 9f7548ae36 Merge mysql.com:/home/jimw/my/tmp_merge 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/user_var.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Resolve conflict
mysql-test/ndb/ndbcluster.sh:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
sql/share/errmsg.txt:
  Resolve conflict
2006-04-30 09:43:26 -07:00
..
basic.result updated ndb_mgm test 2005-01-09 23:02:06 +01:00
basic.test ndbcluster.sh: 2004-12-08 21:48:32 +00:00
basic_log.result ndbcluster.sh: 2004-12-08 21:48:32 +00:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00
ndb_config_1_node.ini ndb dd - 2006-01-15 20:45:08 +01:00
ndb_config_2_node.ini added config parameter InitialNoOfOpenFiles 2006-03-22 10:17:29 +01:00
ndb_config_4_node.ini ndb dd - 2006-01-15 20:45:08 +01:00
ndbcluster.sh Merge mysql.com:/home/jimw/my/tmp_merge 2006-04-30 09:43:26 -07:00
restart.result ndbcluster.sh: 2004-12-08 22:56:23 +00:00
restart.test updated ndb_mgm test 2005-01-09 23:02:06 +01:00
restart_log.result ndbcluster.sh: 2004-12-08 22:56:23 +00:00