Commit de00ff76 authored by unknown's avatar unknown
Browse files

Merge xiphis.org:/usr/home/antony/work2/mysql-4.1 

into  xiphis.org:/usr/home/antony/work2/merge-5.0


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisammrg/myrg_static.c:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_drop_temp.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/bigint.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
include/my_sys.h:
  manual merge 4.1->5.0
mysql-test/r/bigint.result:
  manual merge 4.1->5.0
mysql-test/r/subselect.result:
  manual merge 4.1->5.0
mysql-test/t/subselect.test:
  manual merge 4.1->5.0
mysys/charset.c:
  manual merge 4.1->5.0
sql/ha_ndbcluster.cc:
  manual merge 4.1->5.0
sql/item_strfunc.cc:
  manual merge 4.1->5.0
sql/sql_base.cc:
  manual merge 4.1->5.0
sql/sql_select.cc:
  manual merge 4.1->5.0
sql/sql_union.cc:
  manual merge 4.1->5.0
strings/Makefile.am:
  manual merge 4.1->5.0
tests/mysql_client_test.c:
  manual merge 4.1->5.0
parents 98da6d5f bf076931

client/mysql.cc

+1 −4
Original line number Diff line number Diff line
@@ -1598,11 +1598,8 @@ You can turn off this feature to get a quicker startup with -A\n\n"); 
      mysql_free_result(fields);

    }

    else

    {

      tee_fprintf(stdout,

		  "Didn't find any fields in table '%s'\n",table_row[0]);

      field_names[i]= 0;

    }



    i++;

  }

  mysql_free_result(tables);

client/mysqltest.c

+1 −0
Original line number Diff line number Diff line
@@ -2781,6 +2781,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) 
    if (!disable_result_log)

    {

      ulong affected_rows;    /* Ok to be undef if 'disable_info' is set */

      LINT_INIT(affected_rows);



      if (res)

      {

include/my_sys.h

+5 −0
Original line number Diff line number Diff line
@@ -866,6 +866,11 @@ extern void add_compiled_collation(CHARSET_INFO *cs); 
extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info,

                                     char *to, ulong to_length,

                                     const char *from, ulong length);

#ifdef __WIN__

#define BACKSLASH_MBTAIL

/* File system character set */

extern CHARSET_INFO *fs_character_set(void);

#endif

extern ulong escape_quotes_for_mysql(CHARSET_INFO *charset_info,

                                     char *to, ulong to_length,

                                     const char *from, ulong length);

myisam/ft_boolean_search.c

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) 
  MI_INFO *info=ftb->info;

  uint off, extra=HA_FT_WLEN+info->s->base.rec_reflength;

  byte *lastkey_buf=ftbw->word+ftbw->off;

  LINT_INIT(off);



  LINT_INIT(off);

  if (ftbw->flags & FTB_FLAG_TRUNC)

mysql-test/r/bigint.result

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,15 @@ select 9223372036854775808+1; 
select -(0-3),round(-(0-3)), round(9999999999999999999);

-(0-3)	round(-(0-3))	round(9999999999999999999)

3	3	9999999999999999999

select 1,11,101,1001,10001,100001,1000001,10000001,100000001,1000000001,10000000001,100000000001,1000000000001,10000000000001,100000000000001,1000000000000001,10000000000000001,100000000000000001,1000000000000000001,10000000000000000001;

1	11	101	1001	10001	100001	1000001	10000001	100000001	1000000001	10000000001	100000000001	1000000000001	10000000000001	100000000000001	1000000000000001	10000000000000001	100000000000000001	1000000000000000001	10000000000000000001

1	11	101	1001	10001	100001	1000001	10000001	100000001	1000000001	10000000001	100000000001	1000000000001	10000000000001	100000000000001	1000000000000001	10000000000000001	100000000000000001	1000000000000000001	10000000000000000001

select -1,-11,-101,-1001,-10001,-100001,-1000001,-10000001,-100000001,-1000000001,-10000000001,-100000000001,-1000000000001,-10000000000001,-100000000000001,-1000000000000001,-10000000000000001,-100000000000000001,-1000000000000000001,-10000000000000000001;

-1	-11	-101	-1001	-10001	-100001	-1000001	-10000001	-100000001	-1000000001	-10000000001	-100000000001	-1000000000001	-10000000000001	-100000000000001	-1000000000000001	-10000000000000001	-100000000000000001	-1000000000000000001	-10000000000000000001

-1	-11	-101	-1001	-10001	-100001	-1000001	-10000001	-100000001	-1000000001	-10000000001	-100000000001	-1000000000001	-10000000000001	-100000000000001	-1000000000000001	-10000000000000001	-100000000000000001	-1000000000000000001	-10000000000000000000

select conv(1,10,16),conv((1<<2)-1,10,16),conv((1<<10)-2,10,16),conv((1<<16)-3,10,16),conv((1<<25)-4,10,16),conv((1<<31)-5,10,16),conv((1<<36)-6,10,16),conv((1<<47)-7,10,16),conv((1<<48)-8,10,16),conv((1<<55)-9,10,16),conv((1<<56)-10,10,16),conv((1<<63)-11,10,16);

conv(1,10,16)	conv((1<<2)-1,10,16)	conv((1<<10)-2,10,16)	conv((1<<16)-3,10,16)	conv((1<<25)-4,10,16)	conv((1<<31)-5,10,16)	conv((1<<36)-6,10,16)	conv((1<<47)-7,10,16)	conv((1<<48)-8,10,16)	conv((1<<55)-9,10,16)	conv((1<<56)-10,10,16)	conv((1<<63)-11,10,16)

1	3	3FE	FFFD	1FFFFFC	7FFFFFFB	FFFFFFFFA	7FFFFFFFFFF9	FFFFFFFFFFF8	7FFFFFFFFFFFF7	FFFFFFFFFFFFF6	7FFFFFFFFFFFFFF5

create table t1 (a bigint unsigned not null, primary key(a));

insert into t1 values (18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612);

select * from t1;