Commit bceecfa8 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel


client/mysql.cc:
  Auto merged
heap/hp_write.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents f249185b 7e08016a

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -51,5 +51,5 @@ enum options_client 
  OPT_TRIGGERS,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT,

  OPT_DEBUG_INFO

  OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE

};

client/mysqlbinlog.cc

+12 −5
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ static int dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info, 
  uint logname_len;

  NET* net;

  int error= 0;

  my_off_t old_off= start_position_mot;

  my_off_t old_off= min(start_position_mot, BIN_LOG_HEADER_SIZE);

  char fname[FN_REFLEN+1];

  DBUG_ENTER("dump_remote_log_entries");
@@ -1105,7 +1105,7 @@ could be out of memory"); 
    }

    if (len < 8 && net->read_pos[0] == 254)

      break; // end of data

    DBUG_PRINT("info",( "len: %lu, net->read_pos[5]: %d\n",

    DBUG_PRINT("info",( "len: %lu  net->read_pos[5]: %d\n",

			len, net->read_pos[5]));

    if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 ,

                                        len - 1, &error_msg,
@@ -1195,8 +1195,15 @@ could be out of memory"); 
    }

    /*

      Let's adjust offset for remote log as for local log to produce

      similar text.

      similar text and to have --stop-position to work identically.



      Exception - the server sends Format_description_log_event

      in the beginning of the dump, and only after it the event from

      start_position. Let the old_off reflect it.

    */

    if (old_off < start_position_mot)

      old_off= start_position_mot;

    else

      old_off+= len-1;

  }

client/mysqldump.c

+22 −2
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static char *opt_password=0,*current_user=0, 
             *lines_terminated=0, *enclosed=0, *opt_enclosed=0, *escaped=0,

             *where=0, *order_by=0,

             *opt_compatible_mode_str= 0,

             *err_ptr= 0;

             *err_ptr= 0,

             *log_error_file= NULL;

static char **defaults_argv= 0;

static char compatible_mode_normal_str[255];

static ulong opt_compatible_mode= 0;
@@ -117,6 +118,8 @@ static int first_error=0; 
static DYNAMIC_STRING extended_row;

#include <sslopt-vars.h>

FILE *md_result_file= 0;

FILE *stderror_file=0;



#ifdef HAVE_SMEM

static char *shared_memory_base_name=0;

#endif
@@ -293,6 +296,9 @@ static struct my_option my_long_options[] = 
   0, 0, 0, 0, 0, 0},

  {"lock-tables", 'l', "Lock all tables for read.", (gptr*) &lock_tables,

   (gptr*) &lock_tables, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

  {"log-error", OPT_ERROR_LOG_FILE, "Append warnings and errors to given file.",

   (gptr*) &log_error_file, (gptr*) &log_error_file, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"master-data", OPT_MASTER_DATA,

   "This causes the binary log position and filename to be appended to the "

   "output. If equal to 1, will print it as a CHANGE MASTER command; if equal"
@@ -3694,6 +3700,16 @@ int main(int argc, char **argv) 
    free_resources(0);

    exit(exit_code);

  }



  if (log_error_file)

  {

    if(!(stderror_file= freopen(log_error_file, "a+", stderr)))

    {

      free_resources(0);

      exit(EX_MYSQLERR);

    }

  }



  if (connect_to_db(current_host, current_user, opt_password))

  {

    free_resources(0);
@@ -3746,5 +3762,9 @@ int main(int argc, char **argv) 
  if (!path)

    write_footer(md_result_file);

  free_resources();



  if (stderror_file)

    fclose(stderror_file);



  return(first_error);

} /* main */

include/raid.h

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ class RaidFd { 
    inline void Calculate()

    {

      DBUG_ENTER("RaidFd::_Calculate");

      DBUG_PRINT("info",("_position: %lu _raid_chunksize: %d, _size: %lu",

      DBUG_PRINT("info",("_position: %lu  _raid_chunksize: %lu  _size: %lu",

			 (ulong) _position, _raid_chunksize, (ulong) _size));



      _total_block = (ulong) (_position / _raid_chunksize);
@@ -148,7 +148,7 @@ class RaidFd { 
      _remaining_bytes = (uint) (_raid_chunksize -

				 (_position - _total_block * _raid_chunksize));

      DBUG_PRINT("info",

		 ("_total_block: %d  this_block: %d  _remaining_bytes:%d",

		 ("_total_block: %lu  this_block: %d  _remaining_bytes: %d",

		  _total_block, _this_block, _remaining_bytes));

      DBUG_VOID_RETURN;

    }

mysql-test/r/grant.result

+122 −0
Original line number Diff line number Diff line
@@ -972,4 +972,126 @@ REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij123456789 
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)

GRANT PROCESS ON * TO user@localhost;

ERROR 3D000: No database selected

DROP DATABASE IF EXISTS mysqltest1;

DROP DATABASE IF EXISTS mysqltest2;

DROP DATABASE IF EXISTS mysqltest3;

DROP DATABASE IF EXISTS mysqltest4;

CREATE DATABASE mysqltest1;

CREATE DATABASE mysqltest2;

CREATE DATABASE mysqltest3;

CREATE DATABASE mysqltest4;

CREATE PROCEDURE mysqltest1.p_def() SQL SECURITY DEFINER

SELECT 1;

CREATE PROCEDURE mysqltest2.p_inv() SQL SECURITY INVOKER

SELECT 1;

CREATE FUNCTION mysqltest3.f_def() RETURNS INT SQL SECURITY DEFINER

RETURN 1;

CREATE FUNCTION mysqltest4.f_inv() RETURNS INT SQL SECURITY INVOKER

RETURN 1;

GRANT EXECUTE ON PROCEDURE mysqltest1.p_def TO mysqltest_1@localhost;

GRANT EXECUTE ON PROCEDURE mysqltest2.p_inv TO mysqltest_1@localhost;

GRANT EXECUTE ON FUNCTION mysqltest3.f_def TO mysqltest_1@localhost;

GRANT EXECUTE ON FUNCTION mysqltest4.f_inv TO mysqltest_1@localhost;

GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost;



---> connection: bug9504_con1

use mysqltest1;

use mysqltest2;

use mysqltest3;

use mysqltest4;

use test;

CALL mysqltest1.p_def();

1

1

CALL mysqltest2.p_inv();

1

1

SELECT mysqltest3.f_def();

mysqltest3.f_def()

1

SELECT mysqltest4.f_inv();

mysqltest4.f_inv()

1



---> connection: default

DROP DATABASE mysqltest1;

DROP DATABASE mysqltest2;

DROP DATABASE mysqltest3;

DROP DATABASE mysqltest4;

DROP USER mysqltest_1@localhost;

DROP DATABASE IF EXISTS mysqltest1;

DROP DATABASE IF EXISTS mysqltest2;

CREATE DATABASE mysqltest1;

CREATE DATABASE mysqltest2;

GRANT ALL PRIVILEGES ON mysqltest1.* TO mysqltest_1@localhost;

GRANT SELECT ON mysqltest2.* TO mysqltest_1@localhost;

CREATE PROCEDURE mysqltest1.p1() SQL SECURITY INVOKER

SELECT 1;



---> connection: bug27337_con1

CREATE TABLE t1(c INT);

ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table 't1'

CALL mysqltest1.p1();

1

1

CREATE TABLE t1(c INT);

ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table 't1'



---> connection: bug27337_con2

CREATE TABLE t1(c INT);

ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table 't1'

SHOW TABLES;

Tables_in_mysqltest2



---> connection: default

DROP DATABASE mysqltest1;

DROP DATABASE mysqltest2;

DROP USER mysqltest_1@localhost;

DROP DATABASE IF EXISTS mysqltest1;

DROP DATABASE IF EXISTS mysqltest2;

CREATE DATABASE mysqltest1;

CREATE DATABASE mysqltest2;

CREATE TABLE mysqltest1.t1(c INT);

CREATE TABLE mysqltest2.t2(c INT);

GRANT SELECT ON mysqltest1.t1 TO mysqltest_1@localhost;

GRANT SELECT ON mysqltest2.t2 TO mysqltest_2@localhost;



---> connection: bug27337_con1

SHOW TABLES FROM mysqltest1;

Tables_in_mysqltest1

t1

PREPARE stmt1 FROM 'SHOW TABLES FROM mysqltest1';

EXECUTE stmt1;

Tables_in_mysqltest1

t1



---> connection: bug27337_con2

SHOW COLUMNS FROM mysqltest2.t2;

Field	Type	Null	Key	Default	Extra

c	int(11)	YES		NULL	

PREPARE stmt2 FROM 'SHOW COLUMNS FROM mysqltest2.t2';

EXECUTE stmt2;

Field	Type	Null	Key	Default	Extra

c	int(11)	YES		NULL	



---> connection: default

REVOKE SELECT ON mysqltest1.t1 FROM mysqltest_1@localhost;

REVOKE SELECT ON mysqltest2.t2 FROM mysqltest_2@localhost;



---> connection: bug27337_con1

SHOW TABLES FROM mysqltest1;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysqltest1'

EXECUTE stmt1;

ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysqltest1'



---> connection: bug27337_con2

SHOW COLUMNS FROM mysqltest2.t2;

ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'

EXECUTE stmt2;

ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'



---> connection: default

DROP DATABASE mysqltest1;

DROP DATABASE mysqltest2;

DROP USER mysqltest_1@localhost;

End of 5.0 tests