1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge work:/home/bk/mysql-4.1

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


BitKeeper/etc/ignore:
  auto-union
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2003-03-01 14:18:55 +01:00
commit 67b5eb7fa0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bzrignore
View File

@ -489,6 +489,7 @@ scripts/fill_func_tables.sql
scripts/fill_help_tables scripts/fill_help_tables
scripts/fill_help_tables.sql scripts/fill_help_tables.sql
scripts/make_binary_distribution scripts/make_binary_distribution
scripts/make_win_src_distribution
scripts/msql2mysql scripts/msql2mysql
scripts/mysql_config scripts/mysql_config
scripts/mysql_convert_table_format scripts/mysql_convert_table_format
@ -601,4 +602,3 @@ vio/test-ssl
vio/test-sslclient vio/test-sslclient
vio/test-sslserver vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
scripts/make_win_src_distribution

2
sql/sql_select.cc
View File

@ -6632,7 +6632,7 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field,
} }
if (copy_blobs(first_field)) if (copy_blobs(first_field))
{ {
my_error(ER_OUT_OF_SORTMEMORY,MYF(0)); my_error(ER_OUTOFMEMORY,MYF(0));
error=0; error=0;
goto err; goto err;
} }