Sergei Golubchik
f57ecb7786
5.5 merge
2013-04-14 10:04:07 +02:00
Olivier Bertrand
96f55d4684
- Fix use of s->db_plugin in GetSubTable for release versions
...
modified:
storage/connect/tabtbl.cpp
2013-04-13 00:37:24 +02:00
Olivier Bertrand
8cf33505f1
- Extend the TBL type to support sub-tables of any engines. Not CONNECT
...
sub-tables are accessed via the MySQL API like the MYSQL CONNECT tables.
modified:
mysql-test/suite/connect/r/tbl.result
mysql-test/suite/connect/t/tbl.test
storage/connect/catalog.h
storage/connect/ha_connect.cc
storage/connect/mycat.cc
storage/connect/mycat.h
storage/connect/tabmysql.h
storage/connect/tabtbl.cpp
2013-04-12 18:30:15 +02:00
Olivier Bertrand
1357bffbf3
- Add support of NULLs for file table columns.
...
Update CONNECT version number and date.
modified:
mysql-test/suite/connect/r/null.result
mysql-test/suite/connect/r/xml.result
mysql-test/suite/connect/t/null.test
storage/connect/ha_connect.cc
storage/connect/mycat.cc
storage/connect/tabdos.cpp
storage/connect/tabfix.cpp
storage/connect/tabfmt.cpp
storage/connect/tabtbl.cpp
storage/connect/tabvct.cpp
2013-04-10 23:38:27 +02:00
Olivier Bertrand
9b790248c5
- Add routine to test index equality
...
modified:
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/xindex.h
2013-04-10 14:24:28 +02:00
Sergei Golubchik
3ed6b24d82
Linking problem on Windows
2013-04-10 07:25:13 +02:00
Sergei Golubchik
775e82638b
put status variables in the proper pluginname_ scope
...
(but support the scopeless mysql style too).
always output status/system variables in the correct lettercase
2013-04-09 23:27:33 +02:00
Sergei Golubchik
5f293dd694
MDEV-4022 table attributes with sysvar as a default value
2013-04-09 23:27:24 +02:00
Sergei Golubchik
3ad01d00f2
error messages: name the storage engine explicitly,
...
instead of "used storage engine" and similar changes.
2013-04-09 23:27:07 +02:00
Olivier Bertrand
6be6b4ab76
- All the processing of creating, dropping, modifying indexes was redesigned.
...
The code was a legacy from the first versions of the XDB engine dating 2004
and was not working anymore with recent versions of MySQL/MariaDB. A patch
in create had been added but is was unsatisfying, recreating all indexes on
any alter statement and sometimes doing nothing when it should have.
This is a major update to be tested for stability. It was in most important
cases et all current tests pass with this new version
modified:
storage/connect/global.h
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/mycat.cc
storage/connect/plugutil.c
storage/connect/tabdos.cpp
storage/connect/user_connect.cc
storage/connect/user_connect.h
storage/connect/xindex.h
2013-04-09 23:14:45 +02:00
Sergei Golubchik
ffbd15eb32
post-review comments and other minor edits
2013-04-09 16:20:59 +02:00
Sergei Golubchik
3a8e1a2205
mysql-test fixes
2013-04-09 16:19:22 +02:00
Sergei Golubchik
ee92b2114d
assisted discovery in federatedx
2013-04-09 16:19:18 +02:00
Sergei Golubchik
60aed41222
fix internal plugin names
2013-04-09 16:19:10 +02:00
Sergei Golubchik
9c089b04b3
TABLE_SHARE::free_frm_image() method to free the memory
...
allocated by the same allocator as in TABLE_SHARE::read_frm_image()
2013-04-09 16:18:51 +02:00
Sergei Golubchik
02c712aa54
* frm extra2 segment.
...
* persistent table versions in the extra2
* ha_archive::frm_compare using TABLE_SHARE::tabledef_version
* distinguish between "important" and "optional" extra2 frm values
* write engine-defined attributes (aka "table options") to extra2, not to extra,
but still read from the old location, if they're found there.
2013-04-09 16:18:33 +02:00
Sergei Golubchik
13b7bcd5d4
sequence engine
2013-04-09 16:17:16 +02:00
Sergei Golubchik
2d788ff5ca
test_sql_discovery storage engine
...
use it to test main test cases with need_full_discover_for_existence > 0
2013-04-09 16:07:35 +02:00
Sergei Golubchik
4853c7192d
discovery using sql CREATE TABLE statement
2013-04-09 16:07:17 +02:00
Sergei Golubchik
e06cb31719
CREATE TABLE and frm-less discovering engines.
...
Now CREATE TABLE does not write the frm file on disk,
if the engine can discover it
2013-04-09 15:57:09 +02:00
Sergei Golubchik
f597a6a694
HA_ERR_TABLE_DEF_CHANGED support in ha_archive
2013-04-09 15:50:55 +02:00
Sergei Golubchik
2481db063f
move writing of the frm into init_from_binary_frm_image()
2013-04-09 15:49:21 +02:00
Sergei Golubchik
5d364e53cb
handlerton::discover_table_names() can not discover only
...
"unknown" tables. Duplicates are possible - deal with them.
2013-04-09 15:49:00 +02:00
Sergei Golubchik
e5a323e107
single table discovery: handlerton::discover_table() method.
...
fixes for need_full_discover_for_existence mode
2013-04-09 15:45:31 +02:00
Sergei Golubchik
163882665e
* don't use 1-8 numbers for open_table_error codes, use an enum.
...
* print "table doesn't exist in engine" when a table doesn't exist in the engine,
instead of "file not found" (if no file was involved)
* print a complete filename that cannot be found ('t1.MYI', not 't1')
* it's not an error for a DROP if a table doesn't exist in the engine (or some table
files cannot be found) - if the DROP succeeded regardless
2013-04-09 15:34:17 +02:00
Sergei Golubchik
03dfb2c121
file-based table discovery for discovering storage engines
...
also:
* move few tests from archive/archive.test to archive/discover.test
* fix (unintentionally) bug#34104, updated result files
2013-04-09 15:31:29 +02:00
Sergei Golubchik
69ba585a1e
remove #if MYSQL_VERSION_ID
...
there is no "upstream" OQGraph version that needs to stay compatible
with different MariaDB releases.
2013-04-07 17:09:05 +02:00
Sergei Golubchik
58e62d701e
* move bas_ext from the handler to the handlerton
...
* provide a default bas_ext value of the empty list
2013-04-07 17:08:49 +02:00
Sergei Golubchik
ccc9238335
s/st_ha_create_information/HA_CREATE_INFO/
2013-04-07 15:35:39 +02:00
Sergei Golubchik
bbbd7cedf5
my_dir() cleanup
...
* replace pointer acrobatics with a struct
* make sorting explicit: MY_DONT_SORT -> MY_WANT_SORT
(if you want something to be done - say it. fixes all places where
my_dir() was used without thinking)
* typo s/number_off_files/number_of_files/
* directory_file_name() doesn't need to be extern
* remove #ifdef __BORLANDC__
* ignore '.' and '..' entries
2013-04-07 15:19:45 +02:00
Sergei Golubchik
e56cad4b15
small cleanup
2013-04-07 14:03:43 +02:00
Sergei Golubchik
4ec6fe10e5
remove ULL() and LL(), because they're totally unnecessary
...
and sometimes harmful (used with expressions)
2013-04-07 14:00:16 +02:00
Olivier Bertrand
b3b0210467
- Prepar using indexes in MAP mode (not used yet)
...
modified:
storage/connect/tabdos.cpp
storage/connect/xindex.cpp
storage/connect/xindex.h
2013-04-07 11:43:35 +02:00
Olivier Bertrand
f60b56723d
- Bug fix: Variable rc could used uninitialized when tracing is on.
...
modified:
storage/connect/filamvct.cpp
2013-04-06 12:51:45 +02:00
Vladislav Vaintroub
ed949df15a
MDEV-4338 - Support FusionIO/directFS atomic writes
2013-04-06 00:36:10 +02:00
Vladislav Vaintroub
0aa607a01a
MDEV-4338 - Support FusionIO/directFS atomic writes
2013-04-06 00:35:45 +02:00
Olivier Bertrand
806ca8ddb5
- Do not check columns name length of dbf catalog tables. They return info
...
on a dbf table but are not dbf tables.
modified:
storage/connect/ha_connect.cc
2013-04-05 23:57:30 +02:00
Olivier Bertrand
4adb4256cc
- Update some DBUG_PRINT to avois warning on Linux
...
modified:
storage/connect/connect.cc
storage/connect/ha_connect.cc
2013-04-04 23:27:54 +02:00
Olivier Bertrand
7e0f591f6a
- Do not accept creating XML2 tables when libxml2 is not available
...
modified:
storage/connect/ha_connect.cc
2013-04-04 15:36:42 +02:00
Alexander Barkov
d12e1c92a1
Adding security tests for "ALTER TABLE t1 FILE_NAME='xxx'"
...
modified:
mysql-test/suite/connect/r/bin.result
mysql-test/suite/connect/r/csv.result
mysql-test/suite/connect/r/dbf.result
mysql-test/suite/connect/r/fix.result
mysql-test/suite/connect/r/vec.result
mysql-test/suite/connect/r/xml.result
mysql-test/suite/connect/t/grant.inc
storage/connect/ha_connect.cc
2013-04-04 11:31:20 +04:00
Olivier Bertrand
b0e07ff5b7
- Commit added test on TBL tables
...
+ update dbf.result
added:
mysql-test/suite/connect/r/tbl.result
mysql-test/suite/connect/t/tbl.test
modified:
mysql-test/suite/connect/r/dbf.result
- Fix bug on generating default file name for TBL sub-tables
modified:
storage/connect/ha_connect.cc
2013-04-04 01:14:26 +02:00
Olivier Bertrand
7e7d3ce558
- Block creating tables with auto_incremented colummns (not supported)
...
+ allow nullable columns for TBL tables
modified:
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/mycat.cc
storage/connect/mycat.h
2013-04-03 21:54:02 +02:00
Alexander Barkov
115a373b88
Fixed a problem in index.test failures when run in a non-Paris time zone.
...
This fix also revealed wrong result recorded in fix.result.
modified:
mysql-test/suite/connect/r/fix.result
storage/connect/value.cpp
modified:
mysql-test/suite/connect/r/bin.result
mysql-test/suite/connect/r/fix.result
mysql-test/suite/connect/t/bin.test
storage/connect/value.cpp
2013-04-03 04:54:02 -07:00
Olivier Bertrand
84ab3e896c
- Fix making default file name with lower case type
...
modified:
storage/connect/mycat.cc
2013-04-02 13:58:44 +02:00
Olivier Bertrand
b1031b2359
- Fold type name to lowercase when used for default file type
...
modified:
storage/connect/ha_connect.cc
2013-04-02 12:54:57 +02:00
Olivier Bertrand
3389e81dd1
- Commit pulled changes
...
added:
mysql-test/suite/connect/r/secure_file_priv.result
mysql-test/suite/connect/t/secure_file_priv-master.opt
mysql-test/suite/connect/t/secure_file_priv.test
modified:
storage/connect/ha_connect.cc
2013-04-02 11:35:38 +02:00
Olivier Bertrand
0f5c5a29f9
- Comment out the last commited change
...
modified:
storage/connect/ha_connect.cc
2013-04-02 11:31:46 +02:00
Alexander Barkov
4bba25543d
Respect the --secure-file-priv server option when working with
...
tables having the FILE_NAME='xxx' table option.
added:
mysql-test/suite/connect/r/secure_file_priv.result
mysql-test/suite/connect/t/secure_file_priv-master.opt
mysql-test/suite/connect/t/secure_file_priv.test
modified:
storage/connect/ha_connect.cc
2013-04-02 13:10:42 +04:00
Olivier Bertrand
42e5bfacc8
- Commit merged changes
...
modified:
mysql-test/suite/connect/r/ini.result
mysql-test/suite/connect/r/vec.result
mysql-test/suite/connect/t/ini.test
mysql-test/suite/connect/t/vec.test
storage/connect/ha_connect.cc
2013-04-02 11:06:19 +02:00
Olivier Bertrand
af08a68fbe
- Commit change pulled from Linux virtual machine (fixing typo in Win32 part)
...
modified:
storage/connect/filamvct.cpp*
2013-04-02 10:57:27 +02:00