diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-30 10:57:40 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-30 10:57:40 +0100 |
| commit | daa14544e0bfc0784ceb90158e618698b6296e89 (patch) | |
| tree | 84eedad91c45047fbfbd1fefac6914d2a7097424 /client | |
| parent | 30278aedced207e1cc5284c2c5fcb8f36f467d6d (diff) | |
| parent | 708bce0a97eaf3fd8e55c004a60d1cef07bd1997 (diff) | |
| download | mariadb-git-daa14544e0bfc0784ceb90158e618698b6296e89.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/r/mysqltest.result:
Manual merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 1e2acd4d368..2f0a2bc6168 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -32,7 +32,7 @@ Holyfoot */ -#define MTEST_VERSION "3.0" +#define MTEST_VERSION "3.1" #include <my_global.h> #include <mysql_embed.h> @@ -1816,15 +1816,14 @@ void do_copy_file(struct st_command *command) command command handle DESCRIPTION - chmod <octal> <file> + chmod <octal> <file> Change file permission of <file> - NOTE! Simplified version, only supports +r, -r, +w, -w */ void do_chmod_file(struct st_command *command) { - mode_t mode= 0; + ulong mode= 0; static DYNAMIC_STRING ds_mode; static DYNAMIC_STRING ds_file; const struct command_arg chmod_file_args[] = { @@ -1839,12 +1838,11 @@ void do_chmod_file(struct st_command *command) ' '); /* Parse what mode to set */ - if (ds_mode.length != 4) + if (ds_mode.length != 4 || + str2int(ds_mode.str, 8, 0, INT_MAX, &mode) == NullS) die("You must write a 4 digit octal number for mode"); - str2int(ds_mode.str, 8, 0, INT_MAX, (long*)&mode); - - DBUG_PRINT("info", ("chmod %o %s", mode, ds_file.str)); + DBUG_PRINT("info", ("chmod %o %s", (uint)mode, ds_file.str)); handle_command_error(command, chmod(ds_file.str, mode)); dynstr_free(&ds_mode); dynstr_free(&ds_file); |