mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
178427 commits 2793 branches 343 tags 1.5 GiB
Commit graph

995 commits

Author SHA1 Message Date
Sergei Golubchik
d5a80519c9 Merge branch 'connect/10.1' into 10.1 2016-03-21 21:43:28 +01:00
Sergei Golubchik
3b0c7ac1f9 Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
Sergei Golubchik
a2de604309 ASAN error in CONNECT engine 
don't strcpy a string to itself
 2016-03-21 11:43:19 +01:00
Sergei Golubchik
a1782b4ab9 MDEV-9739 Assertion `m_status == DA_ERROR || m_status == DA_OK' failed in Diagnostics_area::message() ; connect.xml* tests fail in buildbot 2016-03-19 19:40:25 +01:00
Olivier Bertrand
c1efc4a4dd - Fix compile error when copying a string on itself. 
modified:   storage/connect/value.cpp

- Fix compile error of MDEV-9603
  modified:   storage/connect/tabmysql.cpp
 2016-03-19 12:13:36 +01:00
Olivier Bertrand
59c4675c6b - Fix compile error when copying a string on itself. 
modified:   storage/connect/value.cpp

- Fix compile error of MDEV-9603
  modified:   storage/connect/tabmysql.cpp
 2016-03-19 12:02:03 +01:00
Sergei Golubchik
3fdc6140a3 update plugins' maturity levels 2016-03-18 22:05:23 +01:00
Olivier Bertrand
b80b292117 - Fix crash when sorting a TBL table with thread=yes. 
This was because Tablist can be NULL when no lacal tables are in the list.
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/mysql-test/connect/r/tbl.result
  modified:   storage/connect/mysql-test/connect/t/tbl.test
 2016-03-17 00:08:00 +01:00
Olivier Bertrand
66890975eb - Fix crash when sorting a TBL table with thread=yes. 
This was because Tablist can be NULL when no lacal tables are in the list.
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/mysql-test/connect/r/tbl.result
  modified:   storage/connect/mysql-test/connect/t/tbl.test
 2016-03-16 23:56:43 +01:00
Olivier Bertrand
fb9e2fa33f - Fix MDEV-9603 compiler error. 
modified:   storage/connect/tabmysql.cpp

- Test invalid CSV separator when creating the table (MDEV-9714)
  modified:   storage/connect/ha_connect.cc

- Stop using SQLDescribeParam anymore
  modified:   storage/connect/odbconn.cpp

- Fix MDEV-9723 Regression due to calling Cardinality instead of
  GetMaxSize in info.
  modified:   storage/connect/tabtbl.h
  modified:   storage/connect/mysql-test/connect/r/tbl.result
  modified:   storage/connect/mysql-test/connect/t/tbl.test

- Typo
  modified:   storage/connect/tabodbc.cpp
 2016-03-16 19:17:55 +01:00
Olivier Bertrand
7829cefa41 - Fix MDEV-9603 compiler error. 
modified:   storage/connect/tabmysql.cpp

- Test invalid CSV separator when creating the table (MDEV-9714)
  modified:   storage/connect/ha_connect.cc

- Stop using SQLDescribeParam anymore
  modified:   storage/connect/odbconn.cpp

- Fix MDEV-9723 Regression due to calling Cardinality instead of
  GetMaxSize in info.
  modified:   storage/connect/tabtbl.h
  modified:   storage/connect/mysql-test/connect/r/tbl.result
  modified:   storage/connect/mysql-test/connect/t/tbl.test

- Typo
  modified:   storage/connect/tabodbc.cpp
 2016-03-16 18:53:56 +01:00
Otto Kekäläinen
1777fd5f55 Fix spelling: occurred, execute, which etc 2016-03-04 02:09:37 +02:00
Sergei Golubchik
00d1db7a38 Merge branch '10.1' into 10.2 2016-02-25 18:19:55 +01:00
Sergei Golubchik
88576b3a80 Merge tracking branch 'connect/10.1' into 10.1 2016-02-23 22:16:35 +01:00
Sergei Golubchik
a5679af1b1 Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
Olivier Bertrand
02fa3b8eea - Fix to MDEV-9579 be testing for void result. 
modified:   storage/connect/tabodbc.cpp
 2016-02-20 01:02:48 +01:00
Olivier Bertrand
69042ffe4e - Fix to MDEV-9579 be testing for void result. 
modified:   storage/connect/tabodbc.cpp
 2016-02-20 00:22:16 +01:00
Sergei Golubchik
5f2f3c4fa8 connect engine compiler warnings 2016-02-18 09:22:41 +01:00
Sergei Golubchik
77b548484e Merge branch 'connect/10.0' into 10.0 2016-02-16 19:35:58 +01:00
Olivier Bertrand
481e6433f4 - Fix to MDEV-9542 Connect was not handling NULLs in the answer 
from catalog functions and tables. It does now and when decimal
  is NULL defines DOUBLE without parameters.
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mysql-test/connect/r/odbc.result
  modified:   storage/connect/mysql-test/connect/r/odbc_oracle.result
  modified:   storage/connect/mysql-test/connect/r/odbc_postgresql.result
  modified:   storage/connect/mysql-test/connect/r/odbc_sqlite3.result
  modified:   storage/connect/mysql-test/connect/r/odbc_xls.result
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/table.cpp
  modified:   storage/connect/valblk.h
 2016-02-15 23:41:59 +01:00
Olivier Bertrand
d163ad338d - Fix to MDEV-9542 Connect was not handling NULLs in the answer 
from catalog functions and tables. It does now and when decimal
  is NULL defines DOUBLE without parameters.
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mysql-test/connect/r/odbc.result
  modified:   storage/connect/mysql-test/connect/r/odbc_oracle.result
  modified:   storage/connect/mysql-test/connect/r/odbc_postgresql.result
  modified:   storage/connect/mysql-test/connect/r/odbc_sqlite3.result
  modified:   storage/connect/mysql-test/connect/r/odbc_xls.result
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/table.cpp
  modified:   storage/connect/valblk.h
 2016-02-15 10:32:30 +01:00
Monty
b2f8d7b410 Merge branch '10.1' into 10.2 
Conflicts:
	VERSION
	cmake/plugin.cmake
	config.h.cmake
	configure.cmake
	plugin/server_audit/server_audit.c
	sql/sql_yacc.yy
 2016-02-06 18:14:54 +02:00
Sergei Golubchik
71b39066d4 after merge fixes 
fix compiler warnings
 2016-01-25 22:59:52 +01:00
Sergei Golubchik
44dea7ffbf Merge branch 'connect/10.1' into 10.1 2016-01-25 22:59:41 +01:00
Sergei Golubchik
f4faac4d6a Merge branch '10.0' into 10.1 2016-01-25 22:58:57 +01:00
Olivier Bertrand
62a5e56c01 - Change SQL_NTS to 0 when the string is NULL 
modified:   storage/connect/odbconn.cpp

- Fix to MDEV-9446 (using Json UDFs when CONNECT is not installed)
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/jsonudf.h
  modified:   storage/connect/mysql-test/connect/r/json_udf.result
  modified:   storage/connect/mysql-test/connect/t/json_udf.inc
  modified:   storage/connect/mysql-test/connect/t/json_udf.test
  modified:   storage/connect/mysql-test/connect/t/json_udf2.inc
 2016-01-25 18:44:51 +01:00
Olivier Bertrand
8fb34ea8c1 - Fix to MDEV-9446 (using Json UDFs when CONNECT is not installed) 
modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/jsonudf.h
  modified:   storage/connect/mysql-test/connect/r/json_udf.result
  modified:   storage/connect/mysql-test/connect/t/json_udf.inc
  modified:   storage/connect/mysql-test/connect/t/json_udf.test
  modified:   storage/connect/mysql-test/connect/t/json_udf2.inc
 2016-01-25 14:10:09 +01:00
Olivier Bertrand
ddd62ba24a - Change SQL_NTS to 0 when the string is NULL 
modified:   storage/connect/odbconn.cpp
 2016-01-18 23:00:40 +01:00
Olivier Bertrand
0891ae2fbb - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB Schema 
(was sometimes in XTAB Catalog)
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/mycat.h
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/reldef.h
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/tabpivot.cpp
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabutil.cpp
 2016-01-09 20:52:17 +01:00
Olivier Bertrand
3e20a0d8f4 - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB Schema 
(was sometimes in XTAB Catalog)
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/mycat.h
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/reldef.h
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/tabpivot.cpp
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabutil.cpp
 2016-01-09 19:51:51 +01:00
Monty
4b4777ab63 Backported fix for ccache 
Fixed compiler warnings
Added --big-test to tokudb change_column_char & change_column_bin
 2016-01-03 12:48:55 +02:00
Alexander Barkov
2ba7ed77aa Merge remote-tracking branch 'origin/10.1' into 10.2 2015-12-29 19:37:11 +04:00
Olivier Bertrand
6883e5c4c4 - Fix MDEV-9322. 
modified:   storage/connect/json.cpp
 2015-12-27 19:45:51 +01:00
Olivier Bertrand
3e76d54b98 - Fix MDEV-9322. 
modified:   storage/connect/json.cpp
 2015-12-27 19:37:28 +01:00
Sergei Golubchik
752349d8af update disabled.def for connect engine 2015-12-21 21:24:46 +01:00
Sergei Golubchik
a2bcee626d Merge branch '10.0' into 10.1 2015-12-21 21:24:22 +01:00
Sergei Golubchik
1788bfe93a Merge branch 'connect/10.1' into 10.1 2015-12-21 14:36:24 +01:00
Olivier Bertrand
e57876eacf - Fix MDEV-9279. Replacing exit(1) in yy_fatal_error by a longjmp. 
modified:   storage/connect/fmdlex.c
  modified:   storage/connect/plgdbutl.cpp
 2015-12-14 23:49:17 +01:00
Olivier Bertrand
11c339f432 - Fix MDEV-9279. Replacing exit(1) in yy_fatal_error by a longjmp. 
modified:   storage/connect/fmdlex.c
  modified:   storage/connect/plgdbutl.cpp
 2015-12-14 23:45:23 +01:00
Sergei Golubchik
6b4cc43f17 Merge branch 'connect/10.0' into 10.0 2015-12-13 23:52:43 +01:00
Olivier Bertrand
2ce0043bf3 - Copy error message from G to g when using temporary storage for parsing. 
modified:   storage/connect/tabjson.cpp
 2015-12-13 18:43:37 +01:00
Olivier Bertrand
8286b680b2 - Copy error message from G to g when using temporary storage for parsing. 
modified:   storage/connect/tabjson.cpp
 2015-12-13 18:39:32 +01:00
Olivier Bertrand
673cc06598 Merge branch 'ob-10.1' into 10.1 2015-12-11 19:19:21 +01:00
Olivier Bertrand
32879b9580 Update version number 2015-12-11 18:43:54 +01:00
Olivier Bertrand
541d36f761 Update version number 2015-12-11 18:29:03 +01:00
Olivier Bertrand
32393e2253 Merge branch 'ob-10.1' into 10.1 2015-12-09 00:02:04 +01:00
Olivier Bertrand
a18a3fbdd1 - Serialize: Protect again eventual longjmp's. 
Always return NULL on error.
Adding also the file length.
  modified:   storage/connect/json.cpp
  modified:   storage/connect/jsonudf.cpp

- JSONCOL::WriteColumn Add types SHORT and BIGINT as accepted
  modified:   storage/connect/tabjson.cpp

- TDBJSN: Make this type use a separate storage for Json parsing
and retrieve this memory between each rows. This is necessary
to be able to handle big tables. See MDEV-9228.
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h
 2015-12-09 00:00:08 +01:00
Olivier Bertrand
8ba013a258 - Serialize: Protect again eventual longjmp's. 
Always return NULL on error.
Adding also the file length.
  modified:   storage/connect/json.cpp
  modified:   storage/connect/jsonudf.cpp

- JSONCOL::WriteColumn Add types SHORT and BIGINT as accepted
  modified:   storage/connect/tabjson.cpp

- TDBJSN: Make this type use a separate storage for Json parsing
and retrieve this memory between each rows. This is necessary
to be able to handle big tables. See MDEV-9228.
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h
 2015-12-08 16:39:13 +01:00
Olivier Bertrand
d059dd7368 Fix memory error when a plain string argument is parsed. 
Parsing memory, not added in CalcLen, is added in CheckMemory.
Adding also the file length.
  modified:   storage/connect/jsonudf.cpp
 2015-12-05 21:04:02 +01:00
Olivier Bertrand
1ad5a8dfb7 Fix memory error when a plain string argument is parsed. 
Parsing memory, not added in CalcLen, is added in CheckMemory.
Adding also the file length.
  modified:   storage/connect/jsonudf.cpp
 2015-12-05 20:51:40 +01:00