database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359

Browse Source 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge


mysql-test/r/information_schema.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2006-02-02 00:52:32 +11:00
parent 9be61bbc02 590ca269cd
commit c59e5f8282
29 changed files with 411 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_show.cc
View File

@ -264,6 +264,7 @@ static struct show_privileges_st sys_privileges[]=
{"Show view","Tables","To see views with SHOW CREATE VIEW"},
{"Shutdown","Server Admin", "To shut down the server"},
{"Super","Server Admin","To use KILL thread, SET GLOBAL, CHANGE MASTER, etc."},
{"Trigger","Tables", "To use triggers"},
{"Update", "Tables", "To update existing rows"},
{"Usage","Server Admin","No privileges - allow connect only"},
{NullS, NullS, NullS}
@ -1137,9 +1138,11 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
to the CREATE TABLE statement
*/
if ((for_str= file->get_tablespace_create_info()))
if ((for_str= file->get_tablespace_name()))
{
packet->append(" TABLESPACE ");
packet->append(for_str, strlen(for_str));
packet->append(" STORAGE DISK");
my_free(for_str, MYF(0));
}