Commit 4fb62979 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 69d69553 a4b1bcef

Build-tools/Bootstrap

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ if (defined $opt_changelog) 
unless ($opt_skip_manual)

{

	&logger("Updating manual files");

	foreach $file qw/internals manual reservedwords/

	foreach $file qw/internals manual reservedwords errmsg-table cl-errmsg-table/

	{

		system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0

		or &abort("Could not update $file.texi in $target_dir/Docs/!");

VC++Files/libmysqld/libmysqld.dsp

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ SOURCE=..\mysys\my_alloc.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_decimal.cpp

SOURCE=..\sql\my_decimal.cpp

# End Source File

# Begin Source File

mysql-test/r/sp.result

+4 −5
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ delete from t1| 
drop table if exists t3|

create table t3 ( s char(16), d int)|

call into_test4()|

Warnings:

select * from t3|

s	d

into4	NULL
@@ -1344,9 +1343,7 @@ end if; 
insert into t4 values (2, rc, t3);

end|

call bug1863(10)|

Warnings:

call bug1863(10)|

Warnings:

select * from t4|

f1	rc	t3

2	0	NULL
@@ -1643,9 +1640,7 @@ begin 
end|

call bug4579_1()|

call bug4579_1()|

Warnings:

call bug4579_1()|

Warnings:

drop procedure bug4579_1|

drop procedure bug4579_2|

drop table t3|
@@ -2118,12 +2113,16 @@ var 
call bug7743("OneWord")|

var

NULL

Warnings:

Warning	1329	No data to FETCH

call bug7743("anotherword")|

var

2

call bug7743("AnotherWord")|

var

NULL

Warnings:

Warning	1329	No data to FETCH

drop procedure bug7743|

drop table t4|

delete from t3|

mysql-test/t/kill.test

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ select get_lock("a", 10); 
connection con2;

let $ID= `select connection_id()`;

send select get_lock("a", 10);

-- sleep 2

--real_sleep 2;

connection con1;

disable_query_log;

eval kill query $ID;

sql/examples/ha_archive.cc

+6 −6
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ int ha_archive::create(const char *name, TABLE *table_arg, 
int ha_archive::write_row(byte * buf)

{

  z_off_t written;

  uint *ptr, *end;

  uint *bptr, *end;

  DBUG_ENTER("ha_archive::write_row");



  if (share->crashed)
@@ -596,16 +596,16 @@ int ha_archive::write_row(byte * buf) 
    We should probably mark the table as damagaged if the record is written

    but the blob fails.

  */

  for (ptr= table->s->blob_field, end=ptr + table->s->blob_fields ;

       ptr != end ;

       ptr++)

  for (bptr= table->s->blob_field, end=bptr + table->s->blob_fields ;

       bptr != end ;

       bptr++)

  {

    char *ptr;

    uint32 size= ((Field_blob*) table->field[*ptr])->get_length();

    uint32 size= ((Field_blob*) table->field[*bptr])->get_length();



    if (size)

    {

      ((Field_blob*) table->field[*ptr])->get_ptr(&ptr);

      ((Field_blob*) table->field[*bptr])->get_ptr(&ptr);

      written= gzwrite(share->archive_write, ptr, (unsigned)size);

      if (written != size)

        goto error;