database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merged

Browse Source 
BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
tests/client_test.c:
  Auto merged
This commit is contained in:
unknown
2005-01-24 19:41:42 +01:00
parent 7eb825a072 7109999b92
commit a82fd1eaec
33 changed files with 157 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysqldump.c
View File

@ -2436,8 +2436,7 @@ static const char *check_if_ignore_table(const char *table_name)
fprintf(stderr,
"Error: Couldn't read status information for table %s (%s)\n",
table_name, mysql_error(sock));
if (res)
mysql_free_result(res);
mysql_free_result(res);
return 0; /* assume table is ok */
}
if (!(row[1]))
@ -2448,7 +2447,7 @@ static const char *check_if_ignore_table(const char *table_name)
strcmp(row[1], (result= "MRG_ISAM")))
result= 0;
}
mysql_free_result(res);
mysql_free_result(res);
return result;
}