mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/r/rpl_sp.result:
  Manual merge
mysql-test/t/rpl_sp.test:
  Manual merge
This commit is contained in:
unknown 2006-11-30 11:31:51 +01:00
commit 822c0590c4
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
client/mysqltest.c
View file

@ -32,7 +32,7 @@
Holyfoot
*/
#define MTEST_VERSION "3.0"
#define MTEST_VERSION "3.1"
#include <my_global.h>
#include <mysql_embed.h>
@ -1817,15 +1817,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[] = {
@ -1840,12 +1839,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);

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: 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
hello
hello

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

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