List:Commits« Previous MessageNext Message »
From:paul Date:January 29 2006 1:45am
Subject:bk commit into 5.0 tree (paul:1.2011)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 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.2011 06/01/28 19:44:51 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.5 06/01/28 19:44:11 paul@stripped +1 -1
    Fix test result.

  mysql-test/r/information_schema.result
    1.97 06/01/28 19:44:11 paul@stripped +1 -1
    Fix test result.

  sql/table.h
    1.123 06/01/28 19:43:20 paul@stripped +2 -2
    Put I_S tables in lexical order.

  sql/sql_show.cc
    1.307 06/01/28 19:43:08 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.0

--- 1.306/sql/sql_show.cc	2006-01-24 06:48:13 -06:00
+++ 1.307/sql/sql_show.cc	2006-01-28 19:43:08 -06:00
@@ -4198,12 +4198,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.122/sql/table.h	2006-01-24 06:48:13 -06:00
+++ 1.123/sql/table.h	2006-01-28 19:43:20 -06:00
@@ -309,9 +309,9 @@
   SCH_TABLE_NAMES,
   SCH_TABLE_PRIVILEGES,
   SCH_TRIGGERS,
+  SCH_USER_PRIVILEGES,
   SCH_VARIABLES,
-  SCH_VIEWS,
-  SCH_USER_PRIVILEGES
+  SCH_VIEWS
 };
 
 

--- 1.96/mysql-test/r/information_schema.result	2006-01-24 06:48:13 -06:00
+++ 1.97/mysql-test/r/information_schema.result	2006-01-28 19:44:11 -06:00
@@ -50,8 +50,8 @@
 TABLE_CONSTRAINTS
 TABLE_PRIVILEGES
 TRIGGERS
-VIEWS
 USER_PRIVILEGES
+VIEWS
 columns_priv
 db
 func

--- 1.4/mysql-test/r/information_schema_db.result	2005-08-05 04:01:24 -05:00
+++ 1.5/mysql-test/r/information_schema_db.result	2006-01-28 19:44:11 -06:00
@@ -15,8 +15,8 @@
 TABLE_CONSTRAINTS
 TABLE_PRIVILEGES
 TRIGGERS
-VIEWS
 USER_PRIVILEGES
+VIEWS
 show tables from INFORMATION_SCHEMA like 'T%';
 Tables_in_information_schema (T%)
 TABLES
Thread
bk commit into 5.0 tree (paul:1.2011)paul29 Jan