mariadb

Tree: 739632cbe0

Author	SHA1	Message	Date
Olivier Bertrand	739632cbe0	Moved PushWarning out of HAVE_PSI_INTERFACE brackets Modified: ha_connect.cc	13 years ago
Olivier Bertrand	33b2c6fe7b	Fixed a bug in ha_connect::GetListOption causing a crash when passed a NULL oplist argument. Modified: ha_connect.cc	13 years ago
Olivier Bertrand	f83588a0f9	Implementing pre_create option test and setting of default values. Currently, only TABLE_TYPE is tested, and if wrong or unspecified, is replaced by the default value DOS. - Test on type was moved from create to pre_create - pre_create is now called unconditionally and must return true on error and false otherwise. - Warnings are produced if the table type was changed. - The errors have specific error messages (instead of being warnings with an error message telling that a table must have columns) Modified: ha_connect.cc ha_connect.h handler.h sql_table.cc	13 years ago
Alexander Barkov	3a91f1a998	Code reorganization in the initialization and clean-up code. - Getting rid of some duplicate code in the Windows and Linux sections - Moving the initializationa and clean-up code to connect_init_func() and connect_done_func(). This allows to use services provided by mysqld, for example my_snprintf(), which do not work in "__attribute__((constructor))init()". - Removing the "__attribute__((constructor)) init()" and "__attribute__((destructor)) fini()" functions - Using MariaDB's my_getpw() instead of different calls for Windows and Linux. - Fixing a potentially wrong memory write in strcat() when creating the full connect.ini file name. strcat() can go outside of the buffer size when directory name is long enough. Using safe my_snprintf() instead. modified: storage/connect/ha_connect.cc	13 years ago
Olivier Bertrand	3f2d762aa8		13 years ago
Olivier Bertrand	15470f5d12	Warning message changed in ha_connect::check_if_incompatible_data. Modified: ha_connect.cc	13 years ago
Olivier Bertrand	481916ffda	Update ha_connect::pre_create to restore the code translating of SQL types previously done in the removed function MyODBCCols. Modified: ha_connect.cc	13 years ago
Olivier Bertrand	c523370389	Fix bug on readonly table option not recognized in TABDEF::Define line 104 Modified: reldef.cpp Add a warning on alter in check_if_incompatible_data. Modified: ha_connect.cc	13 years ago
Olivier Bertrand	5fc2a7dadd	Add a test on table types in ha_connect::create - The plan was to provide a default type (DOS) when the table type was unspecified, wring, or not supported. - However, this is not possible here because create is called after the FRM file was generated. - Currently, this is flagged as an error and the create aborts. Modified: ha_connect.cc	13 years ago
Olivier Bertrand	83b7fb0f47	Fix a bug causing all tests to fail. In mycat.cc line 308 + correc typo in plgdbsem Modified: mycat.cc plgdbsem.h	13 years ago
Olivier Bertrand	88c76f3b70	All use of a character to represent table types or catalog functions have been changed: Table_types are now internally represented be enum TABTYPE. Catalog function names are internally translated to a uint. The function GetTypeID was modified accordingly and a new function GetFuncID was implemented in mycat.cc. Modified: ha_connect.cc odbccat.h odbconn.cpp tabodbc.cpp tabfmt.cpp tabmysql.h tabmysql.cpp tabwmi.cpp mycat.h mycat.cc plgdbsem.h reldef.h tabdos.cpp rcmsg.h	13 years ago
Alexander Barkov	b91386c2f6	Changing maximum possible column length for DBF tables from 11 to 10. There is actually one extra byte for the 11th character, however it seems to be meant for the '\0' terminating byte in the DBF specifications. Also, the third party software (e.g. OpenOffice) do not correctly open tables with column length=11. modified: mysql-test/suite/connect/r/dbf.result mysql-test/suite/connect/t/dbf.test storage/connect/ha_connect.cc	13 years ago
Alexander Barkov	ebf2da0045	Fixing compilation problems on Unix: 1. Conflicting declarations: In file included from /usr/include/sql.h:19:0, from <path>/storage/connect/odbconn.h:15, from <path>/storage/connect/ha_connect.cc:117: /usr/include/sqltypes.h:98:23: error: conflicting declaration ‘typedef unsigned int DWORD’ os.h and unixODBC's sqltypes.h (included from sql.h) have conflicting declarations, because unixODBC for some reasons incorrectly defines DWORD as "unsigned int", while we define DWORD as "unsigned long" (which is the Microsoft way). We should never include os.h and odbconn.h from the same file. Inside tabodbc.cpp DWORD must be seen as sql.h defines it. In all other files DWORD must be seen as os.h defines it. Fix: Moving ODBC catalog function prototypes into a separate file odbccat.h. Fixing ha_connect.cc to include odbccat.h instead of odbcon.h 2. Use of ambiguous overloaded function in myconn.cpp: There's no a method SetValue(const char fmt, int i); There's only a method SetValue(char fmt, int i); Fixing the call accordingly: - crp->Kdata->SetValue((fmt) ? fmt : "", i); + crp->Kdata->SetValue((fmt) ? fmt : (char) "", i); Note, this is a quick hack. The correct fix would be to change the method prototype to have the "fmt" argument as "const char ". However, it is tightly related to about 300 other places where "char" is used instead of "const char ". We'll need to fix all of them gradually (in separate changes). added: storage/connect/odbccat.h modified: storage/connect/ha_connect.cc storage/connect/myconn.cpp storage/connect/odbconn.h storage/connect/tabodbc.cpp	13 years ago
Olivier Bertrand	f6ca3b05f2	Bug fixed: Column charset were not handled on read. Modified: ha_connect.cc (MakeRecord) Moved PlgAllocResult to plgdbutl.cpp Modified: mycat.cpp plgdbutl.cpp Continuing implementing the "catalog" tables (ex "info"). Already existing were the ODBC data source table and the WMI column info table. The common way to handle them was modified to enable each table types to send personalized data. Now takes care of all existing catalog functions for table types that can retrieve and use such information. Modified: ha_connect.cc odbconn.cpp tabodbc.h tabodbc.cpp tabfmt.h tabfmt.cpp tabmysql.h tabmysql.cpp tabwmi.h tabwmi.cpp myconn.h myconn.cpp filamdbf.cpp plgdbsem.h reldef.h reldef.cpp tabdos.h tabdos.cpp tabfix.h xtable.h table.cpp	13 years ago
Olivier Bertrand	82e746ea1b	Put almost all function prototypes in header files that are included by the program using them. Continuing implementing the "catalog" tables (ex "info"). Already existing were the ODBC data source table and the WMI column info table. A common way to handle them will permit to develop many other such tables. Implemented: The ODBC column catalog table. The ODBC tables catalog table. The ODBC drivers catalog table. The INFO table option is replaced by the CATFUNC string option whode first letter specifies the information to retrieve: C: Columns (of a table) T: Tables (of a database) S: Data sources D: Drivers Modified: ha_connect.cc odbconn.cpp odbconn.h tabodbc.h tabodbc.cpp rcmsg.c tabfmt.h tabmysql.cpp tabwmi.cpp tabwmi.h resource.h myconn.h filamdbf.h connect.cc connect.h Added: myutil.h	13 years ago
Olivier Bertrand	ec2112f32d	1) Fix bug on strange sprintf 2) Fix bug on bad sprintf 3) Fix bug on cast from pointer to int 4) Begin implementing the "info" tables. Already existing were the ODBC sata source table and the WMI column info table. A common way to handle them will permit to develop many other such tables. Implemented: The ODBC column info table. Modified: ha_connect.cc (4) odbconn.cpp (4) tabodbc.h (4) tabodbc.cpp (4) tabsys.h (3) rcmsg.c (4) tabfmt.cpp (2) tabtbl.cpp (1) resource.h (4) mycat.h (4)	13 years ago
Olivier Bertrand	38edf74a3c	1) Fix bug on strange sprintf 2) Fix bug on bad sprintf 3) Fix bug on cast from pointer to int 4) Begin implementing the "info" tables. Already existing were the ODBC sata source table and the WMI column info table. A common way to handle them will permit to develop many other such tables. Implemented: The ODBC column info table. Modified: ha_connect.cc (4) odbconn.cpp (4) tabodbc.h (4) tabodbc.cpp (4) tabsys.h (3) rcmsg.c (4) tabfmt.cpp (2) tabtbl.cpp (1) resource.h (4) mycat.h (4)	13 years ago
Alexander Barkov	494ef9d073	Fixing compilation problems on Windows (due to the previous commit). modified: storage/connect/ha_connect.cc	13 years ago
Alexander Barkov	f8f79d9334	Fixing wrong sprintf() calls. modified: storage/connect/filamap.cpp storage/connect/filamdbf.cpp storage/connect/filamfix.cpp storage/connect/filamtxt.cpp storage/connect/filamvct.cpp storage/connect/ha_connect.cc storage/connect/osutil.c storage/connect/plgdbutl.cpp storage/connect/plugutil.c storage/connect/tabfix.cpp storage/connect/tabxml.cpp storage/connect/user_connect.cc storage/connect/value.cpp storage/connect/xindex.cpp	13 years ago
Alexander Barkov	40398f3660	Fixing some of the compilation warnings.	13 years ago
Alexander Barkov	30c4b0ebc2	- Fixing TAB to 2 spaces - Fixing line endings from "\r\n" to "\n"	13 years ago
Olivier Bertrand	1830e732fb	Make possible to get ODBC DataSources name and description by: create table datasrc ( `anyname` varchar(256) flag=1, `anyother name` varchar(256) flag=2) engine=CONNECT table_type=ODBC option_list='info=yes'; or simply by: create table datasrc engine=CONNECT table_type=ODBC option_list='info=yes'; then: select * from datasrc; Modified: ha_connect.cc odbconn.h odbconn.cpp tabodbc.h tabodbc.cpp	13 years ago
Alexander Barkov	dc6e20bda4	Fixing my_charset_utf8_bin to my_charset_utf8_general_ci. The formed required strings.lib in Windows. The latter is an exported symbol from mysqld and does not need strings.lib. modified: storage/connect/ha_connect.cc storage/connect/libdoc.cpp	13 years ago
Olivier Bertrand	e89cb7f27a	Translate column names to UTF-8 in ha_connect::pre_create.	13 years ago
Olivier Bertrand	9ca150aa2c	2>libdoc.cpp 2>D:\CommonSource\mariadb-10.0\include\my_pthread.h(120) : warning C4005: '_REENTRANT' : redéfinition de macro 2> D:\Libxml\include\libxml/xmlexports.h(77) : voir la définition précédente de '_REENTRANT' 2>.\libdoc.cpp(378) : error C2664: 'strlen' : impossible de convertir le paramètre 1 de 'xmlChar ' en 'const char ' 2> Les types pointés n'ont aucun rapport entre eux ; conversion nécessitant reinterpret_cast, cast de style C ou cast de style fonction 2>.\libdoc.cpp(379) : error C2664: 'copy_and_convert' : impossible de convertir le paramètre 4 de 'xmlChar ' en 'const char ' 2> Les types pointés n'ont aucun rapport entre eux ; conversion nécessitant reinterpret_cast, cast de style C ou cast de style fonction 2> Fix for that.	13 years ago
Alexander Barkov	dde8622c20	More XML related definitions are now more friendly: - LIBXML2_SUPPORT is defined if LibXml2 is found - DOMDOC_SUPPORT is defined if msxml is found - XML_SUPPORT is defined if either of them are found NOXML2 was removed modified: storage/connect/CMakeLists.txt storage/connect/global.h storage/connect/ha_connect.cc storage/connect/plgdbutl.cpp storage/connect/plgxml.cpp	13 years ago
Alexander Barkov	f09ae60d30	Fixing to use my_interval_timer() instead of ftime(). The later is not portable (e.g. it does not exist on FreeBSD) modified: storage/connect/ha_connect.cc storage/connect/user_connect.cc storage/connect/user_connect.h	13 years ago
Alexander Barkov	3d8ef8bf2f	ftime does not exist on FreeBSD. Hiding calls for ftime() as a temporary fix. This code should be modified to use my_time_microseconds() instead.	13 years ago
Olivier Bertrand	627d046df5	DBF type N is now BIGINT when length is > 10. Fix ha_connect::external_lock to use F_RDLCK, F_WRLCK, F_UNLCK.	13 years ago
Olivier Bertrand	ba82edd41e	Fix problems with ODBC raised by Adding the type TYPE_BIGINT (longlong).	13 years ago
Olivier Bertrand	6ec8f00ae3	Added to CONNECT the missing type TYPE_BIGINT (longlong).	13 years ago
Alexander Barkov	a8f0f93a2a	A Changeset from Olivier: Added some #if define(... for WIN32, ODBC and MYSQL in case they not defined. modified: storage/connect/ha_connect.cc	13 years ago
Alexander Barkov	37465ea2fe	Adding an Olivier's changeset: pre_create function and one is now able to create table without giving the column specifications for tables of types: DBF, ODBC, MYSQL, CSV, and WMI (on Windows) modified: sql/handler.h sql/sql_table.cc storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/mycat.cc storage/connect/odbconn.cpp storage/connect/plgcnx.h storage/connect/tabfmt.cpp storage/connect/tabmysql.cpp storage/connect/tabwmi.cpp	13 years ago
Alexander Barkov	d7143a4160	Adding the CONNECT storage engine sources.	13 years ago

35 Commits (739632cbe0780b385d0f6a3a99c1e79fa4ca805d)