Commit daa14544 authored by unknown's avatar unknown
Browse files

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
parents 30278aed 708bce0a

client/mysqltest.c

+6 −8
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
  Holyfoot

*/



#define MTEST_VERSION "3.0"

#define MTEST_VERSION "3.1"



#include <my_global.h>

#include <mysql_embed.h>
@@ -1819,12 +1819,11 @@ void do_copy_file(struct st_command *command) 
  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);

mysql-test/r/mysqltest.result

+1 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/t/mysqltest.test

+1 −0
Original line number Diff line number Diff line
@@ -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

# ----------------------------------------------------------------------------