diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 28264672c82..df9c89ffe19 100644 --- a/.bzrignore +++ b/.bzrignore @@ -598,3 +598,4 @@ vio/test-sslserver vio/viotest-ssl scripts/fill_help_tables.sql scripts/fill_help_tables +scripts/make_win_src_distribution diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 47fe271f2b6..56e00de8e5b 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; } |