diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-08 12:05:18 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-08 12:05:18 +0300 |
| commit | ca1875f54033c5ea067ec3ec07b00375de6975d7 (patch) | |
| tree | e4fd56548f8b7114557c187ad8aa70c1c5c26d52 /sql | |
| parent | a6b15fdd7682bffc2e197ac50e21332bb9bcf297 (diff) | |
| parent | a9c47d8cfc9d93dd93409c3d3681a4f726a456e5 (diff) | |
| download | mariadb-git-ca1875f54033c5ea067ec3ec07b00375de6975d7.tar.gz | |
merge
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index be77f2bc7b3..ffa606272e3 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3260,8 +3260,8 @@ struct my_option my_long_options[] = #endif {"temp-pool", OPT_TEMP_POOL, "Using this option will cause most temporary files created to use a small set of names, rather than a unique name for each new file.", - (gptr*) &use_temp_pool, (gptr*) &use_temp_pool, 0, GET_BOOL, NO_ARG, 0, 0, - 0, 0, 0, 0}, + (gptr*) &use_temp_pool, (gptr*) &use_temp_pool, 0, GET_BOOL, NO_ARG, 1, + 0, 0, 0, 0, 0}, {"tmpdir", 't', "Path for temporary files", (gptr*) &opt_mysql_tmpdir, (gptr*) &opt_mysql_tmpdir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"transaction-isolation", OPT_TX_ISOLATION, diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 19b58ffbd25..14ed24ad3f7 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1493,7 +1493,7 @@ mysql_execute_command(void) /* Check that the first table has CREATE privilege */ TABLE_LIST *tmp_table_list=tables->next; tables->next=0; - bool error=check_grant(thd,CREATE_ACL,tables); + bool error=check_grant(thd, want_priv, tables); tables->next=tmp_table_list; if (error) goto error; |