bk commit into 5.1 tree (lars:1.2321)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-25 17:12:09+02:00, lars@stripped +4 -0
  Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
  into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
  MERGE: 1.2307.1.5

  mysql-test/r/view.result@stripped, 2006-10-25 17:12:03+02:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.182.1.3

  mysql-test/t/view.test@stripped, 2006-10-25 17:12:03+02:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.165.1.3

  sql/sql_show.cc@stripped, 2006-10-25 17:12:04+02:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.366.1.1

  storage/myisam/mi_open.c@stripped, 2006-10-25 17:12:04+02:00, lars@stripped +0 -0
    Auto merged
    MERGE: 1.103.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/MERGE/mysql-5.1-merge/RESYNC

--- 1.104/storage/myisam/mi_open.c	2006-10-25 17:12:21 +02:00
+++ 1.105/storage/myisam/mi_open.c	2006-10-25 17:12:21 +02:00
@@ -348,6 +348,8 @@ MI_INFO *mi_open(const char *name, int m
 	      goto err;
 	    }
 	  }
+	  else if (pos->type == HA_KEYTYPE_BINARY)
+	    pos->charset= &my_charset_bin;
 	}
 	if (share->keyinfo[i].flag & HA_SPATIAL)
 	{

--- 1.367/sql/sql_show.cc	2006-10-25 17:12:21 +02:00
+++ 1.368/sql/sql_show.cc	2006-10-25 17:12:22 +02:00
@@ -1058,6 +1058,9 @@ int store_create_info(THD *thd, TABLE_LI
     packet->append(STRING_WITH_LEN("CREATE TEMPORARY TABLE "));
   else
     packet->append(STRING_WITH_LEN("CREATE TABLE "));
+  if (create_info_arg &&
+      (create_info_arg->options & HA_LEX_CREATE_IF_NOT_EXISTS))
+    packet->append(STRING_WITH_LEN("IF NOT EXISTS "));
   if (table_list->schema_table)
     alias= table_list->schema_table->table_name;
   else

--- 1.185/mysql-test/r/view.result	2006-10-25 17:12:22 +02:00
+++ 1.186/mysql-test/r/view.result	2006-10-25 17:12:22 +02:00
@@ -2967,3 +2967,22 @@ ERROR HY000: CHECK OPTION failed 'test.v
 DROP VIEW v1;
 DROP TABLE t1;
 End of 5.0 tests.
+DROP DATABASE IF EXISTS `d-1`;
+CREATE DATABASE `d-1`;
+USE `d-1`;
+CREATE TABLE `t-1` (c1 INT);
+CREATE VIEW  `v-1` AS SELECT c1 FROM `t-1`;
+SHOW TABLES;
+Tables_in_d-1
+t-1
+v-1
+RENAME TABLE `t-1` TO `t-2`;
+RENAME TABLE `v-1` TO `v-2`;
+SHOW TABLES;
+Tables_in_d-1
+t-2
+v-2
+DROP TABLE `t-2`;
+DROP VIEW  `v-2`;
+DROP DATABASE `d-1`;
+USE test;

--- 1.168/mysql-test/t/view.test	2006-10-25 17:12:22 +02:00
+++ 1.169/mysql-test/t/view.test	2006-10-25 17:12:22 +02:00
@@ -2900,3 +2900,22 @@ DROP VIEW v1;
 DROP TABLE t1;
 
 --echo End of 5.0 tests.
+
+#
+# Bug#21370 View renaming lacks tablename_to_filename encoding
+#
+--disable_warnings
+DROP DATABASE IF EXISTS `d-1`;
+--enable_warnings
+CREATE DATABASE `d-1`;
+USE `d-1`;
+CREATE TABLE `t-1` (c1 INT);
+CREATE VIEW  `v-1` AS SELECT c1 FROM `t-1`;
+SHOW TABLES;
+RENAME TABLE `t-1` TO `t-2`;
+RENAME TABLE `v-1` TO `v-2`;
+SHOW TABLES;
+DROP TABLE `t-2`;
+DROP VIEW  `v-2`;
+DROP DATABASE `d-1`;
+USE test;