mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-08 08:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.2 into 10.3

Browse source
This commit is contained in:
Marko Mäkelä 2018-08-03 15:57:23 +03:00
commit 05459706f2
191 changed files with 4360 additions and 1056 deletions
Download patch file Download diff file Expand all files Collapse all files

11
storage/innobase/include/fts0priv.h
View file

@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 2011, 2016, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation.
Copyright (c) 2011, 2018, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, 2018, MariaDB Corporation.
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
@ -511,13 +511,6 @@ fts_get_table_id(
long */
MY_ATTRIBUTE((warn_unused_result));
/******************************************************************//**
Add the table to add to the OPTIMIZER's list. */
void
fts_optimize_add_table(
/*===================*/
dict_table_t* table); /*!< in: table to add */
/******************************************************************//**
Construct the prefix name of an FTS table.
@return own: table name, must be freed with ut_free() */