bk commit into 5.0 tree (bell:1.1966)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell 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
  1.1966 05/09/16 09:15:45 bell@stripped +2 -0
  fixed length detection

  sql/sql_show.cc
    1.283 05/09/16 09:15:41 bell@stripped +4 -4
    fixed typo
    fixed length detection

  mysql-test/r/information_schema.result
    1.82 05/09/16 09:15:41 bell@stripped +8 -8
    fixed length detection

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-owner2-5.0

--- 1.282/sql/sql_show.cc	2005-09-15 15:39:39 +03:00
+++ 1.283/sql/sql_show.cc	2005-09-16 09:15:41 +03:00
@@ -2952,7 +2952,7 @@
   CHARSET_INFO *cs= system_charset_info;
   DBUG_ENTER("get_schema_views_record");
   char definer[HOSTNAME_LENGTH + USERNAME_LENGTH + 2];
-  uint defiler_len;
+  uint definer_len;
   if (!res)
   {
     if (tables->view)
@@ -2977,9 +2977,9 @@
         table->field[5]->store(STRING_WITH_LEN("YES"), cs);
       else
         table->field[5]->store(STRING_WITH_LEN("NO"), cs);
-      defiler_len= (strxmov(definer, tables->definer.user.str, "@",
-                            tables->definer.host.str, NullS) - definer) - 1;
-      table->field[6]->store(definer, defiler_len, cs);
+      definer_len= (strxmov(definer, tables->definer.user.str, "@",
+                            tables->definer.host.str, NullS) - definer);
+      table->field[6]->store(definer, definer_len, cs);
       if (tables->view_suid)
         table->field[7]->store(STRING_WITH_LEN("DEFINER"), cs);
       else

--- 1.81/mysql-test/r/information_schema.result	2005-09-15 11:56:02 +03:00
+++ 1.82/mysql-test/r/information_schema.result	2005-09-16 09:15:41 +03:00
@@ -361,11 +361,11 @@
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 select * from information_schema.views where TABLE_NAME like "v%";
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	test	v0	select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from
`information_schema`.`schemata`	NONE	NO	root@localhos	DEFINER
-NULL	test	v1	select sql_no_cache `tables`.`TABLE_NAME` AS `c` from
`information_schema`.`tables` where (`tables`.`TABLE_NAME` =
_utf8'v1')	NONE	NO	root@localhos	DEFINER
-NULL	test	v2	select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from
`information_schema`.`columns` where (`columns`.`TABLE_NAME` =
_utf8'v2')	NONE	NO	root@localhos	DEFINER
-NULL	test	v3	select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from
`information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like
_utf8'latin1%')	NONE	NO	root@localhos	DEFINER
-NULL	test	v4	select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from
`information_schema`.`collations` where (`collations`.`COLLATION_NAME` like
_utf8'latin1%')	NONE	NO	root@localhos	DEFINER
+NULL	test	v0	select sql_no_cache `schemata`.`SCHEMA_NAME` AS `c` from
`information_schema`.`schemata`	NONE	NO	root@localhost	DEFINER
+NULL	test	v1	select sql_no_cache `tables`.`TABLE_NAME` AS `c` from
`information_schema`.`tables` where (`tables`.`TABLE_NAME` =
_utf8'v1')	NONE	NO	root@localhost	DEFINER
+NULL	test	v2	select sql_no_cache `columns`.`COLUMN_NAME` AS `c` from
`information_schema`.`columns` where (`columns`.`TABLE_NAME` =
_utf8'v2')	NONE	NO	root@localhost	DEFINER
+NULL	test	v3	select sql_no_cache `character_sets`.`CHARACTER_SET_NAME` AS `c` from
`information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like
_utf8'latin1%')	NONE	NO	root@localhost	DEFINER
+NULL	test	v4	select sql_no_cache `collations`.`COLLATION_NAME` AS `c` from
`information_schema`.`collations` where (`collations`.`COLLATION_NAME` like
_utf8'latin1%')	NONE	NO	root@localhost	DEFINER
 drop view v0, v1, v2, v3, v4;
 create table t1 (a int);
 grant select,update,insert on t1 to mysqltest_1@localhost;
@@ -456,9 +456,9 @@
 create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION;
 select * from information_schema.views;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE
-NULL	test	v1	select `test`.`t1`.`a` AS `c` from
`test`.`t1`	CASCADED	YES	root@localhos	DEFINER
-NULL	test	v2	select `test`.`t1`.`a` AS `c` from
`test`.`t1`	LOCAL	YES	root@localhos	DEFINER
-NULL	test	v3	select `test`.`t1`.`a` AS `c` from
`test`.`t1`	CASCADED	YES	root@localhos	DEFINER
+NULL	test	v1	select `test`.`t1`.`a` AS `c` from
`test`.`t1`	CASCADED	YES	root@localhost	DEFINER
+NULL	test	v2	select `test`.`t1`.`a` AS `c` from
`test`.`t1`	LOCAL	YES	root@localhost	DEFINER
+NULL	test	v3	select `test`.`t1`.`a` AS `c` from
`test`.`t1`	CASCADED	YES	root@localhost	DEFINER
 grant select (a) on test.t1 to joe@localhost with grant option;
 select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES;
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	PRIVILEGE_TYPE	IS_GRANTABLE