Commit graph

77110 commits

Author SHA1 Message Date
Olivier Bertrand
cdf3606b38 - Begin fixing memory leaks
modified:
  storage/connect/connect.cc
  storage/connect/plugutil.c
2013-03-01 22:21:48 +01:00
Alexander Barkov
204a499731 Adding forgotten semicolon.
ODBC check did not work without it.


modified:
  mysql-test/suite/connect/t/odbc_xls.test
2013-03-01 13:00:42 +04:00
Olivier Bertrand
612b8c5500 - Fix warning on missing initial values on Linux
modified:
  storage/connect/connect.cc*
  storage/connect/value.cpp*
2013-03-01 00:41:04 +01:00
unknown
0a05caf29f - Fix memory leak
modified:
  storage/connect/connect.cc
  
- GCC requires template<> headers

modified:
  storage/connect/value.cpp
2013-03-01 00:29:48 +01:00
Olivier Bertrand
bf6c3f5133 - Second version of template value classes
The first one did not compile with GCC on Linux

modified:
  storage/connect/value.cpp
  storage/connect/value.h
2013-02-28 22:50:26 +01:00
Olivier Bertrand
812c1a7f6b - Modify the way value.h and valblk.h are included to try fixing
the gcc error: invalid use of incomplete type

modified:
  storage/connect/myconn.cpp
  storage/connect/xobject.h
2013-02-27 23:32:34 +01:00
Olivier Bertrand
7879632cea - Change Subclass name from TYPE to T
modified:
  storage/connect/value.h
2013-02-27 22:54:42 +01:00
Olivier Bertrand
7132c590ca - Fix a miscalculation of column length in ODBCTables
- Clean code in Value.h

modified:
  storage/connect/odbconn.cpp
  storage/connect/value.h
2013-02-27 22:42:50 +01:00
Olivier Bertrand
fa4aa616a1 - Rewriting the VALUE classes as template classes
modified:
  storage/connect/tabdos.cpp
  storage/connect/tabdos.h
  storage/connect/tabmysql.cpp
  storage/connect/tabodbc.cpp
  storage/connect/tabsys.cpp
  storage/connect/tabxml.cpp
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xobject.h
2013-02-27 16:42:59 +01:00
Olivier Bertrand
f2b8155abb - Result changed since nulls are supported
modified:
  mysql-test/suite/connect/r/odbc_xls.result
2013-02-27 14:59:40 +01:00
Alexander Barkov
3fd1e97a64 Removing the comment about NULLs
modified:
  mysql-test/suite/connect/t/mysql.test
2013-02-27 17:04:36 +04:00
Alexander Barkov
43ecae5ee8 Updating mysql.test, it now supports NULL columns.
modified:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test
2013-02-27 17:02:38 +04:00
Olivier Bertrand
edd161587e - Catalog table: Use XFLD as Flag value instead of column index.
- Use the COLDEF flag to initialize column nullable value.
- Fix a bug on inserting null values in MYSQL tables.

modified:
  storage/connect/colblk.cpp
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
  storage/connect/plgdbsem.h
  storage/connect/table.cpp
  storage/connect/tabmysql.cpp
2013-02-25 22:44:42 +01:00
Olivier Bertrand
2b60525d57 - Add support to NULL values. This concern the MYSQL
and ODBC table types. Not supported yet for indexes.

modified:
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/ha_connect.cc
  storage/connect/tabmysql.cpp
  storage/connect/tabodbc.cpp
  storage/connect/valblk.cpp
  storage/connect/valblk.h
  storage/connect/value.cpp
  storage/connect/value.h
  storage/connect/xindex.cpp
2013-02-24 01:23:18 +01:00
Olivier Bertrand
a769cb2fc5 - Add header files to source files
modified:
  storage/connect/CMakeLists.txt
2013-02-22 22:46:52 +01:00
Olivier Bertrand
0a280eb8bd - Commiting merges
Simplify update in pre_create

modified:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test
  mysql-test/suite/connect/t/xml.test
  storage/connect/CMakeLists.txt
  storage/connect/ha_connect.cc
  storage/connect/mycat.cc
2013-02-22 22:04:47 +01:00
Olivier Bertrand
553964dc70 - Suppress warning on non virtual descriptor
modified:
  storage/connect/CMakeLists.txt
2013-02-22 19:21:34 +01:00
Olivier Bertrand
ebc8a6ef0c - Fix connect string wrongly used when zero length
modified:
  storage/connect/tabmysql.cpp
2013-02-22 18:32:47 +01:00
Olivier Bertrand
b535cb9874 - Add the support of URL connection string fo MYSQL tables
Federated servers are not yet supported.

modified:
  storage/connect/ha_connect.cc
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
2013-02-22 17:26:08 +01:00
Alexander Barkov
aa92de5a70 Adding a reminder.
modified:
  storage/connect/CMakeLists.txt
2013-02-22 16:53:42 +04:00
Alexander Barkov
7d4df74b71 Adding a test for BIGINT.
modified:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test
2013-02-22 13:21:26 +04:00
Alexander Barkov
d899840afb - Adding tests for DBNAME=<unknown database name>.
- Fixing a bug that DBNAME value was forgotten when followed by OPTION_LIST.

modified:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test
  storage/connect/ha_connect.cc
2013-02-22 13:12:09 +04:00
Alexander Barkov
38210b1145 Skip test XML if no XML support is compiled.
modified:
  mysql-test/suite/connect/t/xml.test
  storage/connect/mycat.cc
2013-02-22 12:52:56 +04:00
Alexander Barkov
62fbaf96a0 Skip ODBC test if no ODBC is compiled.
modified:
  mysql-test/suite/connect/t/odbc_xls.test
2013-02-22 12:30:30 +04:00
Olivier Bertrand
24672d2db8 - Oops! db was no more initialized in pre-create. Fixed
modified:
  storage/connect/ha_connect.cc
  mysql-test/suite/connect/r/mysql.result  (merged)
  mysql-test/suite/connect/t/mysql.test    (merged)
2013-02-21 17:59:58 +01:00
Olivier Bertrand
183698b779 - Change DB_NAME option name to DBNAME. Temporarily, "database" is still
accepted in OPTION_LIST for compatibity but DB_NAME is no more recognized.

modified:
  storage/connect/ha_connect.cc
2013-02-21 17:48:35 +01:00
Alexander Barkov
d368a2f662 Suppress additional debug info printed in _DEBUG build
modified:
  mysql-test/suite/connect/t/mysql.test
2013-02-21 17:03:41 +04:00
Alexander Barkov
3db9803cdb Adding forgotten --replace_result for port number
modified:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test
2013-02-21 16:59:09 +04:00
Olivier Bertrand
9d7f134186 - Fix bad conversion from "bigint" to TYPE_FLOAT.
modified:
  storage/connect/myutil.cpp
2013-02-21 12:30:40 +01:00
Alexander Barkov
b0376d1e16 Adding tests for TABLE_TYPE=MySQL
added:
  mysql-test/suite/connect/r/mysql.result
  mysql-test/suite/connect/t/mysql.test
2013-02-21 13:49:47 +04:00
Alexander Barkov
c0f058871f Adding a test for entities
(special characters and characters outside of the file ENCODING)

modified:
  mysql-test/suite/connect/r/xml.result
  mysql-test/suite/connect/t/xml.test
2013-02-21 11:18:57 +04:00
Olivier Bertrand
9716acfcc3 - Re-install blank trimming to have the xml test pass.
Note that the problem if far more complex. To be revisited.

modified:
  storage/connect/libdoc.cpp
  storage/connect/tabxml.h
2013-02-20 23:23:35 +01:00
Olivier Bertrand
b63eb1d8b4 - Fix the elimination of control characters from node content
- Take care of XML special chars (<>& etc.)
- Remove Encode, Decode

modified:
  storage/connect/libdoc.cpp
  storage/connect/libdoc.h

- Neither libmysql.lib nor mysqlclient.lib needed for MYSQL table type

modified:
  storage/connect/CMakeLists.txt
2013-02-20 18:49:18 +01:00
Olivier Bertrand
26bf803c04 - Update the MYSQL table handling to use only client API functions.
It is no more necessary to be liked to libmysql.lib nor mysqlclient.lib.

modified:
  storage/connect/libdoc.cpp
  storage/connect/myconn.cpp
  storage/connect/myconn.h
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
2013-02-20 16:57:38 +01:00
Olivier Bertrand
818d0a5622 Suppress a warning on unused variable.
modified:
  storage/connect/reldef.cpp
2013-02-20 16:54:57 +01:00
Alexander Barkov
d0145eed7c Fixing test failure due to not strict order of the files.
Adding ORDER BY clause.

modified:
  mysql-test/suite/connect/r/dir.result
  mysql-test/suite/connect/t/dir.test
2013-02-20 18:27:04 +04:00
Alexander Barkov
d99d3da1d1 Removing the MODULE_ONLY option, to be able to run with valgrind.
(with MODULE_ONLY valgrind does not display file name and line number
if a problem happens inside a dlopen-ed plugin)

modified:
  storage/connect/CMakeLists.txt
2013-02-20 16:43:38 +04:00
Alexander Barkov
1e13640f4d Fixing problems with running tests caused by the fact that
"mysqld --connect" conflicts with "mysqld --connect-timeout".

(unfortunate design decision in how mysqld handles command line options).

modified:
  mysql-test/mysql-test-run.pl
  mysql-test/suite/connect/suite.opt
2013-02-20 16:34:07 +04:00
Alexander Barkov
ea0e250669 Fixing valgrind warning: uninitialized memory read.
modified:
  storage/connect/ha_connect.cc
2013-02-20 16:05:53 +04:00
Olivier Bertrand
1b7a907979 2013-02-20 01:40:17 +01:00
Olivier Bertrand
c448839c4f - Fix crash on making an XML table with encoding=XXX
- Set parameters so libxml2 does not anymore add extra characters
  when retrieving several subnodes of a node.
- Make a CONNECT file header (was PlugDB)

modified:
  storage/connect/domdoc.cpp
  storage/connect/libdoc.cpp
  storage/connect/tabxml.cpp

- Change the version number

modified:
  storage/connect/ha_connect.cc

- Begin eliminate use of libmysql functions in MYSQL table type
  Not finished yet

modified:
  storage/connect/myconn.cpp
  storage/connect/myconn.h
2013-02-20 01:30:37 +01:00
Vladislav Vaintroub
41013f16a0 MDEV-156 Threadpool - add thd_wait_begin/thd_wait_end to the network IO functions 2013-02-19 20:44:33 +01:00
Alexander Barkov
1483aebeaa Adding tests for DATA_CHARSET and TABLE_TYPE=CSV.
modified:
  mysql-test/suite/connect/r/csv.result
  mysql-test/suite/connect/t/csv.test
2013-02-19 16:25:59 +04:00
Olivier Bertrand
2f48842a0f Commit merged changes. 2013-02-19 12:07:11 +01:00
Alexander Barkov
29cd5363b9 Removing unused code.
modified:
  storage/connect/ha_connect.cc
2013-02-19 14:29:55 +04:00
Alexander Barkov
59e95fe6bb Cmake clean-ups:
- Removing -DMYSQL_DYNAMIC_PLUGIN. Its automatically
  added by MYSQL_ADD_PLUGIN
- Replacing "IF(!XXX)" to "IF(NOT XXX)". The former is a wrong cmake syntax.

modified:
  storage/connect/CMakeLists.txt
2013-02-19 13:53:24 +04:00
Alexander Barkov
df153bb56b Adding tests to check that TABLE_TYPE=XML creates the XML
file according to the ENCODING option.

modified:
  mysql-test/suite/connect/r/xml.result
  mysql-test/suite/connect/t/xml.test
2013-02-19 13:02:33 +04:00
Olivier Bertrand
c1f244610b Don't why bazaar asked me to commit what was merged 2013-02-18 18:46:50 +01:00
Alexander Barkov
f41aadfaed Adding DATA_CHARSET table option. 2013-02-18 19:21:52 +04:00
Olivier Bertrand
739632cbe0 Moved PushWarning out of HAVE_PSI_INTERFACE brackets
Modified:
ha_connect.cc
2013-02-18 12:23:50 +01:00