mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
many bug fixes
sql/log.cc: Fix for a bug in query logging ... sql/mysqld.cc: Fix for a bug with max_allowed_packt sql/sql_select.cc: Fix for a bug which is caused when a single table is scanned by entire index and WHERE clause is so broad that JOIN type is JT_ALL.
This commit is contained in:
@@ -963,6 +963,7 @@ bool MYSQL_LOG::write(THD *thd,const char *query, uint query_length,
|
|||||||
end=strxmov(buff, "# administrator command: ",
|
end=strxmov(buff, "# administrator command: ",
|
||||||
command_name[thd->command], NullS);
|
command_name[thd->command], NullS);
|
||||||
query_length=(ulong) (end-buff);
|
query_length=(ulong) (end-buff);
|
||||||
|
query=buff;
|
||||||
}
|
}
|
||||||
if (my_b_write(&log_file, (byte*) query,query_length) ||
|
if (my_b_write(&log_file, (byte*) query,query_length) ||
|
||||||
my_b_write(&log_file, (byte*) ";\n",2) ||
|
my_b_write(&log_file, (byte*) ";\n",2) ||
|
||||||
|
@@ -2984,7 +2984,7 @@ CHANGEABLE_VAR changeable_vars[] = {
|
|||||||
#endif
|
#endif
|
||||||
,0, 1, 0, 1 },
|
,0, 1, 0, 1 },
|
||||||
{ "max_allowed_packet", (long*) &max_allowed_packet,
|
{ "max_allowed_packet", (long*) &max_allowed_packet,
|
||||||
1024*1024L, 80, 64*1024*1024L, MALLOC_OVERHEAD, 1024 },
|
1024*1024L, 80, 255*255*255L, MALLOC_OVERHEAD, 1024 },
|
||||||
{ "max_binlog_cache_size", (long*) &max_binlog_cache_size,
|
{ "max_binlog_cache_size", (long*) &max_binlog_cache_size,
|
||||||
~0L, IO_SIZE, ~0L, 0, IO_SIZE },
|
~0L, IO_SIZE, ~0L, 0, IO_SIZE },
|
||||||
{ "max_binlog_size", (long*) &max_binlog_size,
|
{ "max_binlog_size", (long*) &max_binlog_size,
|
||||||
|
@@ -2328,7 +2328,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
|
|||||||
|
|
||||||
if ((tab->keys & ~ tab->const_keys && i > 0) ||
|
if ((tab->keys & ~ tab->const_keys && i > 0) ||
|
||||||
tab->const_keys && i == join->const_tables &&
|
tab->const_keys && i == join->const_tables &&
|
||||||
join->thd->select_limit < join->best_positions[i].records_read)
|
join->thd->select_limit < join->best_positions[i].records_read &&
|
||||||
|
join->tables > 1)
|
||||||
{
|
{
|
||||||
/* Join with outer join condition */
|
/* Join with outer join condition */
|
||||||
COND *orig_cond=sel->cond;
|
COND *orig_cond=sel->cond;
|
||||||
|
Reference in New Issue
Block a user