mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
Commit od last modifications made for version 10.0
This commit is contained in:
Olivier Bertrand
parent
1c756512b0
commit
7482f073ae
13 changed files with 21 additions and 319 deletions
6
.gitattributes
vendored
6
.gitattributes
vendored
|
|
@ -12,8 +12,10 @@
|
|||
|
||||
# Declare files that will always have LF line endings on checkout.
|
||||
*.result text eol=lf
|
||||
storage/connect/mysql-test/connect/std_data/*.txt text eol=lf
|
||||
storage/connect/mysql-test/connect/std_data/*.dat text eol=lf
|
||||
|
||||
# Denote the files that should not be modified.
|
||||
storage/connect/mysql-test/connect/std_data/*.txt binary
|
||||
storage/connect/mysql-test/connect/std_data/*.dat binary
|
||||
|
||||
# Denote all files that are truly binary and should not be modified.
|
||||
*.png binary
|
||||
|
|
|
|||
230
.gitignore
vendored
230
.gitignore
vendored
|
|
@ -10,226 +10,6 @@
|
|||
*.ninja
|
||||
.ninja_*
|
||||
.gdb_history
|
||||
errmsg.sys
|
||||
typescript
|
||||
CMakeCache.txt
|
||||
CMakeFiles/
|
||||
MakeFile
|
||||
cmake_install.cmake
|
||||
install_manifest.txt
|
||||
CPackConfig.cmake
|
||||
CPackSourceConfig.cmake
|
||||
CTestTestfile.cmake
|
||||
Docs/INFO_BIN
|
||||
Docs/INFO_SRC
|
||||
Makefile
|
||||
TAGS
|
||||
Testing/
|
||||
VERSION.dep
|
||||
configure
|
||||
client/async_example
|
||||
client/mysql
|
||||
client/mysql_plugin
|
||||
client/mysql_upgrade
|
||||
client/mysqladmin
|
||||
client/mysqlbinlog
|
||||
client/mysqlcheck
|
||||
client/mysqldump
|
||||
client/mysqlimport
|
||||
client/mysqlshow
|
||||
client/mysqlslap
|
||||
client/mysqltest
|
||||
cmake_install.cmake
|
||||
dbug/*.r
|
||||
dbug/factorial
|
||||
dbug/tests
|
||||
dbug/user.ps
|
||||
dbug/user.t
|
||||
extra/comp_err
|
||||
extra/innochecksum
|
||||
extra/jemalloc/build/
|
||||
extra/jemalloc/tmp/
|
||||
extra/my_print_defaults
|
||||
extra/mysql_waitpid
|
||||
extra/perror
|
||||
extra/replace
|
||||
extra/resolve_stack_dump
|
||||
extra/resolveip
|
||||
import_executables.cmake
|
||||
include/*.h.tmp
|
||||
include/config.h
|
||||
include/my_config.h
|
||||
include/mysql_version.h
|
||||
include/mysqld_ername.h
|
||||
include/mysqld_error.h
|
||||
include/sql_state.h
|
||||
info_macros.cmake
|
||||
libmysql*/libmysql*_exports_file.cc
|
||||
libmysql*/merge_archives_mysql*.cmake
|
||||
libmysql*/mysql*_depends.c
|
||||
libmysql/libmysql_versions.ld
|
||||
libmysqld/examples/mysql_client_test_embedded
|
||||
libmysqld/examples/mysql_embedded
|
||||
libmysqld/examples/mysqltest_embedded
|
||||
make_dist.cmake
|
||||
mariadb-*.*.*.tar.gz
|
||||
mariadb-*.*.*/
|
||||
mysql-test/lib/My/SafeProcess/my_safe_process
|
||||
mysql-test/mtr
|
||||
mysql-test/mysql-test-run
|
||||
mysql-test/var
|
||||
mysys/thr_lock
|
||||
mysys/thr_timer
|
||||
packaging/rpm-oel/mysql.spec
|
||||
packaging/rpm-uln/mysql.10.0.11.spec
|
||||
packaging/solaris/postinstall-solaris
|
||||
pcre/config.h
|
||||
pcre/pcre*test.sh
|
||||
pcre/pcre.h
|
||||
pcre/pcre_chartables.c
|
||||
pcre/pcregrep
|
||||
pcre/pcretest
|
||||
pcre/test*grep
|
||||
scripts/comp_sql
|
||||
scripts/make_binary_distribution
|
||||
scripts/msql2mysql
|
||||
scripts/mysql_config
|
||||
scripts/mysql_config.pl
|
||||
scripts/mysql_convert_table_format
|
||||
scripts/mysql_find_rows
|
||||
scripts/mysql_fix_extensions
|
||||
scripts/mysql_fix_privilege_tables.sql
|
||||
scripts/mysql_fix_privilege_tables_sql.c
|
||||
scripts/mysql_install_db
|
||||
scripts/mysql_secure_installation
|
||||
scripts/mysql_setpermission
|
||||
scripts/mysql_zap
|
||||
scripts/mysqlaccess
|
||||
scripts/mysqlbug
|
||||
scripts/mysqld_multi
|
||||
scripts/mysqld_safe
|
||||
scripts/mysqldumpslow
|
||||
scripts/mysqlhotcopy
|
||||
scripts/mytop
|
||||
scripts/wsrep_sst_common
|
||||
scripts/wsrep_sst_mysqldump
|
||||
scripts/wsrep_sst_rsync
|
||||
scripts/wsrep_sst_xtrabackup
|
||||
scripts/wsrep_sst_xtrabackup-v2
|
||||
sql-bench/bench-count-distinct
|
||||
sql-bench/bench-init.pl
|
||||
sql-bench/compare-results
|
||||
sql-bench/copy-db
|
||||
sql-bench/crash-me
|
||||
sql-bench/graph-compare-results
|
||||
sql-bench/innotest1
|
||||
sql-bench/innotest1a
|
||||
sql-bench/innotest1b
|
||||
sql-bench/innotest2
|
||||
sql-bench/innotest2a
|
||||
sql-bench/innotest2b
|
||||
sql-bench/run-all-tests
|
||||
sql-bench/server-cfg
|
||||
sql-bench/test-ATIS
|
||||
sql-bench/test-alter-table
|
||||
sql-bench/test-big-tables
|
||||
sql-bench/test-connect
|
||||
sql-bench/test-create
|
||||
sql-bench/test-insert
|
||||
sql-bench/test-select
|
||||
sql-bench/test-table-elimination
|
||||
sql-bench/test-transactions
|
||||
sql-bench/test-wisconsin
|
||||
sql/lex_token.h
|
||||
sql/gen_lex_token
|
||||
sql/gen_lex_hash
|
||||
sql/lex_hash.h
|
||||
sql/mysql_tzinfo_to_sql
|
||||
sql/mysqld
|
||||
sql/sql_builtin.cc
|
||||
sql/sql_yacc.cc
|
||||
sql/sql_yacc.h
|
||||
storage/heap/hp_test1
|
||||
storage/heap/hp_test2
|
||||
storage/maria/aria_chk
|
||||
storage/maria/aria_dump_log
|
||||
storage/maria/aria_ftdump
|
||||
storage/maria/aria_pack
|
||||
storage/maria/aria_read_log
|
||||
storage/maria/ma_rt_test
|
||||
storage/maria/ma_sp_test
|
||||
storage/maria/ma_test1
|
||||
storage/maria/ma_test2
|
||||
storage/maria/ma_test3
|
||||
storage/myisam/mi_test1
|
||||
storage/myisam/mi_test2
|
||||
storage/myisam/mi_test3
|
||||
storage/myisam/myisam_ftdump
|
||||
storage/myisam/myisamchk
|
||||
storage/myisam/myisamlog
|
||||
storage/myisam/myisampack
|
||||
storage/myisam/rt_test
|
||||
storage/myisam/sp_test
|
||||
storage/tokudb/ft-index/buildheader/db.h
|
||||
storage/tokudb/ft-index/buildheader/make_tdb
|
||||
storage/tokudb/ft-index/buildheader/runcat.sh
|
||||
storage/tokudb/ft-index/ft/log_code.cc
|
||||
storage/tokudb/ft-index/ft/log_header.h
|
||||
storage/tokudb/ft-index/ft/log_print.cc
|
||||
storage/tokudb/ft-index/ft/logformat
|
||||
storage/tokudb/ft-index/ft/ftverify
|
||||
storage/tokudb/ft-index/ft/tdb-recover
|
||||
storage/tokudb/ft-index/ft/tdb_logprint
|
||||
storage/tokudb/ft-index/ft/tokuftdump
|
||||
storage/tokudb/ft-index/portability/merge_archives_tokuportability_static.cmake
|
||||
storage/tokudb/ft-index/portability/toku_config.h
|
||||
storage/tokudb/ft-index/portability/tokuportability_static_depends.cc
|
||||
storage/tokudb/ft-index/src/merge_archives_tokufractaltree_static.cmake
|
||||
storage/tokudb/ft-index/src/tokufractaltree_static_depends.cc
|
||||
storage/tokudb/ft-index/toku_include/toku_config.h
|
||||
storage/tokudb/ft-index/tools/ba_replay
|
||||
storage/tokudb/ft-index/tools/ftverify
|
||||
storage/tokudb/ft-index/tools/tdb-recover
|
||||
storage/tokudb/ft-index/tools/tdb_logprint
|
||||
storage/tokudb/ft-index/tools/tokudb_dump
|
||||
storage/tokudb/ft-index/tools/tokudb_gen
|
||||
storage/tokudb/ft-index/tools/tokudb_load
|
||||
storage/tokudb/ft-index/tools/tokuftdump
|
||||
storage/tokudb/ft-index/xz/
|
||||
support-files/MySQL-shared-compat.spec
|
||||
support-files/binary-configure
|
||||
support-files/config.huge.ini
|
||||
support-files/config.medium.ini
|
||||
support-files/config.small.ini
|
||||
support-files/mariadb.pc
|
||||
support-files/my-huge.cnf
|
||||
support-files/my-innodb-heavy-4G.cnf
|
||||
support-files/my-large.cnf
|
||||
support-files/my-medium.cnf
|
||||
support-files/my-small.cnf
|
||||
support-files/mysql-log-rotate
|
||||
support-files/mysql.10.0.11.spec
|
||||
support-files/mysql.server
|
||||
support-files/mysql.spec
|
||||
support-files/mysqld_multi.server
|
||||
support-files/wsrep.cnf
|
||||
support-files/wsrep_notify
|
||||
tags
|
||||
tests/async_queries
|
||||
tests/bug25714
|
||||
tests/mysql_client_test
|
||||
storage/mroonga/config.sh
|
||||
storage/mroonga/mrn_version.h
|
||||
storage/mroonga/data/install.sql
|
||||
storage/mroonga/vendor/groonga/config.h
|
||||
storage/mroonga/vendor/groonga/config.sh
|
||||
storage/mroonga/vendor/groonga/groonga.pc
|
||||
storage/mroonga/vendor/groonga/src/grnslap
|
||||
storage/mroonga/vendor/groonga/src/groonga
|
||||
storage/mroonga/vendor/groonga/src/groonga-benchmark
|
||||
storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset
|
||||
storage/mroonga/mysql-test/mroonga/storage/r/information_schema_plugins.result
|
||||
storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
|
||||
# C and C++
|
||||
|
||||
# Compiled Object files
|
||||
|
|
@ -270,6 +50,11 @@ storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
|
|||
*.x86_64
|
||||
*.hex
|
||||
|
||||
# Cmake files
|
||||
*.stamp
|
||||
*.stamp.*
|
||||
*.rule
|
||||
*.cmake
|
||||
|
||||
## Ignore Visual Studio temporary files, build results, and
|
||||
## files generated by popular Visual Studio add-ons.
|
||||
|
|
@ -286,6 +71,10 @@ storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
|
|||
*.vcproj.*
|
||||
*.vcproj.*.*
|
||||
*.vcproj.*.*.*
|
||||
*.vcxproj
|
||||
*.vcxproj.*
|
||||
*.vcxproj.*.*
|
||||
*.vcxproj.*.*.*
|
||||
|
||||
# Build results
|
||||
[Dd]ebug/
|
||||
|
|
@ -462,3 +251,4 @@ UpgradeLog*.htm
|
|||
|
||||
# Microsoft Fakes
|
||||
FakesAssemblies/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,15 +297,9 @@ FIDBLK::FIDBLK(PCOLUMN cp, OPVAL op) : SPCBLK(cp), Op(op)
|
|||
Buf_Type = TYPE_STRING;
|
||||
*Format.Type = 'C';
|
||||
Format.Length = Long;
|
||||
<<<<<<< HEAD
|
||||
#if defined(__WIN__)
|
||||
Format.Prec = 1; // Case insensitive
|
||||
#endif // __WIN__
|
||||
=======
|
||||
#if defined(WIN32)
|
||||
Format.Prec = 1; // Case insensitive
|
||||
#endif // WIN32
|
||||
>>>>>>> ob-10.1
|
||||
Constant = (!((PTDBASE)To_Tdb)->GetDef()->GetMultiple() &&
|
||||
To_Tdb->GetAmType() != TYPE_AM_PLG &&
|
||||
To_Tdb->GetAmType() != TYPE_AM_PLM);
|
||||
|
|
|
|||
|
|
@ -239,9 +239,9 @@ PQRYRES DBFColumns(PGLOBAL g, char *dp, const char *fn, bool info)
|
|||
buftyp, fldtyp, length, true, false);
|
||||
|
||||
if (info || !qrp) {
|
||||
if (infile)
|
||||
if (infile)
|
||||
fclose(infile);
|
||||
|
||||
|
||||
return qrp;
|
||||
} // endif info
|
||||
|
||||
|
|
@ -498,7 +498,7 @@ bool DBFFAM::OpenTableFile(PGLOBAL g)
|
|||
if (!(Stream = PlugOpenFile(g, filename, opmode))) {
|
||||
if (trace)
|
||||
htrc("%s\n", g->Message);
|
||||
|
||||
|
||||
return (mode == MODE_READ && errno == ENOENT)
|
||||
? PushWarning(g, Tdbp) : true;
|
||||
} // endif Stream
|
||||
|
|
@ -585,7 +585,7 @@ bool DBFFAM::AllocateBuffer(PGLOBAL g)
|
|||
for (cdp = tdp->GetCols(); cdp; cdp = cdp->GetNext())
|
||||
if (!(cdp->Flags & U_SPECIAL)) {
|
||||
descp++;
|
||||
|
||||
|
||||
switch ((c = *GetFormatType(cdp->GetType()))) {
|
||||
case 'S': // Short integer
|
||||
case 'L': // Large (big) integer
|
||||
|
|
@ -602,7 +602,7 @@ bool DBFFAM::AllocateBuffer(PGLOBAL g)
|
|||
c, cdp->GetName());
|
||||
return true;
|
||||
} // endswitch c
|
||||
|
||||
|
||||
strncpy(descp->Name, cdp->GetName(), 11);
|
||||
descp->Type = c;
|
||||
descp->Length = (uchar)cdp->GetLong();
|
||||
|
|
@ -785,7 +785,7 @@ int DBFFAM::InitDelete(PGLOBAL g, int fpos, int spos)
|
|||
else if (fwrite(To_Buf, 1, lrecl, Stream) != lrecl)
|
||||
sprintf(g->Message, MSG(FWRITE_ERROR), strerror(errno));
|
||||
else
|
||||
rc = RC_NF; // Ok, Nothing else to do
|
||||
rc = RC_NF; // Ok, Nothing else to do
|
||||
|
||||
return rc;
|
||||
} // end of InitDelete
|
||||
|
|
@ -853,7 +853,7 @@ void DBFFAM::CloseTableFile(PGLOBAL g, bool abort)
|
|||
if (!Abort) {
|
||||
// Copy any remaining lines
|
||||
bool b;
|
||||
|
||||
|
||||
Fpos = Tdbp->Cardinality(g);
|
||||
Abort = MoveIntermediateLines(g, &b) != RC_OK;
|
||||
} // endif Abort
|
||||
|
|
|
|||
|
|
@ -106,11 +106,7 @@ class FILTERX : public FILTER {
|
|||
|
||||
// Fake operator new used to change a filter into a derived filter
|
||||
void * operator new(size_t, PFIL filp) {return filp;}
|
||||
<<<<<<< HEAD
|
||||
#if defined(__WIN__)
|
||||
=======
|
||||
#if defined(WIN32)
|
||||
>>>>>>> ob-10.1
|
||||
// Avoid warning C4291 by defining a matching dummy delete operator
|
||||
void operator delete(void *, PFIL) {}
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -169,22 +169,13 @@
|
|||
#define JSONMAX 10 // JSON Default max grp size
|
||||
|
||||
extern "C" {
|
||||
<<<<<<< HEAD
|
||||
char version[]= "Version 1.03.0007 June 03, 2015";
|
||||
#if defined(__WIN__)
|
||||
=======
|
||||
char version[]= "Version 1.03.0007 April 30, 2015";
|
||||
#if defined(WIN32)
|
||||
>>>>>>> ob-10.1
|
||||
char compver[]= "Version 1.03.0007 " __DATE__ " " __TIME__;
|
||||
char slash= '\\';
|
||||
#else // !__WIN__
|
||||
char slash= '/';
|
||||
<<<<<<< HEAD
|
||||
#endif // !__WIN__
|
||||
=======
|
||||
#endif // !WIN32
|
||||
>>>>>>> ob-10.1
|
||||
} // extern "C"
|
||||
|
||||
#if defined(XMAP)
|
||||
|
|
@ -204,14 +195,8 @@ extern "C" {
|
|||
/***********************************************************************/
|
||||
PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info);
|
||||
PQRYRES VirColumns(PGLOBAL g, bool info);
|
||||
<<<<<<< HEAD
|
||||
PQRYRES JSONColumns(PGLOBAL g, char *db, PTOS topt, bool info);
|
||||
PQRYRES XMLColumns(PGLOBAL g, char *db, char *tab, PTOS topt, bool info);
|
||||
=======
|
||||
PQRYRES JSONColumns(PGLOBAL g, char *dp, const char *fn, char *objn,
|
||||
int pretty, int lvl, int mxr, bool info);
|
||||
PQRYRES XMLColumns(PGLOBAL g, char *dp, char *tab, PTOS topt, bool info);
|
||||
>>>>>>> ob-10.1
|
||||
void PushWarning(PGLOBAL g, THD *thd, int level);
|
||||
bool CheckSelf(PGLOBAL g, TABLE_SHARE *s, const char *host,
|
||||
const char *db, char *tab, const char *src, int port);
|
||||
|
|
@ -5021,15 +5006,9 @@ static int connect_assisted_discovery(handlerton *, THD* thd,
|
|||
char *tab, *dsn, *shm, *dpath;
|
||||
#if defined(__WIN__)
|
||||
char *nsp= NULL, *cls= NULL;
|
||||
<<<<<<< HEAD
|
||||
#endif // __WIN__
|
||||
int port= 0, hdr= 0, mxr= 0, mxe= 0, rc= 0;
|
||||
int cop __attribute__((unused))= 0, lrecl= 0;
|
||||
=======
|
||||
#endif // WIN32
|
||||
int port= 0, hdr= 0, mxr= 0, mxe= 0, rc= 0, lvl= 0;
|
||||
int cop __attribute__((unused))= 0, pty= 2, lrecl= 0;
|
||||
>>>>>>> ob-10.1
|
||||
#if defined(ODBC_SUPPORT)
|
||||
POPARM sop = NULL;
|
||||
char *ucnc = NULL;
|
||||
|
|
|
|||
|
|
@ -23,11 +23,7 @@
|
|||
|
||||
#define ARGS MY_MIN(24,len-i),s+MY_MAX(i-3,0)
|
||||
|
||||
<<<<<<< HEAD
|
||||
#if defined(__WIN__)
|
||||
=======
|
||||
#if defined(WIN32)
|
||||
>>>>>>> ob-10.1
|
||||
#define EL "\r\n"
|
||||
#else
|
||||
#define EL "\n"
|
||||
|
|
@ -1163,7 +1159,4 @@ bool JVALUE::IsNull(void)
|
|||
{
|
||||
return (Jsp) ? Jsp->IsNull() : (Value) ? Value->IsZero() : true;
|
||||
} // end of IsNull
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> ob-10.1
|
||||
|
|
|
|||
|
|
@ -267,7 +267,4 @@ class JVALUE : public JSON {
|
|||
PJVAL Next; // Next value in array
|
||||
bool Del; // True when deleted
|
||||
}; // end of class JVALUE
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> ob-10.1
|
||||
|
|
|
|||
|
|
@ -410,11 +410,7 @@ void Json_Array_Add_deinit(UDF_INIT* initid)
|
|||
} // end of Json_Array_Add_deinit
|
||||
|
||||
/***********************************************************************/
|
||||
<<<<<<< HEAD
|
||||
/* Delete a value from a Json array. */
|
||||
=======
|
||||
/* Add values to a Json array. */
|
||||
>>>>>>> ob-10.1
|
||||
/***********************************************************************/
|
||||
my_bool Json_Array_Delete_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
|
||||
{
|
||||
|
|
@ -455,11 +451,7 @@ char *Json_Array_Delete(UDF_INIT *initid, UDF_ARGS *args, char *result,
|
|||
} else {
|
||||
n = *(int*)args->args[1];
|
||||
arp = jvp->GetArray();
|
||||
<<<<<<< HEAD
|
||||
arp->DeleteValue(n);
|
||||
=======
|
||||
arp->DeleteValue(n - 1);
|
||||
>>>>>>> ob-10.1
|
||||
arp->InitArray(g);
|
||||
|
||||
if (!(str = Serialize(g, arp, NULL, 0))) {
|
||||
|
|
|
|||
|
|
@ -21,15 +21,9 @@
|
|||
#include "msgid.h"
|
||||
#endif // NEWMSG
|
||||
|
||||
<<<<<<< HEAD
|
||||
#if !defined(__WIN__)
|
||||
#define stricmp strcasecmp
|
||||
#endif // !__WIN__
|
||||
=======
|
||||
#if !defined(WIN32)
|
||||
#define stricmp strcasecmp
|
||||
#endif // !WIN32
|
||||
>>>>>>> ob-10.1
|
||||
|
||||
char *msglang(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -1287,17 +1287,7 @@ PJSON JSONCOL::GetRow(PGLOBAL g)
|
|||
break;
|
||||
case TYPE_JAR:
|
||||
if (!Nodes[i].Key) {
|
||||
<<<<<<< HEAD
|
||||
arp = (PJAR)row;
|
||||
=======
|
||||
if (Nodes[i].Op != OP_NULL) {
|
||||
arp = (PJAR)row;
|
||||
|
||||
if (Nodes[i].Rank)
|
||||
val = arp->GetValue(Nodes[i].Rank - 1);
|
||||
else
|
||||
val = arp->GetValue(Nodes[i].Rx);
|
||||
>>>>>>> ob-10.1
|
||||
|
||||
if (Nodes[i].Op == OP_EQ)
|
||||
val = arp->GetValue(Nodes[i].Rank);
|
||||
|
|
|
|||
|
|
@ -117,11 +117,7 @@ PQRYRES XMLColumns(PGLOBAL g, char *db, char *tab, PTOS topt, bool info)
|
|||
static XFLD fldtyp[] = {FLD_NAME, FLD_TYPE, FLD_TYPENAME, FLD_PREC,
|
||||
FLD_LENGTH, FLD_SCALE, FLD_NULL, FLD_FORMAT};
|
||||
static unsigned int length[] = {0, 6, 8, 10, 10, 6, 6, 0};
|
||||
<<<<<<< HEAD
|
||||
char *fn, *op, colname[65], fmt[129], buf[512];
|
||||
=======
|
||||
char *op, colname[65], fmt[129], buf[512];
|
||||
>>>>>>> ob-10.1
|
||||
int i, j, lvl, n = 0;
|
||||
int ncol = sizeof(buftyp) / sizeof(int);
|
||||
bool ok = true;
|
||||
|
|
@ -438,11 +434,7 @@ XMLDEF::XMLDEF(void)
|
|||
/***********************************************************************/
|
||||
bool XMLDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
char *defrow, *defcol, buf[10];
|
||||
=======
|
||||
char *defrow, *defcol, buf[10];
|
||||
>>>>>>> ob-10.1
|
||||
|
||||
Fn = GetStringCatInfo(g, "Filename", NULL);
|
||||
Encoding = GetStringCatInfo(g, "Encoding", "UTF-8");
|
||||
|
|
@ -511,13 +503,8 @@ bool XMLDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
|
|||
Usedom = (toupper(*buf) == 'M' || toupper(*buf) == 'D');
|
||||
|
||||
// Get eventual table node attribute
|
||||
<<<<<<< HEAD
|
||||
Attrib = GetStringCatInfo(g, "Attribute", NULL);
|
||||
Hdattr = GetStringCatInfo(g, "HeadAttr", NULL);
|
||||
=======
|
||||
Attrib = GetStringCatInfo(g, "Attribute", "");
|
||||
Hdattr = GetStringCatInfo(g, "HeadAttr", "");
|
||||
>>>>>>> ob-10.1
|
||||
return false;
|
||||
} // end of DefineAM
|
||||
|
||||
|
|
@ -1271,11 +1258,7 @@ void TDBXML::CloseDB(PGLOBAL g)
|
|||
{
|
||||
if (Docp) {
|
||||
if (Changed) {
|
||||
<<<<<<< HEAD
|
||||
char filename[_MAX_PATH];
|
||||
=======
|
||||
char filename[_MAX_PATH];
|
||||
>>>>>>> ob-10.1
|
||||
|
||||
// We used the file name relative to recorded datapath
|
||||
PlugSetPath(filename, Xfile, GetPath());
|
||||
|
|
|
|||
|
|
@ -360,15 +360,7 @@ class DllExport DTVAL : public TYPVAL<int> {
|
|||
public:
|
||||
// Constructors
|
||||
DTVAL(PGLOBAL g, int n, int p, PSZ fmt);
|
||||
<<<<<<< HEAD
|
||||
DTVAL(int n);
|
||||
=======
|
||||
//DTVAL(PGLOBAL g, PSZ s, int n);
|
||||
//DTVAL(PGLOBAL g, short i);
|
||||
DTVAL(int n);
|
||||
//DTVAL(PGLOBAL g, longlong n);
|
||||
//DTVAL(PGLOBAL g, double f);
|
||||
>>>>>>> ob-10.1
|
||||
|
||||
// Implementation
|
||||
virtual bool SetValue_pval(PVAL valp, bool chktype);
|
||||
|
|
|
|||
Loading…
Reference in a new issue