database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Bug fixes, TRUNCATE, safer passwords on command line and connect timeout

Browse Source 
Docs/manual.texi:
  Update of safe_mysqld, TRUNCATE and changes for 3.23.28
client/mysql.cc:
  Added --timeout
client/mysqladmin.c:
  Safer password handling
client/mysqldump.c:
  Safer password handling
client/mysqlimport.c:
  Safer password handling
client/mysqlshow.c:
  Safer password handling
configure.in:
  Fixes for Darwin and added test of poll
include/my_pthread.h:
  Fixes for darwin
include/violite.h:
  Added test for polling
libmysql/libmysql.c:
  connect timeout
libmysql/violite.c:
  connect timeout
mysys/hash.c:
  Fix when delting from empty table
scripts/safe_mysqld.sh:
  Added --open-files, --core-file-size and --timezone
sql-bench/bench-init.pl.sh:
  Function print_time
sql-bench/crash-me.sh:
  Added test of truncate
sql-bench/test-insert.sh:
  More "estimated" tests
sql-bench/test-select.sh:
  More "estimated" tests
sql/filesort.cc:
  Removed allocation of extra memory
sql/ha_berkeley.cc:
  Better estimation of number of rows
sql/item_create.cc:
  Truncate
sql/item_create.h:
  Truncate
sql/item_strfunc.cc:
  Removed usage of MY_FAE
sql/lex.h:
  Truncate
sql/lock.cc:
  Fixed possible loop bug
sql/log.cc:
  Removed usage of FILE:s
sql/mysqld.cc:
  Print of more server variables
sql/sql_class.h:
  Changed FILE -> File
sql/sql_insert.cc:
  Fixed bug in temptable handling
sql/sql_lex.h:
  Cleanup
sql/sql_load.cc:
  Removed usage of MY_FAE
sql/sql_parse.cc:
  Cleanup + TRUNCATE
sql/sql_select.cc:
  Cleanup + fix for INSERT ... SELECT
sql/sql_yacc.yy:
  TRUNCATE
sql/violite.c:
  Merge with client/violite.c
strings/strstr-sparc.s:
  Fixed wrong register usage
This commit is contained in:
unknown
2000-11-13 23:55:10 +02:00
parent 675d31ee9a
commit f3d2341f1f
35 changed files with 795 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_select.cc
View File

@@ -2725,7 +2725,7 @@ return_zero_rows(select_result *result,TABLE_LIST *tables,List<Item> &fields,
{
for (TABLE_LIST *table=tables; table ; table=table->next)
mark_as_null_row(table->table); // All fields are NULL
if (having && having->val_int() == 0.0)
if (having && having->val_int() == 0)
send_row=0;
}
if (!tables || !(result->send_fields(fields,1)))
@@ -3204,6 +3204,7 @@ Field *create_tmp_field(TABLE *table,Item *item, Item::Type type,
case Item::REAL_ITEM:
case Item::STRING_ITEM:
case Item::REF_ITEM:
case Item::NULL_ITEM:
{
bool maybe_null=item->maybe_null;
Field *new_field;
@@ -4501,7 +4502,7 @@ end_send(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
if (!end_of_records)
{
int error;
if (join->having && join->having->val_int() == 0.0)
if (join->having && join->having->val_int() == 0)
DBUG_RETURN(0); // Didn't match having
if (join->procedure)
error=join->procedure->send_row(*join->fields);
@@ -4541,7 +4542,7 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
int error;
if (join->procedure)
{
if (join->having && join->having->val_int() == 0.0)
if (join->having && join->having->val_int() == 0)
error= -1; // Didn't satisfy having
else
error=join->procedure->send_row(*join->fields) ? 1 : 0;
@@ -4552,7 +4553,7 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
{
if (!join->first_record)
clear_tables(join);
if (join->having && join->having->val_int() == 0.0)
if (join->having && join->having->val_int() == 0)
error= -1; // Didn't satisfy having
else
error=join->result->send_data(*join->fields) ? 1 : 0;
@@ -5111,7 +5112,7 @@ create_sort_index(JOIN_TAB *tab,ORDER *order,ha_rows select_limit)
goto err; /* purecov: inspected */
/* It's not fatal if the following alloc fails */
table->io_cache=(IO_CACHE*) my_malloc(sizeof(IO_CACHE),
MYF(MY_FAE | MY_ZEROFILL));
MYF(MY_WME | MY_ZEROFILL));
table->status=0; // May be wrong if quick_select
// If table has a range, move it to select