Commit 3d8ea9d1 authored by unknown's avatar unknown
Browse files

Manual merge of csets from -build tree into main 5.0 tree. 


innobase/include/data0type.ic:
  Auto merged
mysql-test/r/endspace.result:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
support-files/mysql.spec.sh:
  Manual merge.
parents 2ba3544f dc79caa9

client/mysqltest.c

+14 −2
Original line number Diff line number Diff line
@@ -2746,8 +2746,13 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) 
	append_result(ds, res);

      }



      /* Add all warnings to the result */

      if (!disable_warnings && mysql_warning_count(mysql))

      /*

        Add all warnings to the result. We can't do this if we are in

        the middle of processing results from multi-statement, because

        this will break protocol.

      */

      if (!disable_warnings && !mysql_more_results(mysql) &&

          mysql_warning_count(mysql))

      {

	MYSQL_RES *warn_res=0;

	uint count= mysql_warning_count(mysql);
@@ -3363,6 +3368,13 @@ static void run_query_stmt_handle_warnings(MYSQL *mysql, DYNAMIC_STRING *ds) 


  if (!disable_warnings && (count= mysql_warning_count(mysql)))

  {

    /*

      If one day we will support execution of multi-statements

      through PS API we should not issue SHOW WARNINGS until

      we have not read all results...

    */

    DBUG_ASSERT(!mysql_more_results(mysql));



    if (mysql_real_query(mysql, "SHOW WARNINGS", 13) == 0)

    {

      MYSQL_RES *warn_res= mysql_store_result(mysql);

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -3608,7 +3608,7 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, 
    if (is_unsigned)

      data= ulonglong2double(value);

    else

      data= value;

      data= (double)value;

    doublestore(buffer, data);

    *param->error= is_unsigned ?

                   ((ulonglong) value) != ((ulonglong) (*(double*) buffer)) :

myisam/mi_open.c

+2 −2
Original line number Diff line number Diff line
@@ -1090,10 +1090,10 @@ char *mi_keyseg_read(char *ptr, HA_KEYSEG *keyseg) 
   keyseg->null_pos	= mi_uint4korr(ptr);  ptr +=4;

   keyseg->charset=0;				/* Will be filled in later */

   if (keyseg->null_bit)

     keyseg->bit_pos= keyseg->null_pos + (keyseg->null_bit == 7);

     keyseg->bit_pos= (uint16)(keyseg->null_pos + (keyseg->null_bit == 7));

   else

   {

     keyseg->bit_pos= keyseg->null_pos;

     keyseg->bit_pos= (uint16)keyseg->null_pos;

     keyseg->null_pos= 0;

   }

   return ptr;

myisam/mi_packrec.c

+1 −1
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ my_bool _mi_memmap_file(MI_INFO *info) 
      DBUG_RETURN(0);

    }

    file_map=(byte*)

      my_mmap(0,share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN,PROT_READ,

      my_mmap(0,(size_t)(share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN),PROT_READ,

	   MAP_SHARED | MAP_NORESERVE,info->dfile,0L);

    if (file_map == (byte*) MAP_FAILED)

    {

mysql-test/r/federated.result

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ CREATE TABLE federated.`t1%` ( 
`name` varchar(32) NOT NULL default ''

    )

ENGINE="FEDERATED" DEFAULT CHARSET=latin1

COMMENT='mysql://root@127.0.0.1:9308/federated/t1%';

COMMENT='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1%';

INSERT INTO federated.`t1%` (id, name) VALUES (1, 'foo');

INSERT INTO federated.`t1%` (id, name) VALUES (2, 'fee');

SELECT * FROM federated.`t1%`;