diff options
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 4982af30d2f..c91e2d617b1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -489,6 +489,7 @@ scripts/fill_func_tables.sql scripts/fill_help_tables scripts/fill_help_tables.sql scripts/make_binary_distribution +scripts/make_win_src_distribution scripts/msql2mysql scripts/mysql_config scripts/mysql_convert_table_format @@ -601,4 +602,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -scripts/make_win_src_distribution diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5e3874bf038..5408fd1e17f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -6632,7 +6632,7 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field, } if (copy_blobs(first_field)) { - my_error(ER_OUT_OF_SORTMEMORY,MYF(0)); + my_error(ER_OUTOFMEMORY,MYF(0)); error=0; goto err; } |