database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Manual merge (4.1->5.0)

Browse Source
This commit is contained in:
konstantin@mysql.com
2005-06-17 00:34:35 +04:00
parent ad223c9c10 dcb0e65dcb
commit 62dacf0813
5 changed files with 106 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/ps_grant.result
View File

@@ -90,5 +90,5 @@ drop user drop_user@localhost;
prepare stmt4 from ' show full processlist ';
execute stmt4;
Id User Host db Command Time State Info
number root localhost test Query time NULL show full processlist
number root localhost test Execute time NULL show full processlist
deallocate prepare stmt4;