List:Commits« Previous MessageNext Message »
From:Marc Alff Date:April 13 2010 2:30pm
Subject:bzr push into mysql-next-mr-bugfixing branch (marc.alff:3129)
View as plain text  
 3129 Marc Alff	2010-04-13 [merge]
      local merge

    modified:
      mysql-test/r/count_distinct.result
      mysql-test/t/count_distinct.test
      sql/sql_select.cc
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
      storage/perfschema/unittest/pfs_instr_class-oom-t.cc
      storage/perfschema/unittest/pfs_instr_class-t.cc
=== modified file 'mysql-test/suite/perfschema/r/dml_cond_instances.result'
--- a/mysql-test/suite/perfschema/r/dml_cond_instances.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_cond_instances.result	2010-03-18 15:35:06 +0000
@@ -16,8 +16,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.COND_INSTANCES;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'COND_INSTANCES'
 LOCK TABLES performance_schema.COND_INSTANCES READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'COND_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'COND_INSTANCES'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.COND_INSTANCES WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'COND_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'COND_INSTANCES'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_events_waits_current.result'
--- a/mysql-test/suite/perfschema/r/dml_events_waits_current.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_current.result	2010-03-18 15:35:06 +0000
@@ -21,8 +21,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.EVENTS_WAITS_CURRENT;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 LOCK TABLES performance_schema.EVENTS_WAITS_CURRENT READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.EVENTS_WAITS_CURRENT WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_events_waits_history.result'
--- a/mysql-test/suite/perfschema/r/dml_events_waits_history.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_history.result	2010-03-18 15:35:06 +0000
@@ -29,8 +29,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.EVENTS_WAITS_HISTORY;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY'
 LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_events_waits_history_long.result'
--- a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result	2010-03-18 15:35:06 +0000
@@ -29,8 +29,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.EVENTS_WAITS_HISTORY_LONG;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG'
 LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.EVENTS_WAITS_HISTORY_LONG WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_HISTORY_LONG'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_ews_by_event_name.result'
--- a/mysql-test/suite/perfschema/r/dml_ews_by_event_name.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_event_name.result	2010-03-18 15:35:06 +0000
@@ -21,8 +21,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_EVENT_NAME;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME'
 LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_EVENT_NAME READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_EVENT_NAME WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_EVENT_NAME'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_ews_by_instance.result'
--- a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result	2010-03-18 15:35:06 +0000
@@ -38,8 +38,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE'
 LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_INSTANCE WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_INSTANCE'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result'
--- a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result	2010-03-18 15:35:06 +0000
@@ -22,8 +22,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME'
 LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_SUMMARY_BY_THREAD_BY_EVENT_NAME'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_file_instances.result'
--- a/mysql-test/suite/perfschema/r/dml_file_instances.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_file_instances.result	2010-03-18 15:35:06 +0000
@@ -16,8 +16,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.FILE_INSTANCES;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
 LOCK TABLES performance_schema.FILE_INSTANCES READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.FILE_INSTANCES WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result'
--- a/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result	2010-03-18 15:35:06 +0000
@@ -21,8 +21,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.FILE_SUMMARY_BY_EVENT_NAME;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME'
 LOCK TABLES performance_schema.FILE_SUMMARY_BY_EVENT_NAME READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.FILE_SUMMARY_BY_EVENT_NAME WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_EVENT_NAME'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result'
--- a/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result	2010-03-18 15:35:06 +0000
@@ -21,8 +21,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.FILE_SUMMARY_BY_INSTANCE;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE'
 LOCK TABLES performance_schema.FILE_SUMMARY_BY_INSTANCE READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.FILE_SUMMARY_BY_INSTANCE WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'FILE_SUMMARY_BY_INSTANCE'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_mutex_instances.result'
--- a/mysql-test/suite/perfschema/r/dml_mutex_instances.result	2010-01-26 03:12:20 +0000
+++ b/mysql-test/suite/perfschema/r/dml_mutex_instances.result	2010-03-18 15:35:06 +0000
@@ -16,8 +16,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.MUTEX_INSTANCES;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES'
 LOCK TABLES performance_schema.MUTEX_INSTANCES READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.MUTEX_INSTANCES WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'MUTEX_INSTANCES'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_performance_timers.result'
--- a/mysql-test/suite/perfschema/r/dml_performance_timers.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_performance_timers.result	2010-03-18 15:35:06 +0000
@@ -22,8 +22,8 @@ delete from performance_schema.PERFORMAN
 where timer_name='CYCLE';
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS'
 LOCK TABLES performance_schema.PERFORMANCE_TIMERS READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.PERFORMANCE_TIMERS WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'PERFORMANCE_TIMERS'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_processlist.result'
--- a/mysql-test/suite/perfschema/r/dml_processlist.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/dml_processlist.result	2010-03-18 15:35:06 +0000
@@ -20,8 +20,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.PROCESSLIST;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'PROCESSLIST'
 LOCK TABLES performance_schema.PROCESSLIST READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'PROCESSLIST'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'PROCESSLIST'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.PROCESSLIST WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'PROCESSLIST'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'PROCESSLIST'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/dml_rwlock_instances.result'
--- a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result	2010-01-26 03:12:20 +0000
+++ b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result	2010-03-18 15:35:06 +0000
@@ -16,8 +16,8 @@ ERROR 42000: DELETE command denied to us
 delete from performance_schema.RWLOCK_INSTANCES;
 ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES'
 LOCK TABLES performance_schema.RWLOCK_INSTANCES READ;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES'
 UNLOCK TABLES;
 LOCK TABLES performance_schema.RWLOCK_INSTANCES WRITE;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'RWLOCK_INSTANCES'
 UNLOCK TABLES;

=== modified file 'mysql-test/suite/perfschema/r/privilege.result'
--- a/mysql-test/suite/perfschema/r/privilege.result	2010-01-12 01:47:27 +0000
+++ b/mysql-test/suite/perfschema/r/privilege.result	2010-03-18 15:35:06 +0000
@@ -52,9 +52,9 @@ ERROR 42000: Access denied for user 'roo
 grant TRIGGER on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 grant INSERT on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost;
-ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS'
+ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS'
 grant DELETE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost;
-ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS'
+ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table 'SETUP_INSTRUMENTS'
 grant SELECT on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost
 with GRANT OPTION;
 grant UPDATE on performance_schema.SETUP_INSTRUMENTS to 'pfs_user_3'@localhost
@@ -77,11 +77,11 @@ ERROR 42000: Access denied for user 'roo
 grant TRIGGER on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 grant INSERT on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost;
-ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 grant UPDATE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost;
-ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 grant DELETE on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost;
-ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 grant SELECT on performance_schema.EVENTS_WAITS_CURRENT to 'pfs_user_3'@localhost
 with GRANT OPTION;
 grant ALL on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost
@@ -102,11 +102,11 @@ ERROR 42000: Access denied for user 'roo
 grant TRIGGER on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 grant INSERT on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost;
-ERROR 42000: INSERT,GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
 grant UPDATE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost;
-ERROR 42000: UPDATE,GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
 grant DELETE on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost;
-ERROR 42000: DELETE,GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
 grant SELECT on performance_schema.FILE_INSTANCES to 'pfs_user_3'@localhost
 with GRANT OPTION;
 grant LOCK TABLES on performance_schema.* to 'pfs_user_3'@localhost
@@ -178,16 +178,16 @@ unlock tables;
 lock table performance_schema.SETUP_INSTRUMENTS write;
 unlock tables;
 lock table performance_schema.EVENTS_WAITS_CURRENT read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 unlock tables;
 lock table performance_schema.EVENTS_WAITS_CURRENT write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 unlock tables;
 lock table performance_schema.FILE_INSTANCES read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
 unlock tables;
 lock table performance_schema.FILE_INSTANCES write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'FILE_INSTANCES'
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -276,16 +276,16 @@ unlock tables;
 lock table performance_schema.SETUP_INSTRUMENTS write;
 unlock tables;
 lock table performance_schema.EVENTS_WAITS_CURRENT read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 unlock tables;
 lock table performance_schema.EVENTS_WAITS_CURRENT write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 unlock tables;
 lock table performance_schema.FILE_INSTANCES read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES'
 unlock tables;
 lock table performance_schema.FILE_INSTANCES write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'FILE_INSTANCES'
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -374,16 +374,16 @@ unlock tables;
 lock table performance_schema.SETUP_INSTRUMENTS write;
 unlock tables;
 lock table performance_schema.EVENTS_WAITS_CURRENT read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 unlock tables;
 lock table performance_schema.EVENTS_WAITS_CURRENT write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 unlock tables;
 lock table performance_schema.FILE_INSTANCES read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES'
 unlock tables;
 lock table performance_schema.FILE_INSTANCES write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'FILE_INSTANCES'
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -472,16 +472,16 @@ unlock tables;
 lock table performance_schema.SETUP_INSTRUMENTS write;
 unlock tables;
 lock table performance_schema.EVENTS_WAITS_CURRENT read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 unlock tables;
 lock table performance_schema.EVENTS_WAITS_CURRENT write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'EVENTS_WAITS_CURRENT'
 unlock tables;
 lock table performance_schema.FILE_INSTANCES read;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES'
 unlock tables;
 lock table performance_schema.FILE_INSTANCES write;
-ERROR 42000: SELECT,LOCK TABL command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'FILE_INSTANCES'
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access

=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2010-03-19 08:29:12 +0000
+++ b/sql/share/errmsg-utf8.txt	2010-04-13 14:23:10 +0000
@@ -3288,25 +3288,25 @@ ER_NONEXISTING_GRANT 42000 
         swe "Det finns inget privilegium definierat för användare '%-.48s' på '%-.64s'"
         ukr "Повноважень не визначено 0 
-        cze "%-.16s p-Bříkaz nepřístupný pro uživatele: '%-.48s'@'%-.64s' pro tabulku '%-.192s'"
-        dan "%-.16s-kommandoen er ikke tilladt for brugeren '%-.48s'@'%-.64s' for tabellen '%-.192s'"
-        nla "%-.16s commando geweigerd voor gebruiker: '%-.48s'@'%-.64s' voor tabel '%-.192s'"
-        eng "%-.16s command denied to user '%-.48s'@'%-.64s' for table '%-.192s'"
-        jps "コマンド %-.16s は ユーザー '%-.48s'@'%-.64s' ,テーブル '%-.192s' に対して許可されていません",
-        est "%-.16s käsk ei ole lubatud kasutajale '%-.48s'@'%-.64s' tabelis '%-.192s'"
-        fre "La commande '%-.16s' est interdite  '%-.192s'"
-        ger "%-.16s Befehl nicht erlaubt für Benutzer '%-.48s'@'%-.64s' auf Tabelle '%-.192s'"
-        hun "%-.16s parancs a '%-.48s'@'%-.64s' felhasznalo szamara nem engedelyezett a '%-.192s' tablaban"
-        ita "Comando %-.16s negato per l'utente: '%-.48s'@'%-.64s' sulla tabella '%-.192s'"
-        jpn "コマ,テーブル '%-.192s' に対して許可されていません"
-        kor "'%-.16s' 명령 : '%-.48s'@'%-.64s' for 테이블 '%-.192s'"
-        por "Comando '%-.16s' negado para o usu      rum "Comanda %-.16s interzisa utilizatorului: '%-.48s'@'%-.64s' pentru tabela '%-.192s'"
-        rus "Команда %-.16s запрещена пользователю '%-.48s'@'%-.64s' для таблицы '%-.192s'"
-        serbian "%-.16s komanda zabranjena za korisnika '%-.48s'@'%-.64s' za tabelu '%-.192s'"
-        spa "%-.16s comando negado para usuario: '%-.48s'@'%-.64s' para tabla '%-.192s'"
-        swe "%-.16s ej tillåtet för '%-.48s'@'%-.64s' för tabell '%-.192s'"
-        ukr "%-.16s команда заборонена користувачу: '%-.48s'@'%-.64s' у таблиці '%-.192s'"
+        cze "%-.128s p-Bříkaz nepřístupný pro uživatele: '%-.48s'@'%-.64s' pro tabulku '%-.64s'"
+        dan "%-.128s-kommandoen er ikke tilladt for brugeren '%-.48s'@'%-.64s' for tabellen '%-.64s'"
+        nla "%-.128s commando geweigerd voor gebruiker: '%-.48s'@'%-.64s' voor tabel '%-.64s'"
+        eng "%-.128s command denied to user '%-.48s'@'%-.64s' for table '%-.64s'"
+        jps "コマンド %-.128s は ユーザー '%-.48s'@'%-.64s' ,テーブル '%-.64s' に対して許可されていません",
+        est "%-.128s käsk ei ole lubatud kasutajale '%-.48s'@'%-.64s' tabelis '%-.64s'"
+        fre "La commande '%-.128s' est interdite à l'utilisateur: '%-.48s'@'@%-.64s' sur la table '%-.64s'"
+        ger "%-.128s Befehl nicht erlaubt für Benutzer '%-.48s'@'%-.64s' auf Tabelle '%-.64s'"
+        hun "%-.128s parancs a '%-.48s'@'%-.64s' felhasznalo szamara nem engedelyezett a '%-.64s' tablaban"
+        ita "Comando %-.128s negato per l'utente: '%-.48s'@'%-.64s' sulla tabella '%-.64s'"
+        jpn "コマンド %-.128s は ユーザー '%-.48s'@'%-.64s' ,テーブル '%-.64s' に対して許可され: '%-.48s'@'%-.64s' for 테이블 '%-.64s'"
+        por "Comando '%-.128s' negado para o usuário '%-.48s'@'%-.64s' na tabela '%-.64s'"
+        rum "Comanda %-.128s interzisa utilizatorului: '%-.48s'@'%-.64s' pentru tabela '%-.64s'"
+        rus "Команда %-.128s запрещ для таблицы '%-.64s'"
+        serbian "%-.128s komanda zabranjena za korisnika '%-.48s'@'%-.64s' za tabelu '%-.64s'"
+        spa "%-.128s comando negado para usuario: '%-.48s'@'%-.64s' para tabla '%-.64s'"
+        swe "%-.128s ej tillåtet för '%-.48s'@'%-.64s' för tabell '%-.64s'"
+        ukr "%-.128s коман '%-.48s'@'%-.64s' у таблиці '%-.64s'"
 ER_COLUMNACCESS_DENIED_ERROR 42000 
         cze "%-.16s p-Bříkaz nepřístupný pro uživatele: '%-.48s'@'%-.64s' pro sloupec '%-.192s' v tabulce '%-.192s'"
         dan "%-.16s-kommandoen er ikke tilladt for brugeren '%-.48s'@'%-.64s' for kolonne '%-.192s' in tabellen '%-.192s'"

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2010-04-07 12:02:19 +0000
+++ b/sql/sql_acl.cc	2010-04-13 14:23:10 +0000
@@ -5137,7 +5137,7 @@ void get_privilege_desc(char *to, uint m
 {
   uint pos;
   char *start=to;
-  DBUG_ASSERT(max_length >= 30);		// For end ',' removal
+  DBUG_ASSERT(max_length >= 30);                // For end ', ' removal
 
   if (access)
   {
@@ -5148,10 +5148,12 @@ void get_privilege_desc(char *to, uint m
 	  command_lengths[pos] + (uint) (to-start) < max_length)
       {
 	to= strmov(to, command_array[pos]);
-	*to++=',';
+        *to++= ',';
+        *to++= ' ';
       }
     }
-    to--;					// Remove end ','
+    to--;                                       // Remove end ' '
+    to--;                                       // Remove end ','
   }
   *to=0;
 }

Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100413143009-xay3250b7hlh0jvv.bundle
Thread
bzr push into mysql-next-mr-bugfixing branch (marc.alff:3129)Marc Alff13 Apr