mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
f3e4ce926d
into mysql.com:/home/kent/bk/main/mysql-5.1 BUILD/Makefile.am: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~10: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~11: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~12: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~13: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~14: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~15: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~3: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~4: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~5: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~6: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~7: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~8: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~9: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713: Auto merged BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c: Auto merged BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f: Auto merged BitKeeper/deleted/.del-Makefile.in: Auto merged BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1: Auto merged BitKeeper/deleted/.del-build-vs71.bat: Auto merged BitKeeper/deleted/.del-build-vs8.bat: Auto merged BitKeeper/deleted/.del-configure.js: Auto merged BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9: Auto merged BitKeeper/deleted/.del-ha_berkeley.cc: Auto merged BitKeeper/deleted/.del-ha_berkeley.h: Auto merged BitKeeper/deleted/.del-make_win_bin_dist: Auto merged BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1: Auto merged BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb: Auto merged BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57: Auto merged BitKeeper/deleted/.del-mysql_thr.c~20772782813d1274: Auto merged BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef: Auto merged BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Auto merged BitKeeper/deleted/.del-prepare~773a10a535120a7e: Auto merged BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758: Auto merged BitKeeper/deleted/.del-sql_manager.h: Auto merged BitKeeper/deleted/.del-thr_test.c~70fc0971c72f2a95: Auto merged Docs/Makefile.am: Auto merged Docs/generate-text-files.pl: Auto merged client/Makefile.am: Auto merged client/client_priv.h: Auto merged client/mysqladmin.cc: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged dbug/Makefile.am: Auto merged extra/Makefile.am: Auto merged extra/yassl/taocrypt/benchmark/Makefile.am: Auto merged extra/yassl/taocrypt/test/Makefile.am: Auto merged include/Makefile.am: Auto merged include/my_time.h: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/embedded_priv.h: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/install_test_db.sh: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/lib/mtr_match.pl: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/ndb/ndbcluster.sh: Auto merged mysys/Makefile.am: Auto merged mysys/my_gethostbyname.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_handler.c: Auto merged regex/Makefile.am: Auto merged scripts/Makefile.am: Auto merged scripts/fill_func_tables.sh: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysql_convert_table_format.sh: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged scripts/mysql_install_db.sh: Auto merged server-tools/instance-manager/IMService.cpp: Auto merged server-tools/instance-manager/WindowsService.cpp: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/log.cc: Auto merged server-tools/instance-manager/log.h: Auto merged server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/messages.cc: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged server-tools/instance-manager/mysqlmanager.cc: Auto merged server-tools/instance-manager/options.cc: Auto merged server-tools/instance-manager/options.h: Auto merged server-tools/instance-manager/portability.h: Auto merged server-tools/instance-manager/priv.cc: Auto merged server-tools/instance-manager/protocol.cc: Auto merged server-tools/instance-manager/protocol.h: Auto merged server-tools/instance-manager/thread_registry.cc: Auto merged server-tools/instance-manager/thread_registry.h: Auto merged server-tools/instance-manager/user_map.cc: Auto merged server-tools/instance-manager/user_map.h: Auto merged sql/Makefile.am: Auto merged sql/discover.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/init.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.h: Auto merged sql/item_geofunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.h: Auto merged sql/item_uniq.cc: Auto merged sql/key.cc: Auto merged sql/lex_symbol.h: Auto merged sql/lock.cc: Auto merged sql/log_event.h: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/my_lock.c: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/password.c: Auto merged sql/procedure.h: Auto merged sql/protocol.h: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.h: Auto merged sql/spatial.h: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_crypt.cc: Auto merged sql/sql_cursor.cc: Auto merged sql/sql_do.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_manager.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql-bench/Makefile.am: Auto merged sql-bench/as3ap.sh: Auto merged sql-bench/bench-count-distinct.sh: Auto merged sql-bench/bench-init.pl.sh: Auto merged sql-bench/compare-results.sh: Auto merged sql-bench/copy-db.sh: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/run-all-tests.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-ATIS.sh: Auto merged sql-bench/test-alter-table.sh: Auto merged sql-bench/test-big-tables.sh: Auto merged sql-bench/test-connect.sh: Auto merged sql-bench/test-create.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-select.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql-bench/test-wisconsin.sh: Auto merged sql-common/my_time.c: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_test.cc: Auto merged sql/sql_update.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: Auto merged storage/federated/ha_federated.cc: Auto merged storage/heap/Makefile.am: Auto merged storage/heap/_check.c: Auto merged storage/heap/_rectest.c: Auto merged storage/heap/ha_heap.cc: Auto merged storage/heap/ha_heap.h: Auto merged storage/heap/heapdef.h: Auto merged storage/heap/hp_block.c: Auto merged storage/heap/hp_clear.c: Auto merged storage/heap/hp_close.c: Auto merged storage/heap/hp_create.c: Auto merged storage/heap/hp_delete.c: Auto merged storage/heap/hp_extra.c: Auto merged storage/heap/hp_hash.c: Auto merged storage/heap/hp_info.c: Auto merged storage/heap/hp_open.c: Auto merged storage/heap/hp_panic.c: Auto merged storage/heap/hp_rename.c: Auto merged storage/heap/hp_rfirst.c: Auto merged storage/heap/hp_rkey.c: Auto merged storage/heap/hp_rlast.c: Auto merged storage/heap/hp_rnext.c: Auto merged storage/heap/hp_rprev.c: Auto merged storage/heap/hp_rrnd.c: Auto merged storage/heap/hp_rsame.c: Auto merged storage/heap/hp_scan.c: Auto merged storage/heap/hp_static.c: Auto merged storage/heap/hp_test1.c: Auto merged storage/heap/hp_test2.c: Auto merged storage/heap/hp_update.c: Auto merged storage/heap/hp_write.c: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/btr/Makefile.am: Auto merged storage/innobase/buf/Makefile.am: Auto merged storage/innobase/data/Makefile.am: Auto merged storage/innobase/dict/Makefile.am: Auto merged storage/innobase/dyn/Makefile.am: Auto merged storage/innobase/eval/Makefile.am: Auto merged storage/innobase/fil/Makefile.am: Auto merged storage/innobase/fsp/Makefile.am: Auto merged storage/innobase/fut/Makefile.am: Auto merged storage/innobase/ha/Makefile.am: Auto merged storage/innobase/ibuf/Makefile.am: Auto merged storage/innobase/lock/Makefile.am: Auto merged storage/innobase/log/Makefile.am: Auto merged storage/innobase/mach/Makefile.am: Auto merged storage/innobase/mem/Makefile.am: Auto merged storage/innobase/mtr/Makefile.am: Auto merged storage/innobase/os/Makefile.am: Auto merged storage/innobase/page/Makefile.am: Auto merged storage/innobase/pars/Makefile.am: Auto merged storage/innobase/que/Makefile.am: Auto merged storage/innobase/read/Makefile.am: Auto merged storage/innobase/rem/Makefile.am: Auto merged storage/innobase/row/Makefile.am: Auto merged storage/innobase/srv/Makefile.am: Auto merged storage/innobase/sync/Makefile.am: Auto merged storage/innobase/thr/Makefile.am: Auto merged storage/innobase/trx/Makefile.am: Auto merged storage/innobase/usr/Makefile.am: Auto merged storage/innobase/ut/Makefile.am: Auto merged storage/myisam/Makefile.am: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_eval.c: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_static.c: Auto merged storage/myisam/ft_stem.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_test1.c: Auto merged storage/myisam/ft_test1.h: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/ftdefs.h: Auto merged storage/myisam/fulltext.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_cache.c: Auto merged storage/myisam/mi_changed.c: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_checksum.c: Auto merged storage/myisam/mi_close.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_dbug.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_delete_table.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_info.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_page.c: Auto merged storage/myisam/mi_panic.c: Auto merged storage/myisam/mi_preload.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_rename.c: Auto merged storage/myisam/mi_rfirst.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/mi_rlast.c: Auto merged storage/myisam/mi_rnext.c: Auto merged storage/myisam/mi_rnext_same.c: Auto merged storage/myisam/mi_rprev.c: Auto merged storage/myisam/mi_rrnd.c: Auto merged storage/myisam/mi_rsame.c: Auto merged storage/myisam/mi_rsamepos.c: Auto merged storage/myisam/mi_scan.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_static.c: Auto merged storage/myisam/mi_statrec.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_test3.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisam_ftdump.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/rt_index.c: Auto merged storage/myisam/rt_index.h: Auto merged storage/myisam/rt_key.h: Auto merged storage/myisam/rt_mbr.c: Auto merged storage/myisam/rt_mbr.h: Auto merged storage/myisam/rt_split.c: Auto merged storage/myisam/rt_test.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_defs.h: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/Makefile.am: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/myisammrg/myrg_close.c: Auto merged storage/myisammrg/myrg_create.c: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_delete.c: Auto merged storage/myisammrg/myrg_extra.c: Auto merged storage/myisammrg/myrg_info.c: Auto merged storage/myisammrg/myrg_locking.c: Auto merged storage/myisammrg/myrg_open.c: Auto merged storage/myisammrg/myrg_panic.c: Auto merged storage/myisammrg/myrg_queue.c: Auto merged storage/myisammrg/myrg_range.c: Auto merged storage/myisammrg/myrg_rfirst.c: Auto merged storage/myisammrg/myrg_rkey.c: Auto merged storage/myisammrg/myrg_rlast.c: Auto merged storage/myisammrg/myrg_rnext.c: Auto merged storage/myisammrg/myrg_rnext_same.c: Auto merged storage/myisammrg/myrg_rprev.c: Auto merged storage/myisammrg/myrg_rrnd.c: Auto merged storage/myisammrg/myrg_rsame.c: Auto merged storage/myisammrg/myrg_static.c: Auto merged storage/myisammrg/myrg_update.c: Auto merged storage/myisammrg/myrg_write.c: Auto merged storage/ndb/Makefile.am: Auto merged storage/ndb/config/common.mk.am: Auto merged storage/ndb/config/type_kernel.mk.am: Auto merged storage/ndb/config/type_mgmapiclient.mk.am: Auto merged storage/ndb/config/type_ndbapi.mk.am: Auto merged storage/ndb/config/type_ndbapiclient.mk.am: Auto merged storage/ndb/config/type_ndbapitest.mk.am: Auto merged storage/ndb/config/type_ndbapitools.mk.am: Auto merged storage/ndb/config/type_util.mk.am: Auto merged storage/ndb/docs/Makefile.am: Auto merged storage/ndb/include/Makefile.am: Auto merged storage/ndb/include/kernel/kernel_config_parameters.h: Auto merged storage/ndb/include/kernel/signaldata/CntrStart.hpp: Auto merged storage/ndb/include/kernel/signaldata/ReadConfig.hpp: Auto merged storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp: Auto merged storage/ndb/include/logger/FileLogHandler.hpp: Auto merged storage/ndb/include/ndb_net.h: Auto merged storage/ndb/include/mgmapi/mgmapi_config_parameters.h: Auto merged storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h: Auto merged storage/ndb/include/util/ConfigValues.hpp: Auto merged storage/ndb/include/util/File.hpp: Auto merged storage/ndb/include/util/Vector.hpp: Auto merged storage/ndb/src/Makefile.am: Auto merged storage/ndb/src/common/Makefile.am: Auto merged storage/ndb/src/common/debugger/Makefile.am: Auto merged storage/ndb/src/common/debugger/signaldata/CntrStart.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/Makefile.am: Auto merged storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/print.awk: Auto merged storage/ndb/src/common/logger/FileLogHandler.cpp: Auto merged storage/ndb/src/common/logger/Makefile.am: Auto merged storage/ndb/src/common/mgmcommon/Makefile.am: Auto merged storage/ndb/src/common/transporter/Makefile.am: Auto merged storage/ndb/src/common/util/Bitmask.cpp: Auto merged storage/ndb/src/common/util/ConfigValues.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged storage/ndb/src/common/util/Makefile.am: Auto merged storage/ndb/src/common/util/new.cpp: Auto merged storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp: Auto merged storage/ndb/src/cw/Makefile.am: Auto merged storage/ndb/src/cw/cpcd/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/backup/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl: Auto merged storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/error/Makefile.am: Auto merged storage/ndb/src/kernel/vm/Makefile.am: Auto merged storage/ndb/src/mgmapi/Makefile.am: Auto merged storage/ndb/src/mgmapi/mgmapi_configuration.cpp: Auto merged storage/ndb/src/mgmclient/Makefile.am: Auto merged storage/ndb/src/mgmsrv/Makefile.am: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/ndbapi/Makefile.am: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/test/Makefile.am: Auto merged storage/ndb/test/ndbapi/Makefile.am: Auto merged storage/ndb/test/ndbapi/bank/Makefile.am: Auto merged storage/ndb/test/ndbapi/testBasic.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/test/run-test/Makefile.am: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/src/Makefile.am: Auto merged storage/ndb/test/tools/Makefile.am: Auto merged storage/ndb/tools/Makefile.am: Auto merged strings/Makefile.am: Auto merged strings/ctype-extra.c: Auto merged tests/Makefile.am: Auto merged vio/Makefile.am: Auto merged BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e: Auto merged BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e: Auto merged BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a: Auto merged BitKeeper/deleted/.del-docbook-split~be931c3922898d0: Auto merged BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9: Auto merged BitKeeper/deleted/.del-make-makefile~39fd454b487126e8: Auto merged BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a: Auto merged BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec: Auto merged BitKeeper/deleted/.del-xwf~76b97805d9146b80: Auto merged server-tools/instance-manager/listener.h: SCCS merged server-tools/instance-manager/manager.h: SCCS merged server-tools/instance-manager/mysql_connection.h: SCCS merged server-tools/instance-manager/priv.h: SCCS merged storage/ndb/src/kernel/blocks/dblqh/Makefile.am: SCCS merged
421 lines
12 KiB
C
421 lines
12 KiB
C
/* Copyright (C) 2000-2005 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
|
|
|
|
#include "ftdefs.h"
|
|
|
|
typedef struct st_ft_docstat {
|
|
FT_WORD *list;
|
|
uint uniq;
|
|
double sum;
|
|
} FT_DOCSTAT;
|
|
|
|
typedef struct st_my_ft_parser_param
|
|
{
|
|
TREE *wtree;
|
|
MEM_ROOT *mem_root;
|
|
} MY_FT_PARSER_PARAM;
|
|
|
|
static int FT_WORD_cmp(CHARSET_INFO* cs, FT_WORD *w1, FT_WORD *w2)
|
|
{
|
|
return mi_compare_text(cs, (uchar*) w1->pos, w1->len,
|
|
(uchar*) w2->pos, w2->len, 0, 0);
|
|
}
|
|
|
|
static int walk_and_copy(FT_WORD *word,uint32 count,FT_DOCSTAT *docstat)
|
|
{
|
|
word->weight=LWS_IN_USE;
|
|
docstat->sum+=word->weight;
|
|
memcpy_fixed((docstat->list)++,word,sizeof(FT_WORD));
|
|
return 0;
|
|
}
|
|
|
|
/* transforms tree of words into the array, applying normalization */
|
|
|
|
FT_WORD * ft_linearize(TREE *wtree, MEM_ROOT *mem_root)
|
|
{
|
|
FT_WORD *wlist,*p;
|
|
FT_DOCSTAT docstat;
|
|
DBUG_ENTER("ft_linearize");
|
|
|
|
if ((wlist=(FT_WORD *) alloc_root(mem_root, sizeof(FT_WORD)*
|
|
(1+wtree->elements_in_tree))))
|
|
{
|
|
docstat.list=wlist;
|
|
docstat.uniq=wtree->elements_in_tree;
|
|
docstat.sum=0;
|
|
tree_walk(wtree,(tree_walk_action)&walk_and_copy,&docstat,left_root_right);
|
|
}
|
|
delete_tree(wtree);
|
|
if (!wlist)
|
|
DBUG_RETURN(NULL);
|
|
|
|
docstat.list->pos=NULL;
|
|
|
|
for (p=wlist;p->pos;p++)
|
|
{
|
|
p->weight=PRENORM_IN_USE;
|
|
}
|
|
|
|
for (p=wlist;p->pos;p++)
|
|
{
|
|
p->weight/=NORM_IN_USE;
|
|
}
|
|
|
|
DBUG_RETURN(wlist);
|
|
}
|
|
|
|
my_bool ft_boolean_check_syntax_string(const byte *str)
|
|
{
|
|
uint i, j;
|
|
|
|
if (!str ||
|
|
(strlen(str)+1 != sizeof(ft_boolean_syntax)) ||
|
|
(str[0] != ' ' && str[1] != ' '))
|
|
return 1;
|
|
for (i=0; i<sizeof(ft_boolean_syntax); i++)
|
|
{
|
|
/* limiting to 7-bit ascii only */
|
|
if ((unsigned char)(str[i]) > 127 || my_isalnum(default_charset_info, str[i]))
|
|
return 1;
|
|
for (j=0; j<i; j++)
|
|
if (str[i] == str[j] && (i != 11 || j != 10))
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
RETURN VALUE
|
|
0 - eof
|
|
1 - word found
|
|
2 - left bracket
|
|
3 - right bracket
|
|
4 - stopword found
|
|
*/
|
|
byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
|
|
FT_WORD *word, MYSQL_FTPARSER_BOOLEAN_INFO *param)
|
|
{
|
|
byte *doc=*start;
|
|
int ctype;
|
|
uint mwc, length, mbl;
|
|
|
|
param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0);
|
|
param->weight_adjust= param->wasign= 0;
|
|
param->type= FT_TOKEN_EOF;
|
|
|
|
while (doc<end)
|
|
{
|
|
for (; doc < end; doc+= (mbl > 0 ? mbl : 1))
|
|
{
|
|
mbl= cs->cset->ctype(cs, &ctype, (uchar*)doc, (uchar*)end);
|
|
if (true_word_char(ctype, *doc))
|
|
break;
|
|
if (*doc == FTB_RQUOT && param->quot)
|
|
{
|
|
param->quot=doc;
|
|
*start=doc+1;
|
|
param->type= FT_TOKEN_RIGHT_PAREN;
|
|
goto ret;
|
|
}
|
|
if (!param->quot)
|
|
{
|
|
if (*doc == FTB_LBR || *doc == FTB_RBR || *doc == FTB_LQUOT)
|
|
{
|
|
/* param->prev=' '; */
|
|
*start=doc+1;
|
|
if (*doc == FTB_LQUOT) param->quot=*start;
|
|
param->type= (*doc == FTB_RBR ? FT_TOKEN_RIGHT_PAREN : FT_TOKEN_LEFT_PAREN);
|
|
goto ret;
|
|
}
|
|
if (param->prev == ' ')
|
|
{
|
|
if (*doc == FTB_YES ) { param->yesno=+1; continue; } else
|
|
if (*doc == FTB_EGAL) { param->yesno= 0; continue; } else
|
|
if (*doc == FTB_NO ) { param->yesno=-1; continue; } else
|
|
if (*doc == FTB_INC ) { param->weight_adjust++; continue; } else
|
|
if (*doc == FTB_DEC ) { param->weight_adjust--; continue; } else
|
|
if (*doc == FTB_NEG ) { param->wasign= !param->wasign; continue; }
|
|
}
|
|
}
|
|
param->prev=*doc;
|
|
param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0);
|
|
param->weight_adjust= param->wasign= 0;
|
|
}
|
|
|
|
mwc=length=0;
|
|
for (word->pos= doc; doc < end; length++, doc+= (mbl > 0 ? mbl : 1))
|
|
{
|
|
mbl= cs->cset->ctype(cs, &ctype, (uchar*)doc, (uchar*)end);
|
|
if (true_word_char(ctype, *doc))
|
|
mwc=0;
|
|
else if (!misc_word_char(*doc) || mwc)
|
|
break;
|
|
else
|
|
mwc++;
|
|
}
|
|
param->prev='A'; /* be sure *prev is true_word_char */
|
|
word->len= (uint)(doc-word->pos) - mwc;
|
|
if ((param->trunc=(doc<end && *doc == FTB_TRUNC)))
|
|
doc++;
|
|
|
|
if (((length >= ft_min_word_len && !is_stopword(word->pos, word->len))
|
|
|| param->trunc) && length < ft_max_word_len)
|
|
{
|
|
*start=doc;
|
|
param->type= FT_TOKEN_WORD;
|
|
goto ret;
|
|
}
|
|
else if (length) /* make sure length > 0 (if start contains spaces only) */
|
|
{
|
|
*start= doc;
|
|
param->type= FT_TOKEN_STOPWORD;
|
|
goto ret;
|
|
}
|
|
}
|
|
if (param->quot)
|
|
{
|
|
param->quot=*start=doc;
|
|
param->type= 3; /* FT_RBR */
|
|
goto ret;
|
|
}
|
|
ret:
|
|
return param->type;
|
|
}
|
|
|
|
byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, const byte *end,
|
|
FT_WORD *word, my_bool skip_stopwords)
|
|
{
|
|
byte *doc= *start;
|
|
uint mwc, length, mbl;
|
|
int ctype;
|
|
DBUG_ENTER("ft_simple_get_word");
|
|
|
|
do
|
|
{
|
|
for (;; doc+= (mbl > 0 ? mbl : 1))
|
|
{
|
|
if (doc >= end)
|
|
DBUG_RETURN(0);
|
|
mbl= cs->cset->ctype(cs, &ctype, (uchar*)doc, (uchar*)end);
|
|
if (true_word_char(ctype, *doc))
|
|
break;
|
|
}
|
|
|
|
mwc= length= 0;
|
|
for (word->pos= doc; doc < end; length++, doc+= (mbl > 0 ? mbl : 1))
|
|
{
|
|
mbl= cs->cset->ctype(cs, &ctype, (uchar*)doc, (uchar*)end);
|
|
if (true_word_char(ctype, *doc))
|
|
mwc= 0;
|
|
else if (!misc_word_char(*doc) || mwc)
|
|
break;
|
|
else
|
|
mwc++;
|
|
}
|
|
|
|
word->len= (uint)(doc-word->pos) - mwc;
|
|
|
|
if (skip_stopwords == FALSE ||
|
|
(length >= ft_min_word_len && length < ft_max_word_len &&
|
|
!is_stopword(word->pos, word->len)))
|
|
{
|
|
*start= doc;
|
|
DBUG_RETURN(1);
|
|
}
|
|
} while (doc < end);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
void ft_parse_init(TREE *wtree, CHARSET_INFO *cs)
|
|
{
|
|
DBUG_ENTER("ft_parse_init");
|
|
if (!is_tree_inited(wtree))
|
|
init_tree(wtree,0,0,sizeof(FT_WORD),(qsort_cmp2)&FT_WORD_cmp,0,NULL, cs);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
static int ft_add_word(MYSQL_FTPARSER_PARAM *param,
|
|
char *word, int word_len,
|
|
MYSQL_FTPARSER_BOOLEAN_INFO *boolean_info __attribute__((unused)))
|
|
{
|
|
TREE *wtree;
|
|
FT_WORD w;
|
|
MY_FT_PARSER_PARAM *ft_param=param->mysql_ftparam;
|
|
DBUG_ENTER("ft_add_word");
|
|
wtree= ft_param->wtree;
|
|
if (param->flags & MYSQL_FTFLAGS_NEED_COPY)
|
|
{
|
|
byte *ptr;
|
|
DBUG_ASSERT(wtree->with_delete == 0);
|
|
ptr= (byte *)alloc_root(ft_param->mem_root, word_len);
|
|
memcpy(ptr, word, word_len);
|
|
w.pos= ptr;
|
|
}
|
|
else
|
|
w.pos= word;
|
|
w.len= word_len;
|
|
if (!tree_insert(wtree, &w, 0, wtree->custom_arg))
|
|
{
|
|
delete_tree(wtree);
|
|
DBUG_RETURN(1);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
static int ft_parse_internal(MYSQL_FTPARSER_PARAM *param,
|
|
char *doc, int doc_len)
|
|
{
|
|
byte *end=doc+doc_len;
|
|
MY_FT_PARSER_PARAM *ft_param=param->mysql_ftparam;
|
|
TREE *wtree= ft_param->wtree;
|
|
FT_WORD w;
|
|
DBUG_ENTER("ft_parse_internal");
|
|
|
|
while (ft_simple_get_word(wtree->custom_arg, &doc, end, &w, TRUE))
|
|
if (param->mysql_add_word(param, w.pos, w.len, 0))
|
|
DBUG_RETURN(1);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
int ft_parse(TREE *wtree, byte *doc, int doclen,
|
|
struct st_mysql_ftparser *parser,
|
|
MYSQL_FTPARSER_PARAM *param, MEM_ROOT *mem_root)
|
|
{
|
|
MY_FT_PARSER_PARAM my_param;
|
|
DBUG_ENTER("ft_parse");
|
|
DBUG_ASSERT(parser);
|
|
|
|
my_param.wtree= wtree;
|
|
my_param.mem_root= mem_root;
|
|
|
|
param->mysql_parse= ft_parse_internal;
|
|
param->mysql_add_word= ft_add_word;
|
|
param->mysql_ftparam= &my_param;
|
|
param->cs= wtree->custom_arg;
|
|
param->doc= doc;
|
|
param->length= doclen;
|
|
param->mode= MYSQL_FTPARSER_SIMPLE_MODE;
|
|
DBUG_RETURN(parser->parse(param));
|
|
}
|
|
|
|
#define MAX_PARAM_NR 2
|
|
MYSQL_FTPARSER_PARAM *ftparser_call_initializer(MI_INFO *info,
|
|
uint keynr, uint paramnr)
|
|
{
|
|
uint32 ftparser_nr;
|
|
struct st_mysql_ftparser *parser;
|
|
if (! info->ftparser_param)
|
|
{
|
|
/* info->ftparser_param can not be zero after the initialization,
|
|
because it always includes built-in fulltext parser. And built-in
|
|
parser can be called even if the table has no fulltext indexes and
|
|
no varchar/text fields. */
|
|
if (! info->s->ftparsers)
|
|
{
|
|
/* It's ok that modification to shared structure is done w/o mutex
|
|
locks, because all threads would set the same variables to the
|
|
same values. */
|
|
uint i, j, keys= info->s->state.header.keys, ftparsers= 1;
|
|
for (i= 0; i < keys; i++)
|
|
{
|
|
MI_KEYDEF *keyinfo= &info->s->keyinfo[i];
|
|
if (keyinfo->flag & HA_FULLTEXT)
|
|
{
|
|
for (j= 0;; j++)
|
|
{
|
|
if (j == i)
|
|
{
|
|
keyinfo->ftparser_nr= ftparsers++;
|
|
break;
|
|
}
|
|
if (info->s->keyinfo[j].flag & HA_FULLTEXT &&
|
|
keyinfo->parser == info->s->keyinfo[j].parser)
|
|
{
|
|
keyinfo->ftparser_nr= info->s->keyinfo[j].ftparser_nr;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
info->s->ftparsers= ftparsers;
|
|
}
|
|
/*
|
|
We have to allocate two MYSQL_FTPARSER_PARAM structures per plugin
|
|
because in a boolean search a parser is called recursively
|
|
ftb_find_relevance* calls ftb_check_phrase*
|
|
(MAX_PARAM_NR=2)
|
|
*/
|
|
info->ftparser_param= (MYSQL_FTPARSER_PARAM *)
|
|
my_malloc(MAX_PARAM_NR * sizeof(MYSQL_FTPARSER_PARAM) *
|
|
info->s->ftparsers, MYF(MY_WME|MY_ZEROFILL));
|
|
init_alloc_root(&info->ft_memroot, FTPARSER_MEMROOT_ALLOC_SIZE, 0);
|
|
if (! info->ftparser_param)
|
|
return 0;
|
|
}
|
|
if (keynr == NO_SUCH_KEY)
|
|
{
|
|
ftparser_nr= 0;
|
|
parser= &ft_default_parser;
|
|
}
|
|
else
|
|
{
|
|
ftparser_nr= info->s->keyinfo[keynr].ftparser_nr;
|
|
parser= info->s->keyinfo[keynr].parser;
|
|
}
|
|
DBUG_ASSERT(paramnr < MAX_PARAM_NR);
|
|
ftparser_nr= ftparser_nr*MAX_PARAM_NR + paramnr;
|
|
if (! info->ftparser_param[ftparser_nr].mysql_add_word)
|
|
{
|
|
/* Note, that mysql_add_word is used here as a flag:
|
|
mysql_add_word == 0 - parser is not initialized
|
|
mysql_add_word != 0 - parser is initialized, or no
|
|
initialization needed. */
|
|
info->ftparser_param[ftparser_nr].mysql_add_word= (void *)1;
|
|
if (parser->init && parser->init(&info->ftparser_param[ftparser_nr]))
|
|
return 0;
|
|
}
|
|
return &info->ftparser_param[ftparser_nr];
|
|
}
|
|
|
|
void ftparser_call_deinitializer(MI_INFO *info)
|
|
{
|
|
uint i, j, keys= info->s->state.header.keys;
|
|
free_root(&info->ft_memroot, MYF(0));
|
|
if (! info->ftparser_param)
|
|
return;
|
|
for (i= 0; i < keys; i++)
|
|
{
|
|
MI_KEYDEF *keyinfo= &info->s->keyinfo[i];
|
|
for (j=0; j < MAX_PARAM_NR; j++)
|
|
{
|
|
MYSQL_FTPARSER_PARAM *ftparser_param=
|
|
&info->ftparser_param[keyinfo->ftparser_nr*MAX_PARAM_NR + j];
|
|
if (keyinfo->flag & HA_FULLTEXT && ftparser_param->mysql_add_word)
|
|
{
|
|
if (keyinfo->parser->deinit)
|
|
keyinfo->parser->deinit(ftparser_param);
|
|
ftparser_param->mysql_add_word= 0;
|
|
}
|
|
else
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|