Commit graph

78614 commits

Author SHA1 Message Date
Alexander Barkov
18fc51f5a4 Merge with 10.0-connect 2013-08-15 13:31:49 +04:00
Sergei Golubchik
51e2806661 raise a version 2013-08-14 18:56:41 +02:00
Olivier Bertrand
0993d4b4f5 - Change the Blanks parameter from true to false in catalog getting
information function. This solve the problem of uninitialised zone
  that was detected by valgrind.

modified:
  storage/connect/myconn.cpp
  storage/connect/odbconn.cpp
  storage/connect/tabfmt.cpp
  storage/connect/tabutil.cpp
  storage/connect/tabwmi.cpp
2013-08-14 16:07:32 +02:00
Sergey Vojtovich
f3d26cb1a7 Adjusted test results after recent changes. 2013-08-14 12:50:17 +04:00
Sergey Vojtovich
b7f9c89423 MDEV-4702 - Reduce usage of LOCK_open
Following variables do not require LOCK_open protection anymore:
- table_def_cache (renamed to tdc_hash) is protected by rw-lock
  LOCK_tdc_hash;
- table_def_shutdown_in_progress doesn't need LOCK_open protection;
- last_table_id use atomics;
- TABLE_SHARE::ref_count (renamed to TABLE_SHARE::tdc.ref_count)
  is protected by TABLE_SHARE::tdc.LOCK_table_share;
- TABLE_SHARE::next, ::prev (renamed to tdc.next and tdc.prev),
  oldest_unused_share, end_of_unused_share are protected by
  LOCK_unused_shares;
- TABLE_SHARE::m_flush_tickets (renamed to tdc.m_flush_tickets)
  is protected by TABLE_SHARE::tdc.LOCK_table_share;
- refresh_version (renamed to tdc_version) use atomics.
2013-08-14 12:48:50 +04:00
Olivier Bertrand
f772ed74d0 - FIX MDEV-4853 + another bug causing the whole section to be deleted
when deleting one key of a INI table with layout=Row. The same happens
  for layout=column but this is normal as one line is one section.

modified:
  storage/connect/tabsys.cpp

- Should fix a valgrind warning in CHRBLK::GetValPtrEx

modified:
  storage/connect/valblk.cpp
2013-08-13 18:53:14 +02:00
Sergei Golubchik
b882a3e83e MDEV-4492 InnoDB generates non-existing link to manual based on the server version 2013-08-13 16:02:10 +02:00
Sergei Golubchik
fcf87600a2 MDEV-4865 Change related to --log option/variable was merged partially
Complete the merge of magne.mahre@oracle.com-20101102115354-vxcaxminmzglzalk
(WL#5185 Remove deprecated 5.1 features)
2013-08-13 13:35:36 +02:00
Sergei Golubchik
a6617eb341 MDEV-4786 merge 10.0-monty -> 10.0
remove unused HA_READ_OUT_OF_SYNC
2013-08-12 22:08:25 +02:00
Sergei Golubchik
a91a23858d cleanup
* use sql_mode_for_dates() where appropriate.
* always specify an argument for sql_mode_for_dates()
  (future-proof. easier to notice and fix if the caller
   will start using thd from a local variable or an argument)
2013-08-12 22:05:23 +02:00
Olivier Bertrand
bce59293fb -Fix MDEV-4878. Table locking is now supported.
modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/plgdbsem.h

- Fiw a bug making records_in_range sometimes return a negative
  value.

modified:
  storage/connect/xindex.cpp
2013-08-12 21:51:56 +02:00
Sergei Golubchik
847e0f152b MDEV-4786 merge 10.0-monty -> 10.0
remove unused HA_CAN_EXPORT
(with the merge of "FLUSH TABLE <table_list> FOR EXPORT",
this functionality should be added back, but differently -
no table flag, handler::extra() returns an error instead)
2013-08-12 21:27:43 +02:00
Sergei Golubchik
8f0ccf7827 MDEV-4786 merge 10.0-monty -> 10.0
remove unused HA_BLOCK_CONST_TABLE
2013-08-12 21:07:10 +02:00
Sergei Golubchik
62b658a405 MDEV-4786 merge 10.0-monty -> 10.0
remove half-applied "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
2013-08-12 20:56:35 +02:00
Sergei Golubchik
23b4ccde8b MDEV-4786 merge 10.0-monty -> 10.0
fix simple_rename_or_index_change() to reuse alter_table_manage_keys()
2013-08-12 18:32:53 +02:00
Sergei Golubchik
5dd28db253 don't error out in Sys_var::global_value_ptr(),
it's not nice when unconfigured gtid prevents SHOW VARIABLES from working
2013-08-12 16:02:20 +02:00
Sergei Golubchik
9747fbb411 MDEV-4786 merge 10.0-monty -> 10.0
remove TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE
2013-08-12 15:46:35 +02:00
Sergei Golubchik
eafb11c821 MDEV-4786 merge 10.0-monty -> 10.0
use get_table_def_key() instead of create_table_def_key() where appropriate
2013-08-12 14:17:51 +02:00
unknown
055e9cb49c Fix bug MDEV-4885: When performance schema is disabled, autosized parameters show 18446744073709551615 instead of -1
(patch by Serg)
2013-08-12 17:21:52 +03:00
Olivier Bertrand
8b3e07e15b - Fix MDEV-4494. Suppress the flag HA_NULL_IN_KEY.
modified:
  storage/connect/ha_connect.h
2013-08-11 17:46:59 +02:00
Olivier Bertrand
af9e618289 - Fix MDEV-4881. SQL_TYPE_DECIMAL was not recognized in ha_connect::GetColumnOption.
Crash on second SELECT was because tshp was not reset to NULL in case of error.

modified:
  storage/connect/ha_connect.cc
  storage/connect/tabutil.cpp
2013-08-11 14:21:38 +02:00
Olivier Bertrand
8bd158c10d - Better message for CONNECT unspported commands
modified:
  storage/connect/ha_connect.cc
2013-08-09 18:53:40 +02:00
Olivier Bertrand
5d75457fc9 - Implement the SERVID special columns. This imply modifying the way
special columns are processed. This will be documented.
  Also some code cleanup and some changes to prepare the indexing of
  nullable columns (not achieve yet)

modified:
  storage/connect/colblk.cpp
  storage/connect/colblk.h
  storage/connect/connect.cc
  storage/connect/connect.h
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h
  storage/connect/macutil.cpp
  storage/connect/mycat.cc
  storage/connect/plgdbsem.h
  storage/connect/reldef.cpp
  storage/connect/reldef.h
  storage/connect/table.cpp
  storage/connect/tabmysql.cpp
  storage/connect/tabmysql.h
  storage/connect/tabodbc.h
  storage/connect/tabtbl.cpp
  storage/connect/tabutil.h
  storage/connect/value.h
  storage/connect/xindex.cpp
  storage/connect/xindex.h
  storage/connect/xtable.h
2013-08-09 18:02:47 +02:00
Sergey Vojtovich
31007e3422 Merge fixes for:
MDEV-4797 - Spider crash on show create table spider table and replication
            multi source to one of the partitions
MDEV-4747 - Spider: add missing install_spider.sql
2013-08-08 12:05:02 +04:00
Sergey Vojtovich
e397934177 Do not require libssl1.0.0 (not available on all buildbot platforms). 2013-08-08 12:03:30 +04:00
Igor Babaev
5d20f7b346 Added missing tests for innodb persistent statistics (from mysql-5.6.10)
Made sure that innodb tables for persistent statistics would not
considered by the server as system tables.
2013-08-07 17:08:51 -07:00
Igor Babaev
1b6e66fa20 Added missing tests for GET DIAGNOSTICS. 2013-08-07 13:18:26 -07:00
Sergey Petrunya
a3d79f2e58 Merge 10.0-serg -> 10.0 2013-08-07 17:21:37 +04:00
Sergey Vojtovich
a765e035a0 Null merge. 2013-08-07 19:40:25 +04:00
Sergey Petrunya
8e36dde7e1 Better comments 2013-08-07 17:20:22 +04:00
Sergey Vojtovich
45f8bcb282 Attempt to fix sproadic failures of rpl.rpl_err_ignoredtable.
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
  Wait until thread is killed.
2013-08-07 15:55:17 +04:00
Alexander Barkov
1a9f6b1d89 MDEV-4819 Upgrade from MySQL 5.6 does not work 2013-08-07 10:57:45 +04:00
Olivier Bertrand
98f3fd6466 - Issue a warning instead of an error when inserting in release built a value
concerning a nullable column wrongly created as indexed (MDEV-4494)

modified:
  storage/connect/ha_connect.cc
2013-08-06 12:17:11 +02:00
Sergey Vojtovich
5997156b9b MDEV-4801 - Server crashes in my_strdup on setting
innodb_ft_user_stopword_table to DEFAULT

Setting plugin string variable with PLUGIN_VAR_MEMALLOC flag
to NULL causes server crash.

mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result:
  Reset innodb_ft_user_stopword_table. Also tests MDEV-4801.
mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test:
  Reset innodb_ft_user_stopword_table. Also tests MDEV-4801.
sql/sql_plugin.cc:
  When we got NULL value, do not strdup(NULL).
2013-08-06 14:02:07 +04:00
Igor Babaev
9d1f31fb4b Fixed a valgrind warning:
reverted the change done for WL 4443.
2013-08-05 13:52:53 -07:00
Igor Babaev
19b8f1ee88 Merge. 2013-08-05 07:16:07 -07:00
Alexey Botchkov
8067ced929 valgrind errors in gis.test and funcs_1.storedproc fixed.
Field_geom::store() should check if the source is it's value.
2013-08-04 23:21:11 +05:00
Sergey Petrunya
cb5de276a3 Automatic merge 2013-08-02 18:14:35 +04:00
Sergey Vojtovich
d845bcc3dc MDEV-4786 - merge 10.0-monty - 10.0
Fixed perfschema.relaylog failure.

mysql-test/suite/perfschema/r/relaylog.result:
  Failed file opens are not shown in P_S. Relevant revision:
  marc.alff@oracle.com-20120807154151-cwuazxu341rvrnmg
2013-08-02 19:52:26 +04:00
Sergey Petrunya
5c49041b17 MDEV-4816: rpl.rpl_trunc_temp fails in 10.0-serg
Temorary fix for a number of replication tests (rpl.rpl_temp_table_mix_row 
rpl.rpl_trunc_temp rpl.rpl_current_user rpl.rpl_gtid_master_promote):

- THD::decide_logging_format() should not assume that mysql.gtid_slave_pos is 
  a non-replicated table. This used to cause unintended behavior for COMMIT 
  statement: replication would switch to row-based, etc.

The question of what should be done when a user issues a statement that
explicitly modifies mysql.gtid_slave_pos table remains open.
2013-08-02 18:12:09 +04:00
Alexander Barkov
4d15abf25a MDEV-4786 merge 10.0-monty > 10.0
Workaround for a possible GCC bug happening in my_fill_ucs2:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58039

Commenting out the optimized loop.
Using the original MySQL version.

modified:
  strings/ctype-ucs2.c
2013-08-02 13:36:25 +04:00
Sergey Vojtovich
3a1e8226e7 MDEV-4786 - merge 10.0-monty - 10.0
Fixed parts.partition_mgm_lc2_innodb, parts.partition_mgm_lc2_archive,
parts.partition_mgm_lc2_memory, parts.partition_mgm_lc2_myisam failures.

Applied lost changes from revision
mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t

mysql-test/suite/parts/r/partition_mgm_lc2_archive.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_memory.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result:
  Applied lost changes from revision
  mattias.jonsson@oracle.com-20101214151357-cn1eeicah9q2oz1t
2013-08-01 22:13:06 +04:00
Sergey Vojtovich
bd68d38cc7 MDEV-4786 - merge 10.0-monty - 10.0
Fixed main.plugin, main-test_sql_discovery.plugin failures.

storage/example/ha_example.cc:
  Issue a warning independently of DBUG status (needed for testing).
2013-08-01 17:12:58 +04:00
Alexander Barkov
2404456608 Merging my_convert() from 10.0-serg
modified:
  include/m_ctype.h
  mysys/ma_dyncol.c
  mysys/string.c
  sql/sql_string.cc
  sql/sql_string.h
  strings/ctype.c
2013-08-01 17:03:15 +04:00
Sergey Vojtovich
be995467f0 MDEV-4786 - merge 10.0-monty - 10.0
Fixed main.partition_open_files_limit, innodb.innodb_bug12400341 failures.

These testcases use --max-connections=N command line option, which
was declared PARSE_EARLY during the merge. Embedded didn't handle
early options and failed to start due to unknown command line
option.

libmysqld/lib_sql.cc:
  Let embedded handle early options.
sql/mysqld.cc:
  Moved handling of early options to a separate function.
sql/mysqld.h:
  Moved handling of early options to a separate function.
2013-08-01 16:09:26 +04:00
Sergey Vojtovich
d89b19d432 MDEV-4786 - merge 10.0-monty - 10.0
Fixed funcs_1.is_statistics_mysql_embedded, funcs_1.is_columns_mysql_embedded,
funcs_1.is_table_constraints_mysql_embedded, funcs_1.is_tables_mysql_embedded
failures.

mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
mysql-test/suite/funcs_1/r/is_table_constraints_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result:
  Applied same changes as to non-embedded counterpart.
2013-08-01 16:04:13 +04:00
Sergey Vojtovich
6664e73733 MDEV-4786 - merge 10.0-monty - 10.0
Fixed main.partition_cache, main.partition_cache_innodb,
main.partition_cache_myisam, main.query_cache failures.

libmysqld/emb_qcache.cc:
  Restore proper method to retrieve warnings number.
2013-08-01 16:00:50 +04:00
Igor Babaev
507410379a Fixed a wrong merge in prune_partitions()
Added forgotten partition_explicit_prune from mysql-5.6.

Backported the fix for
Bug#13559657: PARTITION SELECTION DOES NOT WORK WITH VIEWS
from mysql-5.6
2013-07-31 06:45:44 -07:00
unknown
94dfa010bc Virtual column support for new innodb. 2013-07-31 16:41:29 +03:00
Vladislav Vaintroub
a06a844d9a MDEV-4712 : Fix "shutdown" test.
There is a race condition during shutdown, that happens when "show status" runs during shutdown. 
Functions show_slave_running(), show_slave_received_heartbeats(), show_heartbeat_period() would dereference NULL pointer master_info_index, after this variable is  set to NULL in slave_end() during shutdown.
Fix introduces check for master_info_index == NULL in the affected functions.
2013-07-31 15:04:14 +02:00