Add timeout for shutdown to mysql-test-run

Docs/manual.texi:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Add timeout for shutdown
mysql-test/r/innodb.result:
  Use local test
mysql-test/t/innodb.test:
  merge

1 files changed, 13 insertions, 1 deletions

diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 3ff3e15e88e..f5f93be98a6 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -827,7 +827,8 @@ ha_innobase::bas_ext() const
 /*********************************************************************
 Normalizes a table name string. A normalized name consists of the
 database name catenated to '/' and table name. An example:
-test/mytable. */
+test/mytable. On Windows normalization puts both the database name and the
+table name always to lower case. */
 static
 void
 normalize_table_name(
@@ -863,6 +864,17 @@ normalize_table_name(
 	memcpy(norm_name, db_ptr, strlen(name) + 1 - (db_ptr - name));
 
 	norm_name[name_ptr - db_ptr - 1] = '/';
+
+#ifdef __WIN__
+	/* Put to lower case */
+
+	ptr = norm_name;
+
+	while (*ptr != '\0') {
+	        *ptr = tolower(*ptr);
+	        ptr++;
+	}
+#endif
 }
 
 /*********************************************************************