database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

resolving conflicts

Browse Source
This commit is contained in:
hf@deer.mysql.r18.ru
2003-01-15 13:15:35 +04:00
parent c59bff7c96 809af00b06
commit 96089e2b3a
560 changed files with 19634 additions and 8529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/repl_failsafe.cc
View File

@@ -84,7 +84,7 @@ static int init_failsafe_rpl_thread(THD* thd)
#endif
thd->mem_root.free=thd->mem_root.used=0;
if ((ulong) thd->variables.max_join_size == (ulong) HA_POS_ERROR)
if (thd->variables.max_join_size == HA_POS_ERROR)
thd->options|= OPTION_BIG_SELECTS;
thd->proc_info="Thread initialized";