mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
9e6784924a
Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb BitKeeper/deleted/.del-SETUP.sh.rej: Rename: BUILD/SETUP.sh.rej -> BitKeeper/deleted/.del-SETUP.sh.rej BitKeeper/deleted/.del-configure.in.rej: Rename: configure.in.rej -> BitKeeper/deleted/.del-configure.in.rej BitKeeper/deleted/.del-my_global.h.rej: Rename: include/my_global.h.rej -> BitKeeper/deleted/.del-my_global.h.rej BitKeeper/deleted/.del-my_pthread.h.rej: Rename: include/my_pthread.h.rej -> BitKeeper/deleted/.del-my_pthread.h.rej BitKeeper/deleted/.del-mysql_client_test.c.rej: Rename: tests/mysql_client_test.c.rej -> BitKeeper/deleted/.del-mysql_client_test.c.rej BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89: Rename: sql/mysqld.cc.rej -> BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89 BitKeeper/deleted/.del-sql_parse.cc.rej: Rename: sql/sql_parse.cc.rej -> BitKeeper/deleted/.del-sql_parse.cc.rej BitKeeper/deleted/.del-table.cc.rej: Rename: sql/table.cc.rej -> BitKeeper/deleted/.del-table.cc.rej BitKeeper/deleted/.del-thr_alarm.c.rej: Rename: mysys/thr_alarm.c.rej -> BitKeeper/deleted/.del-thr_alarm.c.rej BUILD/compile-pentium64: Update this to be in line with compile-pentium BUILD/compile-pentium: Send command line options to SETUP.sh BUILD/compile-solaris-sparc-debug: Update scripts BUILD/compile-solaris-sparc-forte: Update scripts BUILD/compile-solaris-sparc-purify: Update scripts BUILD/compile-solaris-sparc: Update scripts BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Removed compiler warning BitKeeper/deleted/.del-ha_berkeley.cc: Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64 configure.in: Added detection of port_create and port.h (for future)as --- manual merge BitKeeper/deleted/.del-ha_berkeley.h: Moved get_auto_primary_key() to ha_berkeley.cc BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Fixed compiler warnings BitKeeper/etc/ignore: added storage/ndb/src/ndbapi/ndberror_check client/mysqlbinlog.cc: Removed not needed 'static' (caused compiler warning) client/mysqldump.c: Fixed compiler warnings from 'max' build client/mysqltest.c: Free warning and query memory no abort. (Removes strange warnings on screen if mysql-test-run fails) Removed compiler warnings Portability fix for windows (windows doesn't have mode_t) client/sql_string.h: Removed compiler warning cmd-line-utils/readline/xmalloc.c: Fixed compiler warnings from 'max' build extra/charset2html.c: Fixed compiler warnings extra/comp_err.c: Fixed compiler warnings from 'max' build extra/yassl/include/lock.hpp: Fix for windows64 extra/yassl/include/openssl/ssl.h: Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/include/socket_wrapper.hpp: Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit extra/yassl/include/yassl.hpp: Fix for windows64 extra/yassl/src/ssl.cpp: Removed compiler warning Detect wrong parameter (Happens when running test suite on solaris) Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/taocrypt/src/integer.cpp: Fixed compiler warnings extra/yassl/testsuite/testsuite.cpp: Removed compiler warning include/config-win.h: Added HAVE_WINSOCK2 (for future) include/my_dbug.h: Fixed DBUG_PROCESS() so that we don't get compiler warnings for it include/my_global.h: Fixed unsafe define of uint4korr() manual merge (ignore changes from 5.0) Fixed warnings on win64 when using int5store and int6store include/my_pthread.h: Added my_thread_id typedef Renamed 'my_thread_id() function to my_thead_dbug_id() include/thr_alarm.h: Make thr_alarm_kill() to depend on thread_id instead of thread include/thr_lock.h: Make thr_abort_locks_for_thread() depend on thread_id instead of thread libmysql/libmysql.def: Fixed compiler warnings on win64 libmysqld/CMakeLists.txt: Added missing files libmysqld/Makefile.am: Added new files libmysqld/lib_sql.cc: Remove not needed code (store_globals() now takes care of things) mysql-test/lib/mtr_report.pl: Removed wrong messages when using --extern mysql-test/mysql-test-run.pl: Fixed that --extern works Print help on stdout instead of stderr (make it easier to pipe it to less) Fixed typo that caused mysql-test-run.pl to fail on Solaris mysql-test/r/keywords.result: manual merge mysql-test/r/ndb_lock.result: After merge fixes mysql-test/r/ps.result: Portability fix mysql-test/t/disabled.def: Disabled ndb_alter_table as this very often fails for me (and have done it for a long time) mysql-test/t/keywords.test: manual merge mysql-test/t/ndb_lock.test: Added other possible error code mysql-test/t/ps.test: Portability fix (when compiling without DLOPEN) mysql-test/t/wait_timeout.test: Don't run this if we are not using a thread per connection (as other thread_handling code may not support timeouts) mysys/base64.c: Fixed compiler warnings on win64 mysys/mf_keycache.c: Fixed compiler warnings mysys/my_getopt.c: Fixed compiler warning mysys/my_init.c: Fixed compiler warning Re-indented long comment mysys/my_thr_init.c: Always use mysys_var->id to generate thread name (makes things uniform accross thread implementations and thread usage) Always generate my_thread_name() when using DBUG Ensure mysys_var->pthread_self is set Fixed compiler warnings mysys/ptr_cmp.c: Fixed compiler warnings from 'max' build mysys/thr_alarm.c: Change thr_alarm_kill() to use mysys_var->id instead of thread id Fixed compiler warning on windows mysys/thr_lock.c: Change thr_abort_locks_for_thread() to use mysys_var->id instead of thread id Add purecov statements around not tested code Fixed compiler warnings mysys/thr_mutex.c: my_thread_id() -> my_thread_dbug_id() server-tools/instance-manager/guardian.cc: Fixed compiler warning server-tools/instance-manager/instance.cc: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warnings server-tools/instance-manager/mysqlmanager.cc: Fixed compiler warnings sql/CMakeLists.txt: Added missing files sql/Makefile.am: Added new files sql/event_scheduler.cc: Added pthread_exit() calls Ensure DBUG_xxx calls are not made before my_thread_init() Use common functions to set up thread handling sql/field.h: manual merge sql/ha_ndbcluster.cc: Removed some trivial 'current_thd' calls sql/handler.cc: Avoid warnings on KILL_CONNECTION Don't print out null pointer with printf() (Causes crashes on Solaris) sql/item.cc: Fixed compiler warnings from 'max' build sql/item_cmpfunc.cc: After merge fixes sql/item_func.cc: Merge embedded and normal code usage (GET_LOCK, RELEASE_LOCK now works on my_thread_id instead of pthread_t) Fixed compiler warning sql/item_strfunc.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warnings sql/lock.cc: Use (new) parameter to thr_abort_locks_for_thread() sql/log.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warnings about not used variable sql/mysql_priv.h: Remove TEST_NO_THREADS (not needed with new scheduler interface) Added functions from sql_connect.cc and new functions from sql_parse.cc sql/mysqld.cc: Use thread_scheduler structure to dispatch calls (make code more dynamic) Change --one-thread option to use thread_scheduler interface Made ONE_THREAD option independent of DBUG_BUILD --one-thread is now depricated. One should instead use '--thread-handling=no-threads' Remove not used uname() function. Split create_new_thread() into reusable sub functions. Preliminary interface code for future thread_handling code. Fixed compiler warnings sql/parse_file.cc: Don't send zero pointer to fn_format() (Causes crashes when using --debug) sql/repl_failsafe.cc: Setup pseudo_thread_id same way as other code sql/set_var.cc: Added variables 'thread_handling' Prepare for future variable 'thread_pool_size' Fixed compiler warnings sql/set_var.h: Fixed compiler warning sql/slave.cc: Setup pseudo_thread_id same way as other code Removed not used signal mask sql/sql_acl.cc: Fixed compiler warnings from 'max' build sql/sql_base.cc: Fixed long comments Normalized variable setup Don't destroy value of thd->variables.pseduo_thread_id More DBUG_PRINT()'s More DBUG_ASSERT()'s Fixed compiler warnings from 'max' build sql/sql_class.cc: Remove thd->real_id and thd->dbug_thread_id Added DBUG_ASSERT() Use thread_scheduler to signal threads to be killed. In THD::store_globals(), set my_thread_var->id to be thd->thread_id. Fixed compiler warnings sql/sql_class.h: Use 'my_thread_id' for internal thread id's Remove not needed THD elements: block_signals and dbug_thread_id Added 'thread_scheduler' scheduling extension element to THD sql/sql_insert.cc: After merge fixes (This actually fixes a bug in old code when many connections are in use) Setup pseudo_thread_id same way as other code Removed not used signal mask Initialize variable that may be used unitialized on error conditions (not fatal) sql/sql_parse.cc: Move connection related code to sql_connect.cc Remove setting of signal mask (not needed) Ensure TABLE_LIST->alias is set for generated TABLE_LIST elements (fixed core dumps when running with --debug) Added previous 'optional' element to reset_mgh() Removed not needed DBUG_PRINT call sql/sql_partition.cc: Fixed compiler warnings sql/sql_prepare.cc: Removed not needed casts Fixed compiler warnings from 'max' build sql/sql_select.cc: Fixed compiler warnings sql-bench/bench-init.pl.sh: Added --one-missing-tests sql-bench/example: Better example sql-bench/run-all-tests.sh: Added --only-missing-tests sql-bench/test-insert.sh: Fixed wrong estimate of update_with_key_prefix sql/sql_show.cc: Don't send pthread_kill() to threads to detect if they exists. (Not that useful and causes problems with future thread_handling code) Fixed compiler warnings sql/sql_table.cc: Simplify code Fixed compiler warnings sql/sql_test.cc: Remove dbug_thread_id from test output sql/sql_view.cc: Don't send zero pointer to fn_format() sql/tztime.cc: Fixed compiler warning sql/udf_example.def: Fixed compiler warnings on win64 sql/unireg.cc: Initialize variable that may be used unitialized on error conditions storage/archive/archive_test.c: Fixed compiler warnings storage/archive/azio.c: Fixed compiler warnings storage/innobase/dict/dict0crea.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0dict.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0load.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0mem.c: Fixed compiler warnings detected on windows64 storage/innobase/eval/eval0proc.c: Fixed compiler warnings detected on windows64 storage/innobase/handler/ha_innodb.cc: Fixed compiler warnings detected on windows64 storage/innobase/include/ut0byte.ic: Fixed compiler warnings on win64 storage/innobase/include/ut0ut.ic: Fixed compiler warnings on win64 storage/innobase/mtr/mtr0log.c: Fixed compiler warnings detected on windows64 storage/innobase/pars/pars0lex.l: Fixed warnings on win64 storage/innobase/rem/rem0cmp.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0mysql.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0sel.c: Fixed compiler warnings detected on windows64 storage/innobase/sync/sync0rw.c: Fixed compiler warnings detected on windows64 storage/innobase/trx/trx0trx.c: Fixed compiler warnings detected on windows64 storage/myisam/mi_log.c: my_thread_id() -> my_thread_debug_id() storage/myisam/mi_packrec.c: Fixed compiler warnings detected on windows64 storage/myisam/myisamchk.c: Fixed compiler warnings from 'max' build storage/ndb/src/common/debugger/EventLogger.cpp: Fixed compiler warnings storage/ndb/src/common/util/ConfigValues.cpp: Removed compiler warnings storage/ndb/src/common/util/NdbSqlUtil.cpp: Removed compiler warnings storage/ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/diskpage.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Fixed compiler warnings storage/ndb/src/mgmclient/main.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/SignalSender.cpp: Fixed compiler warnings storage/ndb/tools/restore/consumer_restore.cpp: Fixed compiler warnings strings/ctype-ucs2.c: Fixed compiler warnings strings/ctype-utf8.c: Fixed compiler warnings strings/decimal.c: Fixed compiler warnings strings/my_strchr.c: Fixed conflict between function and prototype support-files/compiler_warnings.supp: Ignore warnings from sql_yacc.cc that are hard to remove Ignore some not important warnings from windows 64 bit build Suppress warnings from bdb and (for the moment) warnings from ndb Suppress all warnings for all pushbuild platforms (should make all trees green) vio/viosslfactories.c: Added DBUG_PRINT BUILD/compile-pentium64-max: New BitKeeper file ``BUILD/compile-pentium64-max'' libmysqld/scheduler.cc: New BitKeeper file ``libmysqld/scheduler.cc'' libmysqld/sql_connect.cc: New BitKeeper file ``libmysqld/sql_connect.cc'' mysql-test/include/one_thread_per_connection.inc: New BitKeeper file ``mysql-test/include/one_thread_per_connection.inc'' mysql-test/r/no-threads.result: New BitKeeper file ``mysql-test/r/no-threads.result'' mysql-test/r/one_thread_per_connection.require: New BitKeeper file ``mysql-test/r/one_thread_per_connection.require'' mysql-test/t/no-threads-master.opt: New BitKeeper file ``mysql-test/t/no-threads-master.opt'' mysql-test/t/no-threads.test: New BitKeeper file ``mysql-test/t/no-threads.test'' sql/scheduler.cc: New BitKeeper file ``sql/scheduler.cc'' sql/scheduler.h: New BitKeeper file ``sql/scheduler.h'' sql/sql_connect.cc: New BitKeeper file ``sql/sql_connect.cc''
961 lines
24 KiB
C++
961 lines
24 KiB
C++
/* Copyright (C) 2004 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 */
|
|
|
|
// Text .frm files management routines
|
|
|
|
#include "mysql_priv.h"
|
|
#include <errno.h>
|
|
#include <m_ctype.h>
|
|
#include <my_sys.h>
|
|
#include <my_dir.h>
|
|
|
|
|
|
/*
|
|
write string with escaping
|
|
|
|
SYNOPSIS
|
|
write_escaped_string()
|
|
file - IO_CACHE for record
|
|
val_s - string for writing
|
|
|
|
RETURN
|
|
FALSE - OK
|
|
TRUE - error
|
|
*/
|
|
|
|
static my_bool
|
|
write_escaped_string(IO_CACHE *file, LEX_STRING *val_s)
|
|
{
|
|
char *eos= val_s->str + val_s->length;
|
|
char *ptr= val_s->str;
|
|
|
|
for (; ptr < eos; ptr++)
|
|
{
|
|
/*
|
|
Should be in sync with read_escaped_string() and
|
|
parse_quoted_escaped_string()
|
|
*/
|
|
switch(*ptr) {
|
|
case '\\': // escape character
|
|
if (my_b_append(file, (const byte *)STRING_WITH_LEN("\\\\")))
|
|
return TRUE;
|
|
break;
|
|
case '\n': // parameter value delimiter
|
|
if (my_b_append(file, (const byte *)STRING_WITH_LEN("\\n")))
|
|
return TRUE;
|
|
break;
|
|
case '\0': // problem for some string processing utilities
|
|
if (my_b_append(file, (const byte *)STRING_WITH_LEN("\\0")))
|
|
return TRUE;
|
|
break;
|
|
case 26: // problem for windows utilities (Ctrl-Z)
|
|
if (my_b_append(file, (const byte *)STRING_WITH_LEN("\\z")))
|
|
return TRUE;
|
|
break;
|
|
case '\'': // list of string delimiter
|
|
if (my_b_append(file, (const byte *)STRING_WITH_LEN("\\\'")))
|
|
return TRUE;
|
|
break;
|
|
default:
|
|
if (my_b_append(file, (const byte *)ptr, 1))
|
|
return TRUE;
|
|
}
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
write parameter value to IO_CACHE
|
|
|
|
SYNOPSIS
|
|
write_parameter()
|
|
file pointer to IO_CACHE structure for writing
|
|
base pointer to data structure
|
|
parameter pointer to parameter descriptor
|
|
old_version for returning back old version number value
|
|
|
|
RETURN
|
|
FALSE - OK
|
|
TRUE - error
|
|
*/
|
|
|
|
static my_bool
|
|
write_parameter(IO_CACHE *file, gptr base, File_option *parameter,
|
|
ulonglong *old_version)
|
|
{
|
|
char num_buf[20]; // buffer for numeric operations
|
|
// string for numeric operations
|
|
String num(num_buf, sizeof(num_buf), &my_charset_bin);
|
|
DBUG_ENTER("write_parameter");
|
|
|
|
switch (parameter->type) {
|
|
case FILE_OPTIONS_STRING:
|
|
{
|
|
LEX_STRING *val_s= (LEX_STRING *)(base + parameter->offset);
|
|
if (my_b_append(file, (const byte *)val_s->str, val_s->length))
|
|
DBUG_RETURN(TRUE);
|
|
break;
|
|
}
|
|
case FILE_OPTIONS_ESTRING:
|
|
{
|
|
if (write_escaped_string(file, (LEX_STRING *)(base + parameter->offset)))
|
|
DBUG_RETURN(TRUE);
|
|
break;
|
|
}
|
|
case FILE_OPTIONS_ULONGLONG:
|
|
{
|
|
num.set(*((ulonglong *)(base + parameter->offset)), &my_charset_bin);
|
|
if (my_b_append(file, (const byte *)num.ptr(), num.length()))
|
|
DBUG_RETURN(TRUE);
|
|
break;
|
|
}
|
|
case FILE_OPTIONS_REV:
|
|
{
|
|
ulonglong *val_i= (ulonglong *)(base + parameter->offset);
|
|
*old_version= (*val_i)++;
|
|
num.set(*val_i, &my_charset_bin);
|
|
if (my_b_append(file, (const byte *)num.ptr(), num.length()))
|
|
DBUG_RETURN(TRUE);
|
|
break;
|
|
}
|
|
case FILE_OPTIONS_TIMESTAMP:
|
|
{
|
|
/* string have to be allocated already */
|
|
LEX_STRING *val_s= (LEX_STRING *)(base + parameter->offset);
|
|
time_t tm= time(NULL);
|
|
|
|
get_date(val_s->str, GETDATE_DATE_TIME|GETDATE_GMT|GETDATE_FIXEDLENGTH,
|
|
tm);
|
|
val_s->length= PARSE_FILE_TIMESTAMPLENGTH;
|
|
if (my_b_append(file, (const byte *)val_s->str,
|
|
PARSE_FILE_TIMESTAMPLENGTH))
|
|
DBUG_RETURN(TRUE);
|
|
break;
|
|
}
|
|
case FILE_OPTIONS_STRLIST:
|
|
{
|
|
List_iterator_fast<LEX_STRING> it(*((List<LEX_STRING>*)
|
|
(base + parameter->offset)));
|
|
bool first= 1;
|
|
LEX_STRING *str;
|
|
while ((str= it++))
|
|
{
|
|
// We need ' ' after string to detect list continuation
|
|
if ((!first && my_b_append(file, (const byte *)STRING_WITH_LEN(" "))) ||
|
|
my_b_append(file, (const byte *)STRING_WITH_LEN("\'")) ||
|
|
write_escaped_string(file, str) ||
|
|
my_b_append(file, (const byte *)STRING_WITH_LEN("\'")))
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
first= 0;
|
|
}
|
|
break;
|
|
}
|
|
case FILE_OPTIONS_ULLLIST:
|
|
{
|
|
List_iterator_fast<ulonglong> it(*((List<ulonglong>*)
|
|
(base + parameter->offset)));
|
|
bool first= 1;
|
|
ulonglong *val;
|
|
while ((val= it++))
|
|
{
|
|
num.set(*val, &my_charset_bin);
|
|
// We need ' ' after string to detect list continuation
|
|
if ((!first && my_b_append(file, (const byte *)STRING_WITH_LEN(" "))) ||
|
|
my_b_append(file, (const byte *)num.ptr(), num.length()))
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
first= 0;
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
DBUG_ASSERT(0); // never should happened
|
|
}
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/*
|
|
write new .frm
|
|
|
|
SYNOPSIS
|
|
sql_create_definition_file()
|
|
dir directory where put .frm
|
|
file .frm file name
|
|
type .frm type string (VIEW, TABLE)
|
|
base base address for parameter reading (structure like
|
|
TABLE)
|
|
parameters parameters description
|
|
max_versions number of versions to save
|
|
|
|
RETURN
|
|
FALSE - OK
|
|
TRUE - error
|
|
*/
|
|
|
|
my_bool
|
|
sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
|
|
const LEX_STRING *type,
|
|
gptr base, File_option *parameters,
|
|
uint max_versions)
|
|
{
|
|
File handler;
|
|
IO_CACHE file;
|
|
char path[FN_REFLEN+1]; // +1 to put temporary file name for sure
|
|
ulonglong old_version= ULONGLONG_MAX;
|
|
int path_end;
|
|
File_option *param;
|
|
DBUG_ENTER("sql_create_definition_file");
|
|
DBUG_PRINT("enter", ("Dir: %s, file: %s, base 0x%lx",
|
|
dir ? dir->str : "(null)",
|
|
file_name->str, (ulong) base));
|
|
|
|
if (dir)
|
|
{
|
|
fn_format(path, file_name->str, dir->str, "", MY_UNPACK_FILENAME);
|
|
path_end= strlen(path);
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
if not dir is passed, it means file_name is a full path,
|
|
including dir name, file name itself, and an extension,
|
|
and with unpack_filename() executed over it.
|
|
*/
|
|
path_end= strxnmov(path, FN_REFLEN, file_name->str, NullS) - path;
|
|
}
|
|
|
|
// temporary file name
|
|
path[path_end]='~';
|
|
path[path_end+1]= '\0';
|
|
if ((handler= my_create(path, CREATE_MODE, O_RDWR | O_TRUNC,
|
|
MYF(MY_WME))) <= 0)
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
if (init_io_cache(&file, handler, 0, SEQ_READ_APPEND, 0L, 0, MYF(MY_WME)))
|
|
goto err_w_file;
|
|
|
|
// write header (file signature)
|
|
if (my_b_append(&file, (const byte *)STRING_WITH_LEN("TYPE=")) ||
|
|
my_b_append(&file, (const byte *)type->str, type->length) ||
|
|
my_b_append(&file, (const byte *)STRING_WITH_LEN("\n")))
|
|
goto err_w_file;
|
|
|
|
// write parameters to temporary file
|
|
for (param= parameters; param->name.str; param++)
|
|
{
|
|
if (my_b_append(&file, (const byte *)param->name.str,
|
|
param->name.length) ||
|
|
my_b_append(&file, (const byte *)STRING_WITH_LEN("=")) ||
|
|
write_parameter(&file, base, param, &old_version) ||
|
|
my_b_append(&file, (const byte *)STRING_WITH_LEN("\n")))
|
|
goto err_w_cache;
|
|
}
|
|
|
|
if (end_io_cache(&file))
|
|
goto err_w_file;
|
|
|
|
if (my_close(handler, MYF(MY_WME)))
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
// archive copies management
|
|
path[path_end]='\0';
|
|
if (!access(path, F_OK))
|
|
{
|
|
if (old_version != ULONGLONG_MAX && max_versions != 0)
|
|
{
|
|
// save backup
|
|
char path_arc[FN_REFLEN];
|
|
// backup old version
|
|
char path_to[FN_REFLEN];
|
|
|
|
// check archive directory existence
|
|
fn_format(path_arc, "arc", dir->str, "", MY_UNPACK_FILENAME);
|
|
if (access(path_arc, F_OK))
|
|
{
|
|
if (my_mkdir(path_arc, 0777, MYF(MY_WME)))
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
|
|
my_snprintf(path_to, FN_REFLEN, "%s/%s-%04lu",
|
|
path_arc, file_name->str, (ulong) old_version);
|
|
if (my_rename(path, path_to, MYF(MY_WME)))
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
// remove very old version
|
|
if (old_version > max_versions)
|
|
{
|
|
my_snprintf(path_to, FN_REFLEN, "%s/%s-%04lu",
|
|
path_arc, file_name->str,
|
|
(ulong)(old_version - max_versions));
|
|
if (!access(path_arc, F_OK) && my_delete(path_to, MYF(MY_WME)))
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (my_delete(path, MYF(MY_WME))) // no backups
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
}
|
|
|
|
{
|
|
// rename temporary file
|
|
char path_to[FN_REFLEN];
|
|
memcpy(path_to, path, path_end+1);
|
|
path[path_end]='~';
|
|
if (my_rename(path, path_to, MYF(MY_WME)))
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
DBUG_RETURN(FALSE);
|
|
err_w_cache:
|
|
end_io_cache(&file);
|
|
err_w_file:
|
|
my_close(handler, MYF(MY_WME));
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
/*
|
|
Renames a frm file (including backups) in same schema
|
|
|
|
SYNOPSIS
|
|
rename_in_schema_file
|
|
schema name of given schema
|
|
old_name original file name
|
|
new_name new file name
|
|
revision revision number
|
|
num_view_backups number of backups
|
|
|
|
RETURN
|
|
0 - OK
|
|
1 - Error (only if renaming of frm failed)
|
|
|
|
*/
|
|
my_bool rename_in_schema_file(const char *schema, const char *old_name,
|
|
const char *new_name, ulonglong revision,
|
|
uint num_view_backups)
|
|
{
|
|
char old_path[FN_REFLEN], new_path[FN_REFLEN], arc_path[FN_REFLEN];
|
|
|
|
build_table_filename(old_path, sizeof(old_path) - 1,
|
|
schema, old_name, reg_ext, 0);
|
|
build_table_filename(new_path, sizeof(new_path) - 1,
|
|
schema, new_name, reg_ext, 0);
|
|
|
|
if (my_rename(old_path, new_path, MYF(MY_WME)))
|
|
return 1;
|
|
|
|
/* check if arc_dir exists */
|
|
build_table_filename(arc_path, sizeof(arc_path) - 1, schema, "arc", "", 0);
|
|
|
|
if (revision > 0 && !access(arc_path, F_OK))
|
|
{
|
|
char old_name_buf[FN_REFLEN], new_name_buf[FN_REFLEN];
|
|
ulonglong limit= ((revision > num_view_backups) ?
|
|
revision - num_view_backups : 0);
|
|
|
|
VOID(tablename_to_filename(old_name, old_name_buf, sizeof(old_name_buf)));
|
|
VOID(tablename_to_filename(new_name, new_name_buf, sizeof(new_name_buf)));
|
|
|
|
for (; revision > limit ; revision--)
|
|
{
|
|
my_snprintf(old_path, FN_REFLEN, "%s/%s%s-%04lu",
|
|
arc_path, old_name_buf, reg_ext, (ulong) revision);
|
|
(void) unpack_filename(old_path, old_path);
|
|
my_snprintf(new_path, FN_REFLEN, "%s/%s%s-%04lu",
|
|
arc_path, new_name_buf, reg_ext, (ulong) revision);
|
|
(void) unpack_filename(new_path, new_path);
|
|
my_rename(old_path, new_path, MYF(0));
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
Prepare frm to parse (read to memory)
|
|
|
|
SYNOPSIS
|
|
sql_parse_prepare()
|
|
file_name - path & filename to .frm file
|
|
mem_root - MEM_ROOT for buffer allocation
|
|
bad_format_errors - send errors on bad content
|
|
|
|
RETURN
|
|
0 - error
|
|
parser object
|
|
|
|
NOTE
|
|
returned pointer + 1 will be type of .frm
|
|
*/
|
|
|
|
File_parser *
|
|
sql_parse_prepare(const LEX_STRING *file_name, MEM_ROOT *mem_root,
|
|
bool bad_format_errors)
|
|
{
|
|
MY_STAT stat_info;
|
|
uint len;
|
|
char *end, *sign;
|
|
File_parser *parser;
|
|
File file;
|
|
DBUG_ENTER("sql_parse_prepare");
|
|
|
|
if (!my_stat(file_name->str, &stat_info, MYF(MY_WME)))
|
|
{
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
if (stat_info.st_size > INT_MAX-1)
|
|
{
|
|
my_error(ER_FPARSER_TOO_BIG_FILE, MYF(0), file_name->str);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
if (!(parser= new(mem_root) File_parser))
|
|
{
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
if (!(parser->buff= alloc_root(mem_root, stat_info.st_size+1)))
|
|
{
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
if ((file= my_open(file_name->str, O_RDONLY | O_SHARE, MYF(MY_WME))) < 0)
|
|
{
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
if ((len= my_read(file, (byte *)parser->buff,
|
|
stat_info.st_size, MYF(MY_WME))) ==
|
|
MY_FILE_ERROR)
|
|
{
|
|
my_close(file, MYF(MY_WME));
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
if (my_close(file, MYF(MY_WME)))
|
|
{
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
end= parser->end= parser->buff + len;
|
|
*end= '\0'; // barrier for more simple parsing
|
|
|
|
// 7 = 5 (TYPE=) + 1 (letter at least of type name) + 1 ('\n')
|
|
if (len < 7 ||
|
|
parser->buff[0] != 'T' ||
|
|
parser->buff[1] != 'Y' ||
|
|
parser->buff[2] != 'P' ||
|
|
parser->buff[3] != 'E' ||
|
|
parser->buff[4] != '=')
|
|
goto frm_error;
|
|
|
|
// skip signature;
|
|
parser->file_type.str= sign= parser->buff + 5;
|
|
while (*sign >= 'A' && *sign <= 'Z' && sign < end)
|
|
sign++;
|
|
if (*sign != '\n')
|
|
goto frm_error;
|
|
parser->file_type.length= sign - parser->file_type.str;
|
|
// EOS for file signature just for safety
|
|
*sign= '\0';
|
|
|
|
parser->start= sign + 1;
|
|
parser->content_ok= 1;
|
|
|
|
DBUG_RETURN(parser);
|
|
|
|
frm_error:
|
|
if (bad_format_errors)
|
|
{
|
|
my_error(ER_FPARSER_BAD_HEADER, MYF(0), file_name->str);
|
|
DBUG_RETURN(0);
|
|
}
|
|
else
|
|
DBUG_RETURN(parser); // upper level have to check parser->ok()
|
|
}
|
|
|
|
|
|
/*
|
|
parse LEX_STRING
|
|
|
|
SYNOPSIS
|
|
parse_string()
|
|
ptr - pointer on string beginning
|
|
end - pointer on symbol after parsed string end (still owned
|
|
by buffer and can be accessed
|
|
mem_root - MEM_ROOT for parameter allocation
|
|
str - pointer on string, where results should be stored
|
|
|
|
RETURN
|
|
0 - error
|
|
# - pointer on symbol after string
|
|
*/
|
|
|
|
static char *
|
|
parse_string(char *ptr, char *end, MEM_ROOT *mem_root, LEX_STRING *str)
|
|
{
|
|
// get string length
|
|
char *eol= strchr(ptr, '\n');
|
|
|
|
if (eol >= end)
|
|
return 0;
|
|
|
|
str->length= eol - ptr;
|
|
|
|
if (!(str->str= alloc_root(mem_root, str->length+1)))
|
|
return 0;
|
|
|
|
memcpy(str->str, ptr, str->length);
|
|
str->str[str->length]= '\0'; // just for safety
|
|
return eol+1;
|
|
}
|
|
|
|
|
|
/*
|
|
read escaped string from ptr to eol in already allocated str
|
|
|
|
SYNOPSIS
|
|
read_escaped_string()
|
|
ptr - pointer on string beginning
|
|
eol - pointer on character after end of string
|
|
str - target string
|
|
|
|
RETURN
|
|
FALSE - OK
|
|
TRUE - error
|
|
*/
|
|
|
|
my_bool
|
|
read_escaped_string(char *ptr, char *eol, LEX_STRING *str)
|
|
{
|
|
char *write_pos= str->str;
|
|
|
|
for (; ptr < eol; ptr++, write_pos++)
|
|
{
|
|
char c= *ptr;
|
|
if (c == '\\')
|
|
{
|
|
ptr++;
|
|
if (ptr >= eol)
|
|
return TRUE;
|
|
/*
|
|
Should be in sync with write_escaped_string() and
|
|
parse_quoted_escaped_string()
|
|
*/
|
|
switch(*ptr) {
|
|
case '\\':
|
|
*write_pos= '\\';
|
|
break;
|
|
case 'n':
|
|
*write_pos= '\n';
|
|
break;
|
|
case '0':
|
|
*write_pos= '\0';
|
|
break;
|
|
case 'z':
|
|
*write_pos= 26;
|
|
break;
|
|
case '\'':
|
|
*write_pos= '\'';
|
|
break;
|
|
default:
|
|
return TRUE;
|
|
}
|
|
}
|
|
else
|
|
*write_pos= c;
|
|
}
|
|
str->str[str->length= write_pos-str->str]= '\0'; // just for safety
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
parse \n delimited escaped string
|
|
|
|
SYNOPSIS
|
|
parse_escaped_string()
|
|
ptr - pointer on string beginning
|
|
end - pointer on symbol after parsed string end (still owned
|
|
by buffer and can be accessed
|
|
mem_root - MEM_ROOT for parameter allocation
|
|
str - pointer on string, where results should be stored
|
|
|
|
RETURN
|
|
0 - error
|
|
# - pointer on symbol after string
|
|
*/
|
|
|
|
char *
|
|
parse_escaped_string(char *ptr, char *end, MEM_ROOT *mem_root, LEX_STRING *str)
|
|
{
|
|
char *eol= strchr(ptr, '\n');
|
|
|
|
if (eol == 0 || eol >= end ||
|
|
!(str->str= alloc_root(mem_root, (eol - ptr) + 1)) ||
|
|
read_escaped_string(ptr, eol, str))
|
|
return 0;
|
|
|
|
return eol+1;
|
|
}
|
|
|
|
|
|
/*
|
|
parse '' delimited escaped string
|
|
|
|
SYNOPSIS
|
|
parse_quoted_escaped_string()
|
|
ptr - pointer on string beginning
|
|
end - pointer on symbol after parsed string end (still owned
|
|
by buffer and can be accessed
|
|
mem_root - MEM_ROOT for parameter allocation
|
|
str - pointer on string, where results should be stored
|
|
|
|
RETURN
|
|
0 - error
|
|
# - pointer on symbol after string
|
|
*/
|
|
|
|
static char *
|
|
parse_quoted_escaped_string(char *ptr, char *end,
|
|
MEM_ROOT *mem_root, LEX_STRING *str)
|
|
{
|
|
char *eol;
|
|
uint result_len= 0;
|
|
bool escaped= 0;
|
|
|
|
// starting '
|
|
if (*(ptr++) != '\'')
|
|
return 0;
|
|
|
|
// find ending '
|
|
for (eol= ptr; (*eol != '\'' || escaped) && eol < end; eol++)
|
|
{
|
|
if (!(escaped= (*eol == '\\' && !escaped)))
|
|
result_len++;
|
|
}
|
|
|
|
// process string
|
|
if (eol >= end ||
|
|
!(str->str= alloc_root(mem_root, result_len + 1)) ||
|
|
read_escaped_string(ptr, eol, str))
|
|
return 0;
|
|
|
|
return eol+1;
|
|
}
|
|
|
|
|
|
/*
|
|
Parser for FILE_OPTIONS_ULLLIST type value.
|
|
|
|
SYNOPSIS
|
|
get_file_options_ulllist()
|
|
ptr [in/out] pointer to parameter
|
|
end [in] end of the configuration
|
|
line [in] pointer to the line begining
|
|
base [in] base address for parameter writing (structure
|
|
like TABLE)
|
|
parameter [in] description
|
|
mem_root [in] MEM_ROOT for parameters allocation
|
|
*/
|
|
|
|
bool get_file_options_ulllist(char *&ptr, char *end, char *line,
|
|
gptr base, File_option *parameter,
|
|
MEM_ROOT *mem_root)
|
|
{
|
|
List<ulonglong> *nlist= (List<ulonglong>*)(base + parameter->offset);
|
|
ulonglong *num;
|
|
nlist->empty();
|
|
// list parsing
|
|
while (ptr < end)
|
|
{
|
|
int not_used;
|
|
char *num_end= end;
|
|
if (!(num= (ulonglong*)alloc_root(mem_root, sizeof(ulonglong))) ||
|
|
nlist->push_back(num, mem_root))
|
|
goto nlist_err;
|
|
*num= my_strtoll10(ptr, &num_end, ¬_used);
|
|
ptr= num_end;
|
|
switch (*ptr) {
|
|
case '\n':
|
|
goto end_of_nlist;
|
|
case ' ':
|
|
// we cant go over buffer bounds, because we have \0 at the end
|
|
ptr++;
|
|
break;
|
|
default:
|
|
goto nlist_err_w_message;
|
|
}
|
|
}
|
|
|
|
end_of_nlist:
|
|
if (*(ptr++) != '\n')
|
|
goto nlist_err;
|
|
return FALSE;
|
|
|
|
nlist_err_w_message:
|
|
my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0), parameter->name.str, line);
|
|
nlist_err:
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/*
|
|
parse parameters
|
|
|
|
SYNOPSIS
|
|
File_parser::parse()
|
|
base base address for parameter writing (structure like
|
|
TABLE)
|
|
mem_root MEM_ROOT for parameters allocation
|
|
parameters parameters description
|
|
required number of required parameters in above list
|
|
hook hook called for unknown keys
|
|
hook_data some data specific for the hook
|
|
|
|
RETURN
|
|
FALSE - OK
|
|
TRUE - error
|
|
*/
|
|
|
|
my_bool
|
|
File_parser::parse(gptr base, MEM_ROOT *mem_root,
|
|
struct File_option *parameters, uint required,
|
|
Unknown_key_hook *hook)
|
|
{
|
|
uint first_param= 0, found= 0;
|
|
char *ptr= start;
|
|
char *eol;
|
|
LEX_STRING *str;
|
|
List<LEX_STRING> *list;
|
|
DBUG_ENTER("File_parser::parse");
|
|
|
|
while (ptr < end && found < required)
|
|
{
|
|
char *line= ptr;
|
|
if (*ptr == '#')
|
|
{
|
|
// it is comment
|
|
if (!(ptr= strchr(ptr, '\n')))
|
|
{
|
|
my_error(ER_FPARSER_EOF_IN_COMMENT, MYF(0), line);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
ptr++;
|
|
}
|
|
else
|
|
{
|
|
File_option *parameter= parameters+first_param,
|
|
*parameters_end= parameters+required;
|
|
int len= 0;
|
|
for (; parameter < parameters_end; parameter++)
|
|
{
|
|
len= parameter->name.length;
|
|
// check length
|
|
if (len < (end-ptr) && ptr[len] != '=')
|
|
continue;
|
|
// check keyword
|
|
if (memcmp(parameter->name.str, ptr, len) == 0)
|
|
break;
|
|
}
|
|
|
|
if (parameter < parameters_end)
|
|
{
|
|
found++;
|
|
/*
|
|
if we found first parameter, start search from next parameter
|
|
next time.
|
|
(this small optimisation should work, because they should be
|
|
written in same order)
|
|
*/
|
|
if (parameter == parameters+first_param)
|
|
first_param++;
|
|
|
|
// get value
|
|
ptr+= (len+1);
|
|
switch (parameter->type) {
|
|
case FILE_OPTIONS_STRING:
|
|
{
|
|
if (!(ptr= parse_string(ptr, end, mem_root,
|
|
(LEX_STRING *)(base +
|
|
parameter->offset))))
|
|
{
|
|
my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
|
|
parameter->name.str, line);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
break;
|
|
}
|
|
case FILE_OPTIONS_ESTRING:
|
|
{
|
|
if (!(ptr= parse_escaped_string(ptr, end, mem_root,
|
|
(LEX_STRING *)
|
|
(base + parameter->offset))))
|
|
{
|
|
my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
|
|
parameter->name.str, line);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
break;
|
|
}
|
|
case FILE_OPTIONS_ULONGLONG:
|
|
case FILE_OPTIONS_REV:
|
|
if (!(eol= strchr(ptr, '\n')))
|
|
{
|
|
my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
|
|
parameter->name.str, line);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
{
|
|
int not_used;
|
|
*((ulonglong*)(base + parameter->offset))=
|
|
my_strtoll10(ptr, 0, ¬_used);
|
|
}
|
|
ptr= eol+1;
|
|
break;
|
|
case FILE_OPTIONS_TIMESTAMP:
|
|
{
|
|
/* string have to be allocated already */
|
|
LEX_STRING *val= (LEX_STRING *)(base + parameter->offset);
|
|
/* yyyy-mm-dd HH:MM:SS = 19(PARSE_FILE_TIMESTAMPLENGTH) characters */
|
|
if (ptr[PARSE_FILE_TIMESTAMPLENGTH] != '\n')
|
|
{
|
|
my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
|
|
parameter->name.str, line);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
memcpy(val->str, ptr, PARSE_FILE_TIMESTAMPLENGTH);
|
|
val->str[val->length= PARSE_FILE_TIMESTAMPLENGTH]= '\0';
|
|
ptr+= (PARSE_FILE_TIMESTAMPLENGTH+1);
|
|
break;
|
|
}
|
|
case FILE_OPTIONS_STRLIST:
|
|
{
|
|
list= (List<LEX_STRING>*)(base + parameter->offset);
|
|
|
|
list->empty();
|
|
// list parsing
|
|
while (ptr < end)
|
|
{
|
|
if (!(str= (LEX_STRING*)alloc_root(mem_root,
|
|
sizeof(LEX_STRING))) ||
|
|
list->push_back(str, mem_root))
|
|
goto list_err;
|
|
if (!(ptr= parse_quoted_escaped_string(ptr, end, mem_root, str)))
|
|
goto list_err_w_message;
|
|
switch (*ptr) {
|
|
case '\n':
|
|
goto end_of_list;
|
|
case ' ':
|
|
// we cant go over buffer bounds, because we have \0 at the end
|
|
ptr++;
|
|
break;
|
|
default:
|
|
goto list_err_w_message;
|
|
}
|
|
}
|
|
|
|
end_of_list:
|
|
if (*(ptr++) != '\n')
|
|
goto list_err;
|
|
break;
|
|
|
|
list_err_w_message:
|
|
my_error(ER_FPARSER_ERROR_IN_PARAMETER, MYF(0),
|
|
parameter->name.str, line);
|
|
list_err:
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
case FILE_OPTIONS_ULLLIST:
|
|
if (get_file_options_ulllist(ptr, end, line, base,
|
|
parameter, mem_root))
|
|
DBUG_RETURN(TRUE);
|
|
break;
|
|
default:
|
|
DBUG_ASSERT(0); // never should happened
|
|
}
|
|
}
|
|
else
|
|
{
|
|
ptr= line;
|
|
if (hook->process_unknown_string(ptr, base, mem_root, end))
|
|
{
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
// skip unknown parameter
|
|
if (!(ptr= strchr(ptr, '\n')))
|
|
{
|
|
my_error(ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER, MYF(0), line);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
ptr++;
|
|
}
|
|
}
|
|
}
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/*
|
|
Dummy unknown key hook
|
|
|
|
SYNOPSIS
|
|
File_parser_dummy_hook::process_unknown_string()
|
|
unknown_key [in/out] reference on the line with unknown
|
|
parameter and the parsing point
|
|
base [in] base address for parameter writing (structure like
|
|
TABLE)
|
|
mem_root [in] MEM_ROOT for parameters allocation
|
|
end [in] the end of the configuration
|
|
|
|
NOTE
|
|
This hook used to catch no longer supported keys and process them for
|
|
backward compatibility, but it will not slow down processing of modern
|
|
format files.
|
|
This hook does nothing except debug output.
|
|
|
|
RETURN
|
|
FALSE OK
|
|
TRUE Error
|
|
*/
|
|
|
|
bool
|
|
File_parser_dummy_hook::process_unknown_string(char *&unknown_key,
|
|
gptr base, MEM_ROOT *mem_root,
|
|
char *end)
|
|
{
|
|
DBUG_ENTER("file_parser_dummy_hook::process_unknown_string");
|
|
DBUG_PRINT("info", ("Unknown key: '%60s'", unknown_key));
|
|
DBUG_RETURN(FALSE);
|
|
}
|