Commit cc8a3770 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents 55c1c5b6 fdf19ea8

BUILD/compile-pentium-debug

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" 
cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs --with-berkeley-db --with-innobase"

extra_configs="$extra_configs "



. "$path/FINISH.sh"

BUILD/compile-pentium-debug-max

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs --with-berkeley-db --with-innobase"



. "$path/FINISH.sh"

client/mysqltest.c

+4 −3
Original line number Diff line number Diff line
@@ -241,8 +241,8 @@ static void do_eval(DYNAMIC_STRING* query_eval, const char* query) 
	  else

	    {

	      if(!(v = var_get(p, &p, 0)))

		die("Bad variabled in eval");

	      dynstr_append(query_eval, v->str_val);

		die("Bad variable in eval");

	      dynstr_append_mem(query_eval, v->str_val, v->str_val_len);

	    }

	  break;

	case '\\':
@@ -436,6 +436,7 @@ VAR* var_get(const char* var_name, const char** var_name_end, int raw) 
  {

    sprintf(v->str_val, "%d", v->int_val);

    v->int_dirty = 0;

    v->str_val_len = strlen(v->str_val);

  }

  if(var_name_end)

    *var_name_end = var_name  ;
@@ -475,7 +476,7 @@ int var_set(char* var_name, char* var_name_end, char* var_val, 
	 die("Out of memory");

    }

  memcpy(v->str_val, var_val, val_len-1);

  v->str_val_len = val_len;

  v->str_val_len = val_len - 1;

  v->str_val[val_len] = 0;

  v->int_val = atoi(v->str_val);

  return 0;

mysql-test/r/df_crash.result

0 → 100644
+6 −0
Original line number Diff line number Diff line 
month(updated)

10

NULL

year(updated)

1999

NULL

mysql-test/t/df_crash.test

0 → 100644
+10 −0
Original line number Diff line number Diff line 
drop table if exists db_crash;

CREATE TABLE df_crash (

  updated text

) TYPE=MyISAM;

INSERT INTO df_crash VALUES ('1999-10-5');

insert into df_crash values ('');



select month(updated) from df_crash;

select year(updated) from df_crash;

drop table df_crash;