Merge work:/home/bk/mysql-4.1

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
35636c6b · serg@serg.mysql.com · c3da09d6 · 5a55ee39 · 35636c6b · 35636c6b
Commit 35636c6b authored Mar 01, 2003 by serg@serg.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.bzrignore .bzrignore +1 -1

sql/sql_select.cc sql/sql_select.cc +1 -1

No files found.
--- 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
--- 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;
    }