1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-11 13:21:44 +03:00

34399 Commits

Author SHA1 Message Date
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
Sergey Petrunya
d0f8f02971 Update test result: PASSWORD(NULL) returns '' now. 2013-07-05 10:52:31 +04:00
Sergey Petrunya
590984f131 More test result updates, follow the previous cset 2013-07-05 10:44:06 +04:00
Sergey Petrunya
0e8b04d980 More test result updates:
- strict.test updated (changed back) after the cset with "Fix 
  type_newdecimal.test ..." two csets ago
- row-checksum.test changed the code from HA_WRONG_CREATE_OPTION 
  to ER_ILLEGAL_HA_CREATE_OPTION, like mysql-5.6 did
2013-07-05 10:40:45 +04:00
Sergey Petrunya
4a8c61f372 Fix a number of tests:
- MariaDB does not have mysql.slave_master_info, mysql.slave_relay_log_info ,mysql.slave_worker_info
  or mysql.ndb_binlog_index tables.
- Some tests expected to have these tables (this was an incorrect merge from 5.6, which merged 
  necessary tables like mysql.innodb*stats, but also got these tables)
2013-07-05 10:21:15 +04:00
Sergey Petrunya
86bcde82b1 Fix innodb_ignore_builtin.test 2013-07-05 07:24:04 +04:00
unknown
e654be3865 MDEV-4506: Parallel replication: Intermediate commit.
Impement options --binlog-commit-wait-count and
--binlog-commit-wait-usec.

These options permit the DBA to deliberately increase latency
of an individual commit to get more transactions in each
binlog group commit. This increases the opportunity for
parallel replication on the slave, and can also decrease I/O
load on the master.

The options also make it easier to test the parallel
replication with mysql-test-run.
2013-07-05 00:26:15 +02:00
unknown
874bb25137 MDEV-4752: Segfault during parsing of illegal query
Fix of nested join parsing of illegal query.
2013-07-04 18:37:55 +03:00
Sergey Petrunya
de8be58b68 Automatic merge 2013-07-04 17:58:39 +04:00
Sergey Petrunya
1a15aaa9e7 Update log_tables.test: some definitions of columns have changed, and slow_log got 'thread_id' column. 2013-07-04 17:57:42 +04:00
Sergey Petrunya
a7a1b82268 Update test result for mysql-test/t/ctype_errors.test (checked) 2013-07-04 17:08:15 +04:00
Sergey Petrunya
1ff340ad17 Automatic merge 2013-07-04 15:46:53 +04:00
Sergey Petrunya
77584dd6d7 MDEV-4756: 10.0-monty tree: log_state.test fails
- make the test output stable
- make Log_to_csv_event_handler::log_slow() to write the value 
  of thd->thread_id (it didn't, and so 0 was always logged).
2013-07-04 15:45:58 +04:00
Sergey Petrunya
28082b0137 Update test results: handlersocket.test (approved by Serg) 2013-07-04 15:05:43 +04:00
unknown
a1cfd47346 MDEV-4506: Parallel replication: Intermediate commit.
Wait for all worker threads to finish when stopping the SQL thread.
(Only a basic wait; this still needs to be fixed to include timeout
logic as in sql_slave_killed()).
2013-07-04 09:20:56 +02:00
Sergey Petrunya
5b19ff65b3 Update more test results (all checked). 2013-07-04 09:38:33 +04:00
Sergey Petrunya
c7020dfd70 Fix a number of trivial test failures by updating error message:
"Unknown table tbl" is now "Unknown table database.tbl"
(part#3)
2013-07-03 20:48:41 +04:00
Sergey Petrunya
b83c2bc688 Cont'd: Fix a number of trivial test failures by updating error message:
"Unknown table tbl" is now "Unknown table database.tbl"
2013-07-03 20:10:51 +04:00
Sergey Petrunya
2ca32f9747 Automatic merge 2013-07-03 20:05:05 +04:00
Michael Widenius
8ad34c8f9e Automatic merge 2013-07-03 22:57:13 +03:00
Michael Widenius
a9d1d76e5e Fixed issues with partitions and create temporary table SELECT ...
Merged all ddl_logging code.
Merged sql_partition.cc
innodb_mysql_lock2.test and partition_cache.test now works.
Changed interface to strconvert() to make it easier to use with not \0 terminated strings.

sql/sql_partition.cc:
  Full merge with 5.6
sql/sql_table.cc:
  Merged all ddl_logging code
sql/strfunc.cc:
  Added from_length argument to strconvert() to make it possible to use without end terminated strings.
sql/strfunc.h:
  Added from_length argument to strconvert() to make it possible to use without end terminated strings.
2013-07-03 22:50:34 +03:00
Sergey Petrunya
f335c36e27 Fix a number of trivial test failures by updating error message:
"Unknown table tbl" is now "Unknown table database.tbl"
2013-07-03 20:02:48 +04:00
Sergey Petrunya
e98bb64cbe MDEV-4750: (patch#2): undo previous attempts to stabilize
persistent table statistics with ANALYZE TABLE commands
2013-07-03 19:42:05 +04:00
Sergey Petrunya
6baf3e1304 Merge 2013-07-03 19:40:40 +04:00
unknown
9c1285ba6c MDEV-4058
MySQL 5.6.10 performance schema: merge of the test files for the host_cache table

With this patch, all tests perfschema.hostcache_* pass.
There are still some additional unmerged minor changes to these tests
in mysql 5.6.10.
2013-07-03 22:34:12 +03:00
Sergey Petrunya
4e89ec6692 MDEV-4750: Fix a number of test failures in EXPLAIN outputs
caused by weird behavior in innodb's persistent stats
- Run the testsuite without innodb persistent stats
2013-07-03 19:32:58 +04:00