985d2d393c
Merge remote-tracking branch 'origin/10.1' into 10.2
2017-12-22 12:23:39 +02:00
5c0a19c873
System Versioning 1.0 pre7
...
Merge branch '10.3' into trunk
2017-12-21 11:16:42 +03:00
e3d89652e5
Merge branch '10.0' into 10.1
2017-12-20 13:30:05 +02:00
042f763268
Merge remote-tracking branch '5.5' into 10.0
2017-12-20 12:51:57 +02:00
0436a0ff3c
Merge bb-10.2-ext into 10.3
2017-12-19 17:28:22 +02:00
028e91f380
Merge 10.2 into bb-10.2-ext
2017-12-19 17:12:14 +02:00
8d70097c21
Merge 10.1 to 10.2
...
Follow-up fix to MDEV-14008: Let Field_double::val_uint() silently
return 0 on error
2017-12-19 16:48:28 +02:00
04bed58acf
SQL: partitioning CREATE, ALTER fixes
...
MDEV-14688 Assertion `tab_part_info->part_type == LIST_PARTITION' failed in prep_alter_part_table
MDEV-14673 Assertion `part_elem->type() == partition_element::AS_OF_NOW' failed in check_partition_info
2017-12-18 22:17:53 +03:00
09c5bbf471
Merge 10.0 into 10.1
2017-12-18 20:05:50 +02:00
b55a149194
Timestamp-based versioning for InnoDB [ closes #209 ]
...
* Removed integer_fields check
* Reworked Vers_parse_info::check_sys_fields()
* Misc renames
* versioned as vers_sys_type_t
* Removed versioned_by_sql(), versioned_by_engine()
versioned() works as before;
versioned(VERS_TIMESTAMP) is versioned_by_sql();
versioned(VERS_TRX_ID) is versioned_by_engine().
* create_tmp_table() fix
* Foreign constraints for timestamp-based
* Range auto-specifier fix
* SQL: 1-row partition rotation fix [fixes #260 ]
* Fix 'drop system versioning, algorithm=inplace'
2017-12-18 19:03:51 +03:00
03e91ce324
MDEV-14641 Incompatible key or row definition between the MariaDB .frm file and the information in the storage engine
...
make sure that mysql_create_frm_image() and fast_alter_partition_table()
use the same code to derive HA_OPTION_PACK_RECORD from
create_info->row_type.
2017-12-18 16:16:42 +01:00
18405e5fd9
Partitioning syntax for versioning
...
partition by system_time (
partition p0 history,
partition pn current
)
2017-12-14 20:19:14 +01:00
ea1ccfa500
SQL: regression fix: make NOW a valid identifier again [ #363 ]
...
* again, as in 10.2, NOW is a keyword only if followed by parentheses
* use AS OF CURRENT_TIMESTAMP or AS OF NOW()
* AS OF CURRENT_TIMESTAMP and AS OF NOW() mean AS OF NOW(6),
not AS OF NOW(0), (same behavior as in a DEFAULT clause)
2017-12-08 16:24:56 +03:00
a46f585aa7
restore Field::get_timestamp() prototype
2017-12-05 17:57:06 +03:00
9b53e541f0
MDEV-13788 Server crash when issuing bad SQL partition syntax
2017-11-20 09:33:19 +04:00
9980886cab
Revert "SQL: 1-row partition rotation fix [ fixes #260 ]"
...
Related to IB partitioning only.
This reverts commit 7e764ae188
2017-11-17 11:25:52 +03:00
0d3b8ed048
fix win32 warnings
2017-11-13 19:11:03 +03:00
1d9d351346
SQL, Test: main suite [ fixes #300 ]
2017-11-13 19:11:03 +03:00
9aae0be8f9
SQL: disabled SYSTEM_TIME partitioning for InnoDB [ fixes #294 ]
2017-11-13 19:11:02 +03:00
d8d7251019
System Versioning pre0.12
...
Merge remote-tracking branch 'origin/archive/2017-10-17' into 10.3
2017-11-07 00:37:49 +03:00
835cbbcc7b
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
...
TODO: enable MDEV-13049 optimization for 10.3
2017-10-30 20:47:39 +04:00
003cb2f424
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-10-30 16:42:46 +04:00
e0a1c745ec
Merge branch '10.1' into 10.2
2017-10-24 14:53:18 +02:00
9d2e2d7533
Merge branch '10.0' into 10.1
2017-10-22 13:03:41 +02:00
da4503e956
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02:00
df5f25fa7a
Merge branch 'mysql/5.5' into 5.5
2017-10-17 10:18:17 +02:00
b036b6b594
MDEV-13937 Aria engine: Internal Error 160 after partition handling
...
Partition wasn't setting HA_OPTION_PACK_RECORD on ALTER TABLE
if the row format was PAGE.
(so one bit in the null bitmap was reserved for a deleted bit -
see make_empty_rec - and all actual null bits were one off)
2017-10-17 07:37:39 +02:00
d76f5774fe
MDEV-13459 Warnings, when compiling with gcc-7.x
...
mostly caused by -Wimplicit-fallthrough
2017-10-17 07:37:39 +02:00
2c1067166d
Merge bb-10.2-ext into 10.3
2017-10-04 08:24:06 +03:00
8ae8cd6348
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-10-02 22:35:13 +04:00
eba44874ca
MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.
...
- Fix win64 pointer truncation warnings
(usually coming from misusing 0x%lx and long cast in DBUG)
- Also fix printf-format warnings
Make the above mentioned warnings fatal.
- fix pthread_join on Windows to set return value.
2017-09-28 17:20:46 +00:00
e3d44f5d62
Merge bb-10.2-ext into 10.3
2017-09-21 08:12:19 +03:00
fc3b1a7d2f
Merge 10.2 into bb-10.2-ext
2017-09-20 17:47:49 +03:00
22c322c649
Merge branch '10.1' into 10.2
2017-09-19 12:43:02 +03:00
a5ee77393f
MDEV-13157 Specifying DATA DIRECTORY in tables leads to failing EXCHANGE PARTITION
2017-09-18 10:40:26 +02:00
7e764ae188
SQL: 1-row partition rotation fix [ fixes #260 ]
2017-09-13 10:57:46 +03:00
904b69cd9e
SQL: partitioning misc fixes [ closes #242 ]
...
* cleanup: *never* use assert(A && B)
* vers_setup_1() revisited
* vers_setup_2() renamed
* partition_element::type removed
* Copy ctor instead of memcpy()
* Handle return value from check_range_constants()
* Malloc error fix
* error, style, misc fixes
2017-09-07 15:49:11 +03:00
4aaa38d26e
Enusure that my_global.h is included first
...
- Added sql/mariadb.h file that should be included first by files in sql
directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables
that must be done before my_global.h is included)
- Removed a lot of include my_global.h from include files
- Removed include's of some files that my_global.h automatically includes
- Removed duplicated include's of my_sys.h
- Replaced include my_config.h with my_global.h
2017-08-24 01:05:44 +02:00
be901b60ae
Bug#26390632: CREATE TABLE CAN CAUSE MYSQL TO EXIT.
...
Analysis
========
CREATE TABLE of InnoDB table with a partition name
which exceeds the path limit can cause the server
to exit.
During the preparation of the partition name,
there was no check to identify whether the complete
path name for partition exceeds the max supported
path length, causing the server to exit during
subsequent processing.
Fix
===
During the preparation of partition name, check and report
an error if the partition path name exceeds the maximum path
name limit.
This is a 5.5 patch.
2017-08-23 12:59:38 +05:30
daec000450
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-07-12 22:54:49 +04:00
c9801135c1
Merge branch '10.1' into 10.2
2017-07-08 09:56:28 +02:00
9e11e055ce
Merge branch '10.0' into 10.1
2017-07-07 11:30:03 +02:00
8b2c7c9444
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-07-07 12:43:10 +04:00
89dc445a55
Merge branch '5.5' into 10.0
2017-07-06 23:47:33 +02:00
f305a7ce4b
bugfix: long partition names
2017-07-06 19:09:47 +02:00
e1093e2464
cleanup: part_func_string and subpart_func_string
...
Remove now-unused part_func_string and subpart_func_string
from partition_info.
2017-07-05 17:15:59 +02:00
785e2248bd
MDEV-13089 identifier quoting in partitioning
...
don't print partitioning expression as it was entered by the user,
use Item::print() according to the sql_mode and sql_quote_show_create
2017-07-05 17:15:59 +02:00
504eff0ca1
cleanup: generate_partition_syntax()
...
Don't write to a temporary file, use String.
Remove strange one-liner "helpers", use String methods.
Don't use current_thd, don't allocate memory for 1-byte strings, etc.
2017-07-05 17:15:58 +02:00
4b0f1284ee
SQL: revisit error messages [ closes #217 ]
2017-07-03 14:04:34 +03:00
2e335a471c
Merge remote-tracking branch '10.0' into 10.1
2017-06-21 16:19:43 +03:00
