database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
87,773 Commits 3,280 Branches 1,098 Tags
9d2e90f379654fb65c0eab006213d772302bcff7
Commit Graph

33674 Commits

Author SHA1 Message Date
Sergei Golubchik
2f14d5747e fix alter_table.test: remove old assert as it was removed from 5.6, 
add extra_func code from 5.5, that was lost in a merge
 2013-07-11 14:08:51 +02:00
Sergey Petrunya
a0de3e0485 MDEV-4556 Server crashes in SEL_ARG::rb_insert with index_merge+index_merge_sort_union, FORCE INDEX 
- merge_same_index_scans() may put the same SEL_ARG tree in multiple result plans.
  make it call incr_refs() on the SEL_ARG trees that it does key_or() on, because 
  key_or(sel_arg_tree_1, sel_arg_tree_2) call may invalidate SEL_ARG trees pointed 
  by sel_arg_tree_1 and sel_arg_tree_2.
 2013-07-11 15:12:50 +04:00
unknown
11c737f76e MDEV-4710 Merge Performance Schema test cases from MySQL 5.6.10 
mysql 5.6.10 's part_table_io.result passes the test.
 2013-07-11 12:25:08 +03:00
Sergei Golubchik
3ab7052d79 fix cast.test, select.test, select_jcl6.test: update results after strict_date_checking=1 2013-07-10 21:19:11 +02:00
Sergei Golubchik
b9b41a5fb0 fix plugin.test - bad merge in TABLE_SHARE::destroy, ha_share must be deleted before the plugin 2013-07-10 20:11:01 +02:00
Sergei Golubchik
b29bffff6e fix select_pkeycache: update results after strict_date_checking=1 2013-07-10 19:09:26 +02:00
Sergei Golubchik
2492d007d5 fix innodb_mysql_sync test - update from 5.6 2013-07-10 17:10:22 +02:00
Alexander Barkov
a057b50490 Merging temporal literals 
added:
  mysql-test/r/temporal_literal.result
  mysql-test/t/temporal_literal.test
modified:
  client/mysqlbinlog.cc
  include/my_time.h
  mysql-test/r/cast.result
  mysql-test/r/partition_innodb.result
  mysql-test/t/cast.test
  mysql-test/t/partition_innodb.test
  sql-common/my_time.c
  sql/field.cc
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_create.cc
  sql/item_create.h
  sql/item_strfunc.cc
  sql/item_timefunc.cc
  sql/item_timefunc.h
  sql/sql_select.cc
  sql/sql_time.cc
  sql/sql_time.h
  sql/sql_yacc.yy
  storage/spider/spd_db_mysql.cc
pending merges:
  Alexander Barkov 2013-07-10 Adding support for the SQL-standard temporal...
 2013-07-10 18:46:33 +04:00
Sergei Golubchik
cf039ec153 fix flush_read_lock - update the test and results form 5.6 2013-07-10 15:23:46 +02:00
Sergei Golubchik
0ce9391008 fix for alter_table_online test. 
Map ALTER ONLINE TABLE to ALTER TABLE ... ALGORITHM=INPLACE.
Make MERGE engine to announce its support of inplace operations.
 2013-07-10 12:48:56 +02:00
unknown
7ac5a1d362 MDEV-4710 Merge Performance Schema test cases from MySQL 5.6.10 
Merged all perfschema tests, except for the following:
perfschema.part_table_io
perfschema.binlog_mix perfschema.binlog_row perfschema.binlog_stmt
perfschema.statement_digest_consumers perfschema.statement_digest
privilege.inc privilege.result
 2013-07-10 15:30:17 +03:00
unknown
2f6a2494a5 MDEV-4708: GTID strict mode doesn't work on a database with purged binlogs 
When a new master is provisioned that does not have any old binlogs,
the @@gtid_slave_pos is used to know where in the GTID history the
provisioning happened. A slave is allowed to connect at the point of
this value of @@gtid_slave_pos, even if that GTID is not in the
binlogs on the new master.

The code to handle this case when the binlog on the newly provisioned
master is completely empty was just wrong (couple of typos). Clearly it
had never been tested ... :-/
 2013-07-10 12:01:52 +02:00
unknown
1e43277838 MDEV-4708: GTID strict mode doesn't work on a database with purged binlogs 
When a new master is provisioned that does not have any old binlogs,
the @@gtid_slave_pos is used to know where in the GTID history the
provisioning happened. A slave is allowed to connect at the point of
this value of @@gtid_slave_pos, even if that GTID is not in the
binlogs on the new master.

But --gtid-strict-mode did not correctly handle this case. When strict
mode was enabled, an attempt to connect at the position would cause an
error about holes in the binlog, which is not correct.

This patch adds a hash of GTIDs that need to be treated specially by
GTID strict mode to deal correctly with this case.
 2013-07-10 11:45:15 +02:00
Alexander Barkov
d98584f56a Adding support for the SQL-standard temporal literals. 
added:
  mysql-test/r/temporal_literal.result
  mysql-test/t/temporal_literal.test
modified:
  client/mysqlbinlog.cc
  include/my_time.h
  mysql-test/r/cast.result
  mysql-test/r/partition_innodb.result
  mysql-test/t/cast.test
  mysql-test/t/partition_innodb.test
  sql-common/my_time.c
  sql/field.cc
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_create.cc
  sql/item_create.h
  sql/item_strfunc.cc
  sql/item_timefunc.cc
  sql/item_timefunc.h
  sql/sql_select.cc
  sql/sql_time.cc
  sql/sql_time.h
  sql/sql_yacc.yy
  storage/spider/spd_db_mysql.cc
 2013-07-10 12:12:27 +04:00
Alexander Barkov
5b0774ee1c Adding support for MySQL-5.6 temporal column types: 
TIME, DATETIME, TIMESTAMP


added:
  mysql-test/r/type_temporal_mysql56.result
  mysql-test/std_data/mysql56datetime.MYD
  mysql-test/std_data/mysql56datetime.MYI
  mysql-test/std_data/mysql56datetime.frm
  mysql-test/std_data/mysql56time.MYD
  mysql-test/std_data/mysql56time.MYI
  mysql-test/std_data/mysql56time.frm
  mysql-test/std_data/mysql56timestamp.MYD
  mysql-test/std_data/mysql56timestamp.MYI
  mysql-test/std_data/mysql56timestamp.frm
  mysql-test/suite/rpl/r/rpl_temporal_mysql56.result
  mysql-test/suite/rpl/t/rpl_temporal_mysql56.test
  mysql-test/t/type_temporal_mysql56.test
  sql/compat56.cc
  sql/compat56.h
modified:
  client/mysqlbinlog.cc
  include/my_time.h
  include/mysql.h.pp
  include/mysql_com.h
  mysql-test/r/statistics.result
  mysql-test/r/strict.result
  mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
  mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
  sql-common/my_time.c
  sql/CMakeLists.txt
  sql/field.cc
  sql/field.h
  sql/item.cc
  sql/item_strfunc.cc
  sql/item_sum.cc
  sql/item_timefunc.cc
  sql/log_event.cc
  sql/opt_range.cc
  sql/opt_table_elimination.cc
  sql/protocol.cc
  sql/rpl_utility.cc
  sql/rpl_utility.h
  sql/sql_partition.cc
  sql/sql_prepare.cc
  sql/sql_select.cc
  sql/sql_table.cc
  sql/table.cc
  storage/perfschema/pfs_engine_table.cc
 2013-07-10 11:49:17 +04:00
Alexander Barkov
c51ed128b0 Merge from 5.3 2013-07-10 02:05:06 +04:00
Sergei Golubchik
e06cc1adce MDEV-4758 10.0-monty tree: ALTER TABLE CHANGE COLUMN doesn't drop EITS stats 
add missing rename_column_in_stat_tables(), delete_statistics_for_column(),
delete_statistics_for_index(), rename_table_in_stat_tables() calls.
 2013-07-09 22:36:53 +02:00
Sergei Golubchik
f171d3ff79 commit_1innodb.test: update results from 5.6 2013-07-09 18:43:12 +02:00
unknown
8f56dc7203 Cought errors are not shown 2013-07-09 21:15:01 +03:00
Sergey Petrunya
3e740c259d 10.0-monty: trivial test result updates 2013-07-09 15:39:57 +04:00
unknown
6d5f237e09 MDEV-4506: Parallel replication: Intermediate commit. 
Fix a number of failures in the test suite.
 2013-07-09 13:15:53 +02:00
Sergey Petrunya
7a9eae5803 Trivial test result updates. 2013-07-09 13:40:26 +04:00
Sergey Petrunya
56a6e71f9c Fix merge.test failure 
- Problem: mysql_admin_table() calls open_temporary_tables(). This 
  causes assertion failure, because mysql_execute_command() has 
  already called open_temporary_tables()
- Solution: call close_thread_tables() at the start of 
  mysql_admin_table(), like mysql-5.6 does
 2013-07-09 15:42:36 +04:00
Alexander Barkov
8a732d5a5e Merge from 5.2 
modified:
  mysql-test/suite/plugins/r/fulltext_plugin.result
  mysql-test/suite/plugins/t/fulltext_plugin.test
  plugin/fulltext/plugin_example.c
  sql/sql_show.cc
pending merges:
  Alexander Barkov 2013-07-09 [merge] Merge from 5.1
    Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninst...
    Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
 2013-07-09 11:02:56 +04:00
Alexander Barkov
762d3cb8ed Merge from 5.1 
modified:
  mysql-test/suite/plugins/r/fulltext_plugin.result
  mysql-test/suite/plugins/t/fulltext_plugin.test
  plugin/fulltext/plugin_example.c
  sql/sql_show.cc
pending merges:
  Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninstall ...
    Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...
 2013-07-09 10:54:47 +04:00
Igor Babaev
0977734cee Fixed all remaining failures in partition tests. 
Commented out the test case for bug 50036 as it was done in mysql-5.6.10.
 2013-07-08 18:35:44 -07:00
Igor Babaev
24b9c17506 Merge 2013-07-08 12:59:18 -07:00
Igor Babaev
f1848be746 Fixed a failure in partition_truncate.test. 2013-07-08 12:55:11 -07:00
Sergey Petrunya
09e2501f0d More trivial test result updates 2013-07-08 18:29:52 +04:00
Sergey Petrunya
66f1a848f4 Automatic merge 2013-07-08 18:15:50 +04:00
unknown
d82b512535 fixed result. 2013-07-08 19:11:57 +03:00
Sergey Petrunya
964d42631c Fix test failure in myisam.test: 
- Put back the code tht produces the warning about 
  "Table storage engine %s does not support the create option 'TRANSACTIONAL=1'"
 2013-07-08 18:14:24 +04:00
Alexander Barkov
1f3ec9800c Merging from 5.3 
modified:
  include/my_time.h
  libmysql/libmysql.c
  mysql-test/r/adddate_454.result
  mysql-test/r/cast.result
  mysql-test/r/date_formats.result
  mysql-test/r/func_sapdb.result
  mysql-test/r/func_time.result
  mysql-test/r/mdev316.result
  mysql-test/r/parser.result
  mysql-test/r/partition_datatype.result
  mysql-test/r/partition_pruning.result
  mysql-test/r/type_date.result
  mysql-test/r/type_datetime.result
  mysql-test/suite/vcol/r/vcol_misc.result
  mysql-test/t/cast.test
  sql-common/my_time.c
  sql/field.cc
  sql/field_conv.cc
  sql/filesort.cc
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_func.cc
  sql/item_strfunc.cc
  sql/item_timefunc.cc
  sql/sql_time.cc
pending merges:
  Sergei Golubchik 2013-07-03 MDEV-4667 DATE('string') incompability betwe...
 2013-07-08 16:49:42 +04:00
Sergey Petrunya
97d125084d Automatic merge 2013-07-08 12:59:50 +04:00
unknown
54999b2863 Merge performance schema test cases from MySQL 5.6.10 
Merged the majority of the PFS test cases.
There are still 19 failing test cases that need more attention.
 2013-07-08 15:19:50 +03:00
Sergey Petrunya
50dda403b7 Fix test errors like: 
-Note 1031 Table storage engine for 't1' doesn't have this option
+Note 1031 Table storage engine for 'InnoDB' doesn't have this option

They were caused by a change in MariaDB which changed ER_ILLEGAL_HA message 
text to be like:
"Storage engine InnoDB of the table `test`.`t1` doesn't have this option"

Some the error calls were changed to pass new parameters, but some were left
to be old. Also the error text in errmsg-ut8.txt was not changed.
 2013-07-08 12:57:58 +04:00
Sergey Petrunya
30e34252f4 More test result updates: 
- Update test results for tests using SPs: SPs no longer
  emit warnings/errors that were caught and handled inside SP
 2013-07-08 11:16:11 +04:00
Sergey Petrunya
4f22919f5c More trivial test results updates 2013-07-08 13:42:38 +04:00
Sergey Petrunya
72c33d24d0 Update test results to fix trivial test failures in parts testsuite 
- New error message text
- PARTITION is now a reserved word in SQL, so it should be quoted
 2013-07-07 14:09:52 +04:00
Sergei Golubchik
48b403cd65 Bug #69682 - mysqld crashes after uninstall of plugin with "first" status var 2013-07-06 15:28:11 +02:00
Sergei Golubchik
58fa29e0ff MDEV-4610 SQL query crashes MariaDB with derived_with_keys 
MDEV-4643 MariaDB crashes consistently when trying a SELECT on VIEW with a UNION and an additional JOIN in SELECT

open derived temp tables *before* trying QUICK_SELECT for them,
handler::multi_range_read_info() needs an open table.
 2013-07-05 20:45:42 +02:00
Sergey Petrunya
9f14736a40 More buildbot test result updates 2013-07-05 21:42:06 +04:00
Sergey Petrunya
f5b7f6101d Post-merge buildbot fixes: 
- Update trivial .reject/.result differences (all checked)
 2013-07-05 19:57:48 +04:00
Sergei Golubchik
d3157e239a MDEV-4665 crash when referencing missing function in a subquery 
don't ignore the return value fix_fields()
 2013-07-05 17:54:25 +02:00
Sergei Golubchik
782d86af44 MDEV-4257 Assertion `!table || (!table->read_set || bitmap_is_set(table->read_set, field_index))' fails on FROM subquery with fulltext search, derived_merge=on 
remove emtpty Item_func_match::update_used_tables() method
 2013-07-05 16:02:02 +02:00
Sergey Petrunya
9985117770 Test result updates 2013-07-05 16:56:05 +04:00
unknown
00ee44ab82 known results differences 2013-07-05 17:21:14 +03:00
unknown
aa6d8e4950 fixed result (error message and error message intercepting). 2013-07-05 17:06:02 +03:00
Sergey Petrunya
2ac068d7f4 Update test result: same as in 10.0 and maria (and mysql) 5.5 2013-07-05 14:00:17 +04:00
Sergey Petrunya
952fd3e873 Fix mysqldump.test: update test result 2013-07-05 11:23:18 +04:00