1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
This commit is contained in:
msvensson@neptunus.(none) 2006-11-30 11:31:51 +01:00
commit 1daff38fd8
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/mysqltest.c
View File

@ -32,7 +32,7 @@
Holyfoot Holyfoot
*/ */
#define MTEST_VERSION "3.0" #define MTEST_VERSION "3.1"
#include <my_global.h> #include <my_global.h>
#include <mysql_embed.h> #include <mysql_embed.h>
@ -1820,12 +1820,11 @@ void do_copy_file(struct st_command *command)
chmod <octal> <file> chmod <octal> <file>
Change file permission of <file> Change file permission of <file>
NOTE! Simplified version, only supports +r, -r, +w, -w
*/ */
void do_chmod_file(struct st_command *command) void do_chmod_file(struct st_command *command)
{ {
mode_t mode= 0; ulong mode= 0;
static DYNAMIC_STRING ds_mode; static DYNAMIC_STRING ds_mode;
static DYNAMIC_STRING ds_file; static DYNAMIC_STRING ds_file;
const struct command_arg chmod_file_args[] = { const struct command_arg chmod_file_args[] = {
@ -1840,12 +1839,11 @@ void do_chmod_file(struct st_command *command)
' '); ' ');
/* Parse what mode to set */ /* 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"); 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", (uint)mode, ds_file.str));
DBUG_PRINT("info", ("chmod %o %s", mode, ds_file.str));
handle_command_error(command, chmod(ds_file.str, mode)); handle_command_error(command, chmod(ds_file.str, mode));
dynstr_free(&ds_mode); dynstr_free(&ds_mode);
dynstr_free(&ds_file); dynstr_free(&ds_file);

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

@ -516,7 +516,7 @@ mysqltest: At line 1: Missing required argument 'mode' to command 'chmod'
mysqltest: At line 1: You must write a 4 digit octal number for mode mysqltest: At line 1: You must write a 4 digit octal number for mode
mysqltest: At line 1: You must write a 4 digit octal number for mode mysqltest: At line 1: You must write a 4 digit octal number for mode
mysqltest: At line 1: Missing required argument 'file' to command 'chmod' mysqltest: At line 1: Missing required argument 'file' to command 'chmod'
mysqltest: At line 1: command "chmod" failed with error -1 mysqltest: At line 1: You must write a 4 digit octal number for mode
mysqltest: At line 1: You must write a 4 digit octal number for mode mysqltest: At line 1: You must write a 4 digit octal number for mode
hello hello
hello hello

1
mysql-test/t/mysqltest.test
View File

@ -1560,6 +1560,7 @@ remove_file $MYSQLTEST_VARDIR/tmp/file1.tmp;
--error 1 --error 1
--exec echo "chmod 06789 from_file;" | $MYSQL_TEST 2>&1 --exec echo "chmod 06789 from_file;" | $MYSQL_TEST 2>&1
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# test for perl # test for perl
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------