Post-merge fix.

igor@olga.mysql.com · igor@olga.mysql.com · commit 48fe28027181 · 2007-05-27T20:14:50.000-07:00
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
@@ -4054,7 +4054,8 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
     }
     bool save_abort_on_warning= thd->abort_on_warning;
     thd->abort_on_warning= TRUE;
-    make_truncated_value_warning(thd, f_val, strlength(f_val), t_type,
+    make_truncated_value_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+                                 f_val, strlength(f_val), t_type,
                                  new_datetime_field->field_name);
     thd->abort_on_warning= save_abort_on_warning;
   }

Original file line number	Diff line number	Diff line change
`@@ -4054,7 +4054,8 @@ bool mysql_alter_table(THD thd,char new_db, char *new_name,`
`4054`	`4054`	`}`
`4055`	`4055`	`bool save_abort_on_warning= thd->abort_on_warning;`
`4056`	`4056`	`thd->abort_on_warning= TRUE;`
`4057`		`- make_truncated_value_warning(thd, f_val, strlength(f_val), t_type,`
	`4057`	`+ make_truncated_value_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,`
	`4058`	`+ f_val, strlength(f_val), t_type,`
`4058`	`4059`	`new_datetime_field->field_name);`
`4059`	`4060`	`thd->abort_on_warning= save_abort_on_warning;`
`4060`	`4061`	`}`