List:Commits« Previous MessageNext Message »
From:Paul DuBois Date:January 29 2006 1:15am
Subject:Re: bk commit into 5.1 tree (paul:1.2084)
View as plain text  
Argh.  I meant to do this in the 5.0 tree, so I'm not going to push
this changeset.

At 19:07 -0600 1/28/06, paul@stripped wrote:
>Below is the list of changes that have just been committed into a local
>5.1 repository of paul. When paul 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.2084 06/01/28 19:07:18 paul@stripped +4 -0
>   information_schema_db.result, information_schema.result:
>     Fix test result.
>   table.h, sql_show.cc:
>     Put I_S tables in lexical order.
>
>   mysql-test/r/information_schema_db.result
>     1.10 06/01/28 19:06:39 paul@stripped +1 -1
>     Fix test result.
>
>   mysql-test/r/information_schema.result
>     1.104 06/01/28 19:06:31 paul@stripped +1 -1
>     Fix test result.
>
>   sql/table.h
>     1.126 06/01/28 19:06:11 paul@stripped +2 -2
>     Put I_S tables in lexical order.
>
>   sql/sql_show.cc
>     1.294 06/01/28 19:05:52 paul@stripped +2 -2
>     Put I_S tables in lexical order.
>
># 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:	paul
># Host:	snake-hub.snake.net
># Root:	/src/extern/MySQL/bk/mysql-5.1
>
>--- 1.293/sql/sql_show.cc	2006-01-18 20:56:01 -06:00
>+++ 1.294/sql/sql_show.cc	2006-01-28 19:05:52 -06:00
>@@ -4683,12 +4683,12 @@
>      fill_schema_table_privileges, 0, 0, -1, -1, 0},
>    {"TRIGGERS", triggers_fields_info, create_schema_table,
>     get_all_tables, make_old_format, get_schema_triggers_record, 5, 6, 0},
>+  {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table,
>+    fill_schema_user_privileges, 0, 0, -1, -1, 0},
>    {"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
>     make_old_format, 0, -1, -1, 1},
>    {"VIEWS", view_fields_info, create_schema_table,
>      get_all_tables, 0, get_schema_views_record, 1, 2, 0},
>-  {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table,
>-    fill_schema_user_privileges, 0, 0, -1, -1, 0},
>    {0, 0, 0, 0, 0, 0, 0, 0, 0}
>  };
>
>
>--- 1.125/sql/table.h	2006-01-18 20:56:01 -06:00
>+++ 1.126/sql/table.h	2006-01-28 19:06:11 -06:00
>@@ -352,9 +352,9 @@
>    SCH_TABLE_NAMES,
>    SCH_TABLE_PRIVILEGES,
>    SCH_TRIGGERS,
>+  SCH_USER_PRIVILEGES,
>    SCH_VARIABLES,
>-  SCH_VIEWS,
>-  SCH_USER_PRIVILEGES
>+  SCH_VIEWS
>  };
>
>
>
>--- 1.103/mysql-test/r/information_schema.result	2006-01-18 
>20:55:59 -06:00
>+++ 1.104/mysql-test/r/information_schema.result	2006-01-28 
>19:06:31 -06:00
>@@ -55,8 +55,8 @@
>  TABLE_CONSTRAINTS
>  TABLE_PRIVILEGES
>  TRIGGERS
>-VIEWS
>  USER_PRIVILEGES
>+VIEWS
>  binlog_index
>  columns_priv
>  db
>
>--- 1.9/mysql-test/r/information_schema_db.result	2006-01-10 
>09:42:19 -06:00
>+++ 1.10/mysql-test/r/information_schema_db.result	2006-01-28 
>19:06:39 -06:00
>@@ -18,8 +18,8 @@
>  TABLE_CONSTRAINTS
>  TABLE_PRIVILEGES
>  TRIGGERS
>-VIEWS
>  USER_PRIVILEGES
>+VIEWS
>  show tables from INFORMATION_SCHEMA like 'T%';
>  Tables_in_information_schema (T%)
>  TABLES
>
>--
>MySQL Code Commits Mailing List
>For list archives: http://lists.mysql.com/commits
>To unsubscribe:    http://lists.mysql.com/commits?unsub=1


-- 
Paul DuBois, MySQL Documentation Team
Madison, Wisconsin, USA
MySQL AB, www.mysql.com
Thread
bk commit into 5.1 tree (paul:1.2084)paul29 Jan
  • Re: bk commit into 5.1 tree (paul:1.2084)Paul DuBois29 Jan