- developers - lists.mariadb.org

Re: [Maria-developers] [Commits] e464bc6: MDEV-7107 Sporadic test failure in multi_source.multisource
by Kristian Nielsen 09 Mar '15

09 Mar '15

elenst(a)montyprogram.com writes: > revision-id: e464bc6fe3d7566831da5e26447d90e758b5aa2a > committer: Elena Stepanova > timestamp: 2015-03-09 02:07:47 +0200 > message: > > MDEV-7107 Sporadic test failure in multi_source.multisource > > Extend show_slave_status.inc to run SHOW ALL SLAVES STATUS and > SHOW SLAVE 'name' STATUS on demand, and make the test use > the include file instead of direct SHOW statements Looks fine, thanks! Ok to push. I agree with your changes to show_slave_status.inc. I think they will be useful for futute test cases also. - Kristian.

1 0

[Maria-developers] MDEV-7107 review
by Elena Stepanova 09 Mar '15

09 Mar '15

Hi Kristian, Could you please take a quick look at the patch for MDEV-7107 (Sporadic test failure in multi_source.multisource). http://lists.askmonty.org/pipermail/commits/2015-March/007543.html I don't expect you'll mind changes to the test itself, we discussed earlier that's how SHOW SLAVE STATUS should be handled; but please check if you're okay with the additions to show_slave_status.inc, or you would prefer a separate include file for SHOW ALL SLAVES STATUS instead. Thanks, Elena

1 0

[Maria-developers] rpl test with gtid as default
by Jonas Oreland 09 Mar '15

09 Mar '15

what do you think ? /Jonas

3 3

Re: [Maria-developers] a1c4620: MDEV-6858: enforce_storage_engine option
by Sergei Golubchik 09 Mar '15

09 Mar '15

Hi, Jan! On Mar 08, Jan Lindström wrote: > revision-id: a1c4620646d43eaff979c132a57ee2101070fa5e > parent(s): 1b74f32b1d94465f6d6e14e4aa7ba1f94c32e39e > committer: Jan Lindström > branch nick: 10.1-innodb > timestamp: 2015-03-08 17:23:05 +0200 > message: > > MDEV-6858: enforce_storage_engine option > > Merge from Percona Server enforced use of a specific storage engine > authored by Stewart Smith. > > Modified to be session variable and modifiable only by SUPER. Use > similar implementation as default_storage_engine. > > diff --git a/mysql-test/t/enforce_storage_engine.test b/mysql-test/t/enforce_storage_engine.test > new file mode 100644 > index 0000000..36231e6 > --- /dev/null > +++ b/mysql-test/t/enforce_storage_engine.test > @@ -0,0 +1,35 @@ ... > +--error ER_UNKNOWN_STORAGE_ENGINE > +CREATE TABLE t2 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=MyISAM; > + > +SET SESSION enforce_storage_engine=MyISAM; > +select @@session.enforce_storage_engine; > +select * from t1; > +drop table t1; > + > +--error 1286 > +SET SESSION enforce_storage_engine=FooBar; > + > +select @@session.enforce_storage_engine; Consider adding tests for "only modifiable by SUPER" (create a new user, connect with it, see that enforce_storage_engine cannot be changed), and for modified enforce_storage_engine (you tested that it can be changed, but didn't do any CREATE TABLE with the new value). > diff --git a/sql/handler.cc b/sql/handler.cc > index 12d7ffb..5d5ac30 100644 > --- a/sql/handler.cc > +++ b/sql/handler.cc > @@ -117,6 +117,15 @@ static plugin_ref ha_default_tmp_plugin(THD *thd) > return ha_default_plugin(thd); > } > > + > +static plugin_ref ha_enforced_plugin(THD *thd) > +{ > + if (thd->variables.enforced_table_plugin) > + return thd->variables.enforced_table_plugin; > + return NULL; > +} > + > + > /** @brief > Return the default storage engine handlerton for thread > > @@ -148,6 +157,25 @@ handlerton *ha_default_tmp_handlerton(THD *thd) > > > /** @brief > + Return the enforced storage engine handlerton for thread > + > + SYNOPSIS > + ha_enforce_handlerton(thd) > + thd current thread > + > + RETURN > + pointer to handlerton OR NULL > + > +*/ > +handlerton *ha_enforced_handlerton(THD *thd) > +{ > + plugin_ref plugin= ha_enforced_plugin(thd); > + if (plugin) > + return plugin_hton(plugin); > + return NULL; > +} > + > +/** @brief > Return the storage engine handlerton for the supplied name > > SYNOPSIS > diff --git a/sql/mysqld.cc b/sql/mysqld.cc > index b97742d..6966fd9 100644 > --- a/sql/mysqld.cc > +++ b/sql/mysqld.cc > @@ -4738,8 +4738,8 @@ static void add_file_to_crash_report(char *file) > #define init_default_storage_engine(X,Y) \ > init_default_storage_engine_impl(#X, X, &global_system_variables.Y) > > -static int init_default_storage_engine_impl(const char *opt_name, > - char *engine_name, plugin_ref *res) > +int init_default_storage_engine_impl(const char *opt_name, > + char *engine_name, plugin_ref *res) You've made init_default_storage_engine_impl() extern, but you never use it anywhere. And you've forgot to create a command line option for enforced_table_plugin. > { > if (!engine_name) > { > diff --git a/sql/sql_table.cc b/sql/sql_table.cc > index e9a1ae9..184c073 100644 > --- a/sql/sql_table.cc > +++ b/sql/sql_table.cc > @@ -9745,12 +9745,24 @@ static bool check_engine(THD *thd, const char *db_name, > DBUG_ENTER("check_engine"); > handlerton **new_engine= &create_info->db_type; > handlerton *req_engine= *new_engine; > + handlerton *enf_engine= ha_enforced_handlerton(thd); I'd write it directly as thd->variables.enforced_table_plugin ? plugin_hton(thd->variables.enforced_table_plugin) : NULL; Or as an inlined function here, in sql_table.cc. Not as two small but non-inlined functions in handler.cc, that are only used once here. > bool no_substitution= thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION; > *new_engine= ha_checktype(thd, req_engine, no_substitution); > DBUG_ASSERT(*new_engine); > if (!*new_engine) > DBUG_RETURN(true); > > + if (enf_engine) > + { > + if (enf_engine != *new_engine && no_substitution) > + { > + const char *engine_name= ha_resolve_storage_engine_name(req_engine); > + my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), engine_name, engine_name); > + DBUG_RETURN(TRUE); > + } > + *new_engine= enf_engine; > + } > + > if (req_engine && req_engine != *new_engine) > { > push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, > diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc > index 8371df0..cd53714 100644 > --- a/sql/sys_vars.cc > +++ b/sql/sys_vars.cc > @@ -3437,6 +3437,28 @@ static Sys_var_plugin Sys_default_tmp_storage_engine( > SESSION_VAR(tmp_table_plugin), NO_CMD_LINE, > MYSQL_STORAGE_ENGINE_PLUGIN, DEFAULT(&default_tmp_storage_engine)); > > +extern int init_default_storage_engine_impl(const char* opt_name, char *engine_name, plugin_ref *plugin); Not used below. > + > + > +static bool check_super_and_not_null(sys_var *self, THD*thd, set_var *var) I think that NULL value should be allowed, it means "don't enforce a storage engine". > +{ > +#ifndef NO_EMBEDDED_ACCESS_CHECKS > + if (!(thd->security_ctx->master_access & SUPER_ACL)) > + { > + my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER"); > + return true; > + } > +#endif > + return var->value && var->value->is_null(); > +} > + > +static Sys_var_plugin Sys_enforce_storage_engine( > + "enforce_storage_engine", "Force the use of a storage engine for new " > + "tables", > + SESSION_VAR(enforced_table_plugin), > + NO_CMD_LINE, MYSQL_STORAGE_ENGINE_PLUGIN, > + DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_super_and_not_null)); > + > #if defined(ENABLED_DEBUG_SYNC) > /* > Variable can be set for the session only. Regards, Sergei

1 0

[Maria-developers] [GSoC'15] MaxScale Project
by sriram patil 07 Mar '15

07 Mar '15

Hi Markus, I am Sriram, a Masters' student at IIIT Hyderabad, India. I have worked with MariaDB in GSoC-2014 on MDEV-5359 under Alexander Barkov. I have also documented my work on my blog <http://srirampatil.tumblr.com/>. I am interested to work on "MaxScale filter to capture incoming operations for consumption in external sources". I have downloaded and built MariaDB 10.1 source code from github. I was trying to build MaxScale but it resulted in some errors. I followed the installation instructions given on MaxScale github(develop branch). The error is as follows /home/sriram/gsoc/MaxScale/query_classifier/query_classifier.cc: In function ‘bool skygw_stmt_causes_implicit_commit(LEX*, int*)’: /home/sriram/gsoc/MaxScale/query_classifier/query_classifier.cc:848:40: error: ‘struct LEX’ has no member named ‘drop_temporary’ succp = !(lex->drop_temporary); ^ make[2]: *** [query_classifier/CMakeFiles/query_classifier.dir/query_classifier.cc.o] Error 1 make[1]: *** [query_classifier/CMakeFiles/query_classifier.dir/all] Error 2 I checked struct LEX from MariaDB source code and it does not have the mentioned field. So, is MaxScale expecting some other MariaDB source code? It would be great if you could give me some pointers regarding the same. Thanks, Sriram Patil

2 2

Re: [Maria-developers] GSoC 15 : MaxScale Project under Markus Makela
by Markus Mäkelä 06 Mar '15

06 Mar '15

Hi, The most up to date documentation for MaxScale can be found on the develop branch on GitHub: https://github.com/mariadb-corporation/MaxScale/blob/develop/Documentation/… I suggest using that rather than the PDF documentation since it's a lot more easy to use. The filter interface can be found in the server/include/filter.h file. All filters must implement these functions for them to work with MaxScale. The filters are located in the server/modules/filter folder. The best way to get a hang of the filters is to take a look at one and the regexfilter and qlafilter are the ones that show the filter interface in action without having much code in them. Other useful stuff to look at can be found in the server/include folder are buffer.h(MaxScale uses these to route queries though it), modutils.h(useful functions for SQL handling), housekeeper.h(for tasks that take a long time this can be used) and hashtable.h(a generic hashtable). All of the MaxScale team works around UTC+1. For quick questions ask them on #maxscale on Freenode but email will most likely be answered as fast as IRC. Markus > Hello guys, > > As per the official list > <https://mariadb.com/kb/en/mariadb/google-summer-of-code-2015/> of projects > by MariaDB, I'm interested in the project - MaxScale filter to capture > incoming operations for consumption in external sources ( Mentor : Markus > Makela ) > > *I've 3 requests/doubts : * > > 0.I've downloaded the MaxScale code from github > <https://github.com/mariadb-corporation/MaxScale> and have read the > documentation. > It says the filter configuration file is : MaxScale.ini > I didn't find this file in the codebase. > > Nor was I able to figure out the code-location related to the "filter" > module. > > 1.Kindly suggest for the further things I should do/try. > > Shall I install MariaDB & MaxScale? > What part of code-base should I look into & play around? > > 2.What is the UTC time when most of you guys are online on IRC-channel > (#maria)? > > Since I'm from India, I need to know the time when most of you guys are > online to get immediate help on IRC. > > > Thanks in advance. > > -- > Lokesh Walase -- Markus Mäkelä, Software Engineer MariaDB Corporation t: +358 40 7740484 | Skype: markus.j.makela

1 0

[Maria-developers] Comments/thoughts on patch
by Jonas Oreland 06 Mar '15

06 Mar '15

Hi Kristian, I wrote attached patch (so that i would understand what code actually does) and found myself while refactoring also doing a change, namely that i removed the check for server_id in a couple of places. it still passes all tests... could you comment on this, or write(outline) a testcase that fails with my patch. i think functionality that i might have removed would be if you write have 2 mysqld M1 & M2 and your replicate both way...and you *don't* use domain_id...and you write concurrently on both mysqld (but maybe disjoint data ??). feedback/comments appreciated. /Jonas ps. patch applies to f4f37533a09b9776e8d5ac3f3a27957f553c9043

2 9

[Maria-developers] MaxScale JIRA project
by Vangelis Katsikaros 05 Mar '15

05 Mar '15

Hi While browsing the GSOC projects, I noticed that the MX project, and the tickets mentioned, require signing in. I don't know if this intentional or not (the MDEV project doesn't require signin for viewing the project). Just thought I should mention it. Regards Vangelis

2 2

[Maria-developers] GSoC 15 : MaxScale Project under Markus Makela
by Lokesh Walase 04 Mar '15

04 Mar '15

Hello guys, As per the official list <https://mariadb.com/kb/en/mariadb/google-summer-of-code-2015/> of projects by MariaDB, I'm interested in the project - MaxScale filter to capture incoming operations for consumption in external sources ( Mentor : Markus Makela ) *I've 3 requests/doubts : * 0.I've downloaded the MaxScale code from github <https://github.com/mariadb-corporation/MaxScale> and have read the documentation. It says the filter configuration file is : MaxScale.ini I didn't find this file in the codebase. Nor was I able to figure out the code-location related to the "filter" module. 1.Kindly suggest for the further things I should do/try. Shall I install MariaDB & MaxScale? What part of code-base should I look into & play around? 2.What is the UTC time when most of you guys are online on IRC-channel (#maria)? Since I'm from India, I need to know the time when most of you guys are online to get immediate help on IRC. Thanks in advance. -- Lokesh Walase

1 0

[Maria-developers] MDEV-6838: Using too big key for internal temp tables
by Vicențiu Ciorbaru 03 Mar '15

03 Mar '15

Hi Sergei and Sergey! I've implemented the fix for MDEV-6838. I'd like a review from both of you regarding the patch. There are a couple of changes made. The main issues are outlined in the commit message. I've changed the way create_key_part_by_field gets called in order to decouple the KEY_PART_INFO creation process from any KEYINFO modifications and also documented what the method does. My other concern is that create_key_part_by_field does not seem to make any sense within the table class as it's basically a constructor for KEY_PART_INFO and makes no use of table fields. I suggest we move the code as either a constructor for KEY_PART_INFO, or an init() function. I think that would be better left as a separate patch, but the method itself is very easy to factor out in case you agree with the change. I'm looking forward for your input. Regards, Vicențiu ---------- Forwarded message ---------- From: <vicentiu(a)mariadb.org> Date: 28 February 2015 at 23:58 Subject: 45b6edb: MDEV-6838: Using too big key for internal temp tables To: commits(a)mariadb.org revision-id: 45b6edb158f8101d641f550179ee15df363f686f parent(s): fa87fc733d7855e0e5f9b959ca0bddf772ca57e5 committer: Vicențiu Ciorbaru branch nick: server timestamp: 2015-02-28 23:58:05 +0200 message: MDEV-6838: Using too big key for internal temp tables This bug manifests due to wrong computation and evaluation of keyinfo->key_length. The issues were: * Using table->file->max_key_length() as an absolute value that must not be reached for a key, while it represents the maximum number of bytes possible for a table key. * Incorrectly computing the keyinfo->key_length size during KEY_PART_INFO creation. The metadata information regarding the key such the field length (for strings) was added twice. --- mysql-test/r/table_keyinfo-6838.result | 12 ++++++++++++ mysql-test/t/table_keyinfo-6838.test | 18 ++++++++++++++++++ sql/sql_select.cc | 7 ++++--- sql/structs.h | 1 + sql/table.cc | 34 ++++++++++++++++++++++++++-------- sql/table.h | 2 +- 6 files changed, 62 insertions(+), 12 deletions(-) diff --git a/mysql-test/r/table_keyinfo-6838.result b/mysql-test/r/table_keyinfo-6838.result new file mode 100644 index 0000000..55b0350 --- /dev/null +++ b/mysql-test/r/table_keyinfo-6838.result @@ -0,0 +1,12 @@ +CREATE TABLE t1 (i INT, state VARCHAR(997)) ENGINE=MyISAM; +INSERT INTO t1 VALUES (2,'Louisiana'),(9,'Maine'); +CREATE TABLE t2 (state VARCHAR(997), j INT) ENGINE=MyISAM; +INSERT INTO t2 VALUES ('Louisiana',9),('Alaska',5); +INSERT INTO t2 SELECT t2.* FROM t2 JOIN t2 AS t3 JOIN t2 AS t4 JOIN t2 AS t5 JOIN t2 AS t6; +SET @@max_heap_table_size= 16384; +set @@optimizer_switch='derived_merge=OFF'; +set @@optimizer_switch='extended_keys=ON'; +SELECT * FROM t1 AS t1_1 LEFT JOIN ( t1 AS t1_2 INNER JOIN (SELECT * FROM t2) v2 ON t1_2.i = j ) ON t1_1.state = v2.state LIMIT 1; +i state i state state j +2 Louisiana 9 Maine Louisiana 9 +DROP TABLE t1, t2; diff --git a/mysql-test/t/table_keyinfo-6838.test b/mysql-test/t/table_keyinfo-6838.test new file mode 100644 index 0000000..5f4c9f4 --- /dev/null +++ b/mysql-test/t/table_keyinfo-6838.test @@ -0,0 +1,18 @@ +# Test case for MDEV-6838. +# Due to incorrect key_length computation, this usecase failed with the error +# Using too big key for internal temp table. + +CREATE TABLE t1 (i INT, state VARCHAR(997)) ENGINE=MyISAM; +INSERT INTO t1 VALUES (2,'Louisiana'),(9,'Maine'); + +CREATE TABLE t2 (state VARCHAR(997), j INT) ENGINE=MyISAM; +INSERT INTO t2 VALUES ('Louisiana',9),('Alaska',5); +INSERT INTO t2 SELECT t2.* FROM t2 JOIN t2 AS t3 JOIN t2 AS t4 JOIN t2 AS t5 JOIN t2 AS t6; + +SET @@max_heap_table_size= 16384; +set @@optimizer_switch='derived_merge=OFF'; +set @@optimizer_switch='extended_keys=ON'; + +SELECT * FROM t1 AS t1_1 LEFT JOIN ( t1 AS t1_2 INNER JOIN (SELECT * FROM t2) v2 ON t1_2.i = j ) ON t1_1.state = v2.state LIMIT 1; + +DROP TABLE t1, t2; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 387fdb3..dabe46e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7957,7 +7957,8 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab, { Field *field= table->field[keyuse->keypart]; uint fieldnr= keyuse->keypart+1; - table->create_key_part_by_field(keyinfo, key_part_info, field, fieldnr); + table->create_key_part_by_field(key_part_info, field, fieldnr); + keyinfo->key_length += key_part_info->store_length; key_part_info++; } } @@ -15921,7 +15922,7 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, goto err; bzero(seg, sizeof(*seg) * keyinfo->key_parts); - if (keyinfo->key_length >= table->file->max_key_length() || + if (keyinfo->key_length > table->file->max_key_length() || keyinfo->key_parts > table->file->max_key_parts() || share->uniques) { @@ -16107,7 +16108,7 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, goto err; bzero(seg, sizeof(*seg) * keyinfo->key_parts); - if (keyinfo->key_length >= table->file->max_key_length() || + if (keyinfo->key_length > table->file->max_key_length() || keyinfo->key_parts > table->file->max_key_parts() || share->uniques) { diff --git a/sql/structs.h b/sql/structs.h index ae71819..9840cec 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -76,6 +76,7 @@ typedef struct st_key_part_info { /* Info about a key part */ */ uint16 store_length; uint16 key_type; + /* Fieldnr begins counting from 1 */ uint16 fieldnr; /* Fieldnum in UNIREG */ uint16 key_part_flag; /* 0 or HA_REVERSE_SORT */ uint8 type; diff --git a/sql/table.cc b/sql/table.cc index cfa0b6c..7df2ae6 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -5968,18 +5968,32 @@ bool TABLE::alloc_keys(uint key_count) } -void TABLE::create_key_part_by_field(KEY *keyinfo, - KEY_PART_INFO *key_part_info, +/** + @brief + Populate a KEY_PART_INFO structure with the data related to a field entry. + + @param key_part_info The structure to fill. + @param field The field entry that represents the key part. + @param fleldnr The number of the field, count starting from 1. + + TODO: This method does not make use of any table specific fields. It + could be refactored to act as a constructor for KEY_PART_INFO instead. +*/ + +void TABLE::create_key_part_by_field(KEY_PART_INFO *key_part_info, Field *field, uint fieldnr) -{ +{ key_part_info->null_bit= field->null_bit; key_part_info->null_offset= (uint) (field->null_ptr - (uchar*) record[0]); key_part_info->field= field; key_part_info->fieldnr= fieldnr; key_part_info->offset= field->offset(record[0]); - key_part_info->length= (uint16) field->pack_length(); - keyinfo->key_length+= key_part_info->length; + /* + field->key_length() accounts for the raw length of the field, excluding + any metadata such as length of field or the NULL flag. + */ + key_part_info->length= (uint16) field->key_length(); key_part_info->key_part_flag= 0; /* TODO: The below method of computing the key format length of the @@ -5991,17 +6005,20 @@ void TABLE::create_key_part_by_field(KEY *keyinfo, */ key_part_info->store_length= key_part_info->length; + /* + The total store length of the key part is the raw length of the field + + any metadata information, such as its length for strings and/or the null + flag. + */ if (field->real_maybe_null()) { key_part_info->store_length+= HA_KEY_NULL_LENGTH; - keyinfo->key_length+= HA_KEY_NULL_LENGTH; } if (field->type() == MYSQL_TYPE_BLOB || field->type() == MYSQL_TYPE_GEOMETRY || field->real_type() == MYSQL_TYPE_VARCHAR) { key_part_info->store_length+= HA_KEY_BLOB_LENGTH; - keyinfo->key_length+= HA_KEY_BLOB_LENGTH; // ??? key_part_info->key_part_flag|= field->type() == MYSQL_TYPE_BLOB ? HA_BLOB_PART: HA_VAR_LENGTH_PART; } @@ -6124,7 +6141,8 @@ bool TABLE::add_tmp_key(uint key, uint key_parts, if (key_start) (*reg_field)->key_start.set_bit(key); (*reg_field)->part_of_key.set_bit(key); - create_key_part_by_field(keyinfo, key_part_info, *reg_field, fld_idx+1); + create_key_part_by_field(key_part_info, *reg_field, fld_idx+1); + keyinfo->key_length += key_part_info->store_length; (*reg_field)->flags|= PART_KEY_FLAG; key_start= FALSE; key_part_info++; diff --git a/sql/table.h b/sql/table.h index 7a1e380..8324454 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1269,7 +1269,7 @@ struct TABLE bool add_tmp_key(uint key, uint key_parts, uint (*next_field_no) (uchar *), uchar *arg, bool unique); - void create_key_part_by_field(KEY *keyinfo, KEY_PART_INFO *key_part_info, + void create_key_part_by_field(KEY_PART_INFO *key_part_info, Field *field, uint fieldnr); void use_index(int key_to_save); void set_table_map(table_map map_arg, uint tablenr_arg)

2 1

[Maria-developers] MDEV-6089 review
by Sergei Golubchik 03 Mar '15

03 Mar '15

Hi. Here're I'll be asking questions about the patches I'm looking at. 1. Is this mostly a merge of WL#7305 or mostly your own implementation? That is, most of the changes and design decisions are yours or "because MySQL did it"? 2. Do you work like I do (commit, push, fix failing tests, combine commits with "git rebase -i" to get a clean history) or you've just magically got 32bit rdiffs correctly in every commit? :) 3. Why "MDL objects cache won't be needed"? The comment said "On some systems (e.g. Windows XP) constructing/destructing MDL_lock objects can be fairly expensive. We use this cache to avoid these costs..." Why is this no longer an issue? 4. MDL_lock_strategy - this object is in 5.7 too, but you've done it very differently. Why? And I wonder why didn't you move the common part of two strategies to the base class. You wanted a pure interface class? 5. Added initializer callback to lf-hash. May be you should remove this hack with decreasing LF_HASH::element_size etc and move this functionality to a custom initializer? It was added in 6ba12f. In particular, see changes to lf* files and whether they can use your initializer instead. 6. Replaced hash with lock-free hash: test result changes. Is the order of rows stable? perhaps you should use --sort_results ? in MDL_lock constructor, I'd set m_strategy to 0 (ori to 1 or, may be, keep it uninitialized) as a safety measure, to ensure it's not used before MDL_lock::lf_hash_initializer(). Otherwise looks ok. Mostly a straightforward change. Regards, Sergei

2 3

[Maria-developers] passwordless mariadb root login with auht_socket in Debian
by Otto Kekäläinen 03 Mar '15

03 Mar '15

Hello Daniel! It seems there are some issues with the passwordless login patch you sent me some weeks ago (https://github.com/ottok/mariadb-10.0/pull/3) Can you help me debug the failing postinst script? I added 'set -x' to the mariadb-server-10.0.postinst script and when it is run during the configure phase it will exit with code 1 and make dpkg abort the installation. Last lines of execution: SET sql_log_bin=0; CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '\'''\'', dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '\'''\'', PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='\''MySQL plugins'\'';' + logger -p daemon.err -t mysqld_safe -i + /usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam --plugin-load-add=auth_socket + set -e + echo 'SET sql_log_bin=0; USE mysql; DELIMITER //; CREATE PROCEDURE debian_plugin_install(IN plugin_name CHAR(50), IN soname CHAR(50)) BEGIN DECLARE CONTINUE HANDLER FOR NOT FOUND EXECUTE inst_plug; set @plugin_name=plugin_name; set @soname=soname ;set @install_plugin=CONCAT("INSTALL PLUGIN ",@plugin_name," SONAME '\''", @soname, "'\''");PREPARE inst_plug FROM @install_plugin ; select PLUGIN_NAME INTO @a from information_schema.plugins where PLUGIN_NAME=@plugin_name AND PLUGIN_STATUS='\''ACTIVE'\'' AND PLUGIN_TYPE='\''AUTHENTICATION'\'' AND PLUGIN_LIBRARY LIKE concat(@soname,'\''%'\'' ); DEALLOCATE PREPARE inst_plug; END// CALL debian_plugin_install('\''unix_socket'\'', '\''auth_socket'\'') // DROP PROCEDURE debian_plugin_install//' + logger -p daemon.err -t mysqld_safe -i + /usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam --plugin-load-add=auth_socket timo@debunstable:~$ echo $? 1 timo@debunstable:~$ echo $? 0 This implies that the exit code from the line '/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --default-storage-engine=myisam --plugin-load-add=auth_socket' is 1. Any ideas why? If you want to test it yourself, add to you apt sources the test repo deb http://labs.seravo.fi/~otto/mariadb-repo/ mariabd-10.0-sid-amd64/

4 15

[Maria-developers] 10.0 is now on github
by Sergei Golubchik 02 Mar '15

02 Mar '15

Hi, Olivier, Kentoku. Since when we've moved 10.1 development to git (about a year ago), the plan always was to move other trees to git too. So, last month we've moved all our development to git, 5.5 and 10.0 trees are now on github, in the https://github.com/MariaDB/server repository. I still keep launchpad trees, lp:maria/10.0, in particular, to be able to merge 10.0-connect, 10.0-spider, and 10.0-mroonga. When needed, I merge these trees to lp:maria/10.0, and then merge from lp:maria/10.0 to a 10.0 branch in the git repository. But it would be great if you could also move the development to git and github. The easiest and safest approach would be as follows: 1. you tell me when to do it. 2. I do the last merge of your lp tree to 10.0 and then to git and push it to github. 3. you fork https://github.com/MariaDB/server under your github account and then you can create your branch and do anything you want there. 4. tell me the url of your forked tree and I'll configure buildbot to build it. this way you don't need to export your changes from bzr to git (which takes few hours) - I'll do it (it'll be a couple of minutes for me, because I've already run git-remote-bzr many times, and it has all the data cached). And the history will be safer, as we can be sure that all already exported commits won't be re-exported the second time. So, just tell me when you're ready :) By the way, if you haven't pushed anything since 10.0.17 - that is, there's nothing to merge - you skip the first two steps and fork https://github.com/MariaDB/server right away. Good luck! Regards, Sergei

1 0

[Maria-developers] MDEV-7286 TRIGGER: CREATE OR REPLACE, CREATE IF NOT EXISTS
by Alexander Barkov 27 Feb '15

27 Feb '15

Hi Serg, Please review a patch for MDEV-7286. Thanks.

4 5

[Maria-developers] MDEV-7281 EVENT: CREATE OR REPLACE
by Alexander Barkov 26 Feb '15

26 Feb '15

Hi Sergei, Thanks for your suggestions that you gave in the first review. Please review a new patch for MDEV-7281, which addresses your suggestions. >> diff --git a/mysql-test/r/create_drop_event.result b/mysql-test/ /create_drop_event.result > > again, same thing. I don't see a test that the command actually worked. > please use different event definitions in all three create variants. > and add show create event after every create to verify that > create if not exists did *not* modify the event, but create or replace > did modify it. > Done. >>> --- a/sql/event_db_repository.cc >>> +++ b/sql/event_db_repository.cc >>> @@ -684,18 +684,28 @@ Event_db_repository::create_event(THD *thd, Event_parse_data *parse_data, >>> DBUG_PRINT("info", ("check existance of an event with the same name")); >>> if (!find_named_event(parse_data->dbname, parse_data->name, table)) >>> { >>> - if (create_if_not) >>> + if (thd->lex->is_create_or_replace()) >>> + { >>> + if ((ret= table->file->ha_delete_row(table->record[0]))) >>> + { >>> + table->file->print_error(ret, MYF(0)); >>> + goto end; >>> + } >>> + } >>> + else if (create_if_not) >>> { >>> *event_already_exists= true; >>> push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE, >>> ER_EVENT_ALREADY_EXISTS, ER(ER_EVENT_ALREADY_EXISTS), >>> parse_data->name.str); >>> ret= 0; >>> + goto end; >>> } >>> else >>> + { >>> my_error(ER_EVENT_ALREADY_EXISTS, MYF(0), parse_data->name.str); >>> - >>> - goto end; >>> + goto end; >>> + } >>> } else >>> *event_already_exists= false; >> >> I wonder whether this works as it should. On create-or-replace you >> delete the old event row and a new one is supposedly inserted. So, the >> table is fine. >> >> But event_already_exists will stay unset, undefined, actually, because >> the caller didn't set it either. If you set it to TRUE, then the caller >> won't update in-memory even list, so your new event won't be enabled. >> If you set it to FALSE, it will try to insert a new event without >> deleting the old one and I don't know what will happen (either both will >> stay active or the insertion fails). >> event_already_exists is now set to "false" on OR REPLACE. The in-memory list is updated in events.cc, in the method Events::create_event(...). This is the new code for this: if (thd->lex->create_info.or_replace() && event_queue) event_queue->drop_event(thd, parse_data->dbname, parse_data->name); >> Do you have a test to verify that after CREATE OR REPLACE EVENT the old >> event no longer exists and the new event does exist and is executed as >> expected? >> Added a test for this. >>> diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc >>> index 922f0d7..648fd48 100644 >>> --- a/sql/sql_parse.cc >>> +++ b/sql/sql_parse.cc >>> @@ -3995,9 +3997,8 @@ end_with_restore_list: >>> switch (lex->sql_command) { >>> case SQLCOM_CREATE_EVENT: >>> { >>> - bool if_not_exists= (lex->create_info.options & >>> - HA_LEX_CREATE_IF_NOT_EXISTS); >>> - res= Events::create_event(thd, lex->event_parse_data, if_not_exists); >>> + res= Events::create_event(thd, lex->event_parse_data, >>> + lex->is_create_if_not_exists()); >> >> This doesn't seem to be particularly logical. >> You pass lex->is_create_if_not_exists)() here an argument, >> but you check thd->lex->is_create_or_replace() in the >> Event_db_repository::create_event anyway. I'd suggest not to pass >> lex->is_create_if_not_exists() as an argument, and check both in >> Event_db_repository::create_event(). The "if not exists" flag is not passed to Events::create_event() any more. Thanks.

2 1

Re: [Maria-developers] 26f48fa: MDEV-6997: SET STATEMENT last_insert_id FOR ... does not affect the value written to the binlog
by Sergei Golubchik 25 Feb '15

25 Feb '15

Hi, Sanja! On Nov 28, sanja(a)mariadb.com wrote: > revision-id: 26f48fa6c110efc62e17e1edfe6569445387e11d > parent(s): d0d6284cab70af148269d95744f615454cac24bb > committer: Oleksandr Byelkin > branch nick: work-maria-10.1-MDEV-6997-real > timestamp: 2014-11-28 13:52:59 +0100 > message: > > MDEV-6997: SET STATEMENT last_insert_id FOR ... does not affect the value written to the binlog > > Problem was in reinitialization of first_successful_insert_id_in_prev_stmt_for_binlog after setting variables. > > --- > mysql-test/r/set_statement.result | 2 -- > mysql-test/r/set_statement_notembedded_binlog.result | 8 ++++++++ > mysql-test/t/set_statement.test | 2 -- > mysql-test/t/set_statement_notembedded_binlog.test | 15 +++++++++++++++ > sql/sql_parse.cc | 4 ++++ > sql/sys_vars.cc | 2 +- > 6 files changed, 28 insertions(+), 5 deletions(-) > > diff --git a/mysql-test/r/set_statement_notembedded_binlog.result b/mysql-test/r/set_statement_notembedded_binlog.result > new file mode 100644 > index 0000000..bd50832 > --- /dev/null > +++ b/mysql-test/r/set_statement_notembedded_binlog.result > @@ -0,0 +1,8 @@ > +drop table if exists t1; > +drop view if exists t1; > +PURGE BINARY LOGS before now(); why not reset master? > +set statement last_insert_id = 112 for create table t1 as select last_insert_id(); > +show binlog events limit 4,1; > +Log_name Pos Event_type Server_id End_log_pos Info > +x x x x x use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ Ehm, and what does this test shows? > +drop table t1; > diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc > index 5af700b..54abfd0 100644 > --- a/sql/sql_parse.cc > +++ b/sql/sql_parse.cc > @@ -2728,6 +2728,10 @@ static bool do_execute_sp(THD *thd, sp_head *sp) > my_error(ER_WRONG_ARGUMENTS, MYF(0), "SET"); > goto error; > } > + if (!thd->in_sub_stmt) /* stored functions and triggers are a special case */ > + { > + thd->stmt_depends_on_first_successful_insert_id_in_prev_stmt= 0; > + } Hmm. What does this fix? I'd think that stmt_depends_on_first_successful_insert_id_in_prev_stmt is already 0 here. Anyway, without a working test it's difficult to see whether your fix is doing anything. > } Regards, Sergei

2 1

[Maria-developers] [MDEV-7586] Merged derived tables/VIEWs increment created_tmp_tables
by Vicențiu Ciorbaru 25 Feb '15

25 Feb '15

Hi Sergey! As discussed on the mdev page, I've implemented the fix for incrementing the created_tmp_tables variable. I've attached the patch for review. The changes in the patch are explained within the mdev page. commit 53d78644b793f7b667e71863ccd0b1ba54c894f3 Author: Vicențiu Ciorbaru <cvicentiu(a)gmail.com> Date: Sun Feb 22 03:40:17 2015 +0200 MDEV-7586: Merged derived tables/VIEWs increment created_tmp_tables Temporary table count fix. The number of temporary tables was increased when the table is not actually created. (when do_not_open was passed as TRUE to create_tmp_table). Another issue fixed is that create_tmp_table was called incorrectly in create_result_table, having keep_row_order passed for the do_not_open parameter and keep_row_order always set to false. diff --git a/mysql-test/r/tmp_table_count-7586.result b/mysql-test/r/tmp_table_count-7586.result new file mode 100644 index 0000000..0c526e0 --- /dev/null +++ b/mysql-test/r/tmp_table_count-7586.result @@ -0,0 +1,83 @@ +create table t2 (a int); +insert into t2 values (1),(2),(3); +create view v2 as select a from t2; +flush status; +select * from v2; +a +1 +2 +3 +show status like '%Created_tmp%'; +Variable_name Value +Created_tmp_disk_tables 0 +Created_tmp_files 0 +Created_tmp_tables 0 +explain select * from v2; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t2 ALL NULL NULL NULL NULL 3 +select * from (select * from t2) T1; +a +1 +2 +3 +show status like '%Created_tmp%'; +Variable_name Value +Created_tmp_disk_tables 0 +Created_tmp_files 0 +Created_tmp_tables 0 +explain select * from (select * from t2) T1; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t2 ALL NULL NULL NULL NULL 3 +drop view v2; +drop table t2; +CREATE TABLE t1(a int); +INSERT INTO t1 values(1),(2); +CREATE TABLE t2(a int); +INSERT INTO t2 values(1),(2); +EXPLAIN SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a HAVING a > 1); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 2 Using where +1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 test.t1.a 1 +2 MATERIALIZED t2 ALL NULL NULL NULL NULL 2 Using temporary +truncate table performance_schema.events_statements_history_long; +flush status; +CREATE TABLE t3 SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a HAVING a > 1); +# Performance schema should be the same as "Created_tmp_tables" variable below +select sum(created_tmp_tables) from performance_schema.events_statements_history_long; +sum(created_tmp_tables) +2 +show status like '%Created_tmp%'; +Variable_name Value +Created_tmp_disk_tables 0 +Created_tmp_files 0 +Created_tmp_tables 2 +drop table t3; +EXPLAIN SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a); +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t1 ALL NULL NULL NULL NULL 2 +1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 +2 MATERIALIZED t2 ALL NULL NULL NULL NULL 2 +truncate table performance_schema.events_statements_history_long; +flush status; +CREATE TABLE t3 SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a); +# Performance schema should be the same as "Created_tmp_tables" variable below +select sum(created_tmp_tables) from performance_schema.events_statements_history_long; +sum(created_tmp_tables) +1 +show status like '%Created_tmp%'; +Variable_name Value +Created_tmp_disk_tables 0 +Created_tmp_files 0 +Created_tmp_tables 1 +drop table t1,t2,t3; +truncate table performance_schema.events_statements_history_long; +flush status; +# Performance schema should be the same as "Created_tmp_tables" variable below +select sum(created_tmp_tables) from performance_schema.events_statements_history_long; +sum(created_tmp_tables) +0 +show status like '%Created_tmp%'; +Variable_name Value +Created_tmp_disk_tables 0 +Created_tmp_files 0 +Created_tmp_tables 0 diff --git a/mysql-test/t/tmp_table_count-7586.test b/mysql-test/t/tmp_table_count-7586.test new file mode 100644 index 0000000..756913e --- /dev/null +++ b/mysql-test/t/tmp_table_count-7586.test @@ -0,0 +1,53 @@ +# MDEV-7586 regression test. +# Test if created_tmp_tables status variable is correctly incremented. +--source include/have_perfschema.inc + +create table t2 (a int); +insert into t2 values (1),(2),(3); +create view v2 as select a from t2; + +flush status; +select * from v2; +show status like '%Created_tmp%'; + +explain select * from v2; + +select * from (select * from t2) T1; +show status like '%Created_tmp%'; + +explain select * from (select * from t2) T1; + + +drop view v2; +drop table t2; + + +CREATE TABLE t1(a int); +INSERT INTO t1 values(1),(2); +CREATE TABLE t2(a int); +INSERT INTO t2 values(1),(2); + +EXPLAIN SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a HAVING a > 1); +truncate table performance_schema.events_statements_history_long; +flush status; +CREATE TABLE t3 SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a HAVING a > 1); +--echo # Performance schema should be the same as "Created_tmp_tables" variable below +select sum(created_tmp_tables) from performance_schema.events_statements_history_long; +show status like '%Created_tmp%'; +drop table t3; + +EXPLAIN SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a); +truncate table performance_schema.events_statements_history_long; +flush status; +CREATE TABLE t3 SELECT * FROM t1 WHERE a IN (SELECT * FROM t2 GROUP BY a); +--echo # Performance schema should be the same as "Created_tmp_tables" variable below +select sum(created_tmp_tables) from performance_schema.events_statements_history_long; +show status like '%Created_tmp%'; + +drop table t1,t2,t3; + +truncate table performance_schema.events_statements_history_long; +flush status; +--echo # Performance schema should be the same as "Created_tmp_tables" variable below +select sum(created_tmp_tables) from performance_schema.events_statements_history_long; +show status like '%Created_tmp%'; diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index d5e3334..2122349 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -3890,7 +3890,6 @@ SJ_TMP_TABLE::create_sj_weedout_tmp_table(THD *thd) /* STEP 1: Get temporary table name */ - thd->inc_status_created_tmp_tables(); if (use_temp_pool && !(test_flags & TEST_KEEP_TMP_TABLES)) temp_pool_slot = bitmap_lock_set_next(&temp_pool); diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 9cdf5ce..4463eb7 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3676,7 +3676,7 @@ create_result_table(THD *thd_arg, List<Item> *column_types, if (! (table= create_tmp_table(thd_arg, &tmp_table_param, *column_types, (ORDER*) 0, is_union_distinct, 1, options, HA_POS_ERROR, (char*) table_alias, - keep_row_order))) + !create_table, keep_row_order))) return TRUE; col_stat= (Column_statistics*) table->in_use->alloc(table->s->fields * diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 4393f02..bb381ff 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -15802,7 +15802,6 @@ create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields, (int) distinct, (int) save_sum_fields, (ulong) rows_limit, MY_TEST(group))); - thd->inc_status_created_tmp_tables(); thd->query_plan_flags|= QPLAN_TMP_TABLE; if (use_temp_pool && !(test_flags & TEST_KEEP_TMP_TABLES)) @@ -16756,14 +16755,19 @@ bool open_tmp_table(TABLE *table) HA_OPEN_TMP_TABLE | HA_OPEN_INTERNAL_TABLE))) { - table->file->print_error(error,MYF(0)); /* purecov: inspected */ - table->db_stat=0; - return(1); + table->file->print_error(error, MYF(0)); /* purecov: inspected */ + table->db_stat= 0; + return 1; } table->db_stat= HA_OPEN_KEYFILE+HA_OPEN_RNDFILE; - (void) table->file->extra(HA_EXTRA_QUICK); /* Faster */ - table->created= TRUE; - return(0); + (void) table->file->extra(HA_EXTRA_QUICK); /* Faster */ + if (!table->created) + { + table->created= TRUE; + table->in_use->inc_status_created_tmp_tables(); + } + + return 0; } @@ -16780,7 +16784,7 @@ bool open_tmp_table(TABLE *table) options Option bits DESCRIPTION - Create an internal emporary table according to passed description. The is + Create an internal temporary table according to passed description. The is assumed to have one unique index or constraint. The passed array or TMP_ENGINE_COLUMNDEF structures must have this form: @@ -16799,7 +16803,7 @@ bool open_tmp_table(TABLE *table) */ -bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, +bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, TMP_ENGINE_COLUMNDEF *start_recinfo, TMP_ENGINE_COLUMNDEF **recinfo, ulonglong options) @@ -16930,8 +16934,10 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, goto err; } table->in_use->inc_status_created_tmp_disk_tables(); + table->in_use->inc_status_created_tmp_tables(); table->in_use->query_plan_flags|= QPLAN_TMP_DISK; share->db_record_offset= 1; + table->created= TRUE; DBUG_RETURN(0); err: DBUG_RETURN(1); @@ -16971,7 +16977,7 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, /* Create internal MyISAM temporary table */ -bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, +bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, TMP_ENGINE_COLUMNDEF *start_recinfo, TMP_ENGINE_COLUMNDEF **recinfo, ulonglong options) @@ -17076,6 +17082,7 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, goto err; } table->in_use->inc_status_created_tmp_disk_tables(); + table->in_use->inc_status_created_tmp_tables(); table->in_use->query_plan_flags|= QPLAN_TMP_DISK; share->db_record_offset= 1; table->created= TRUE; @@ -17109,7 +17116,7 @@ create_internal_tmp_table_from_heap(THD *thd, TABLE *table, if (is_duplicate) *is_duplicate= FALSE; - if (table->s->db_type() != heap_hton || + if (table->s->db_type() != heap_hton || error != HA_ERR_RECORD_FILE_FULL) { /* @@ -17139,8 +17146,8 @@ create_internal_tmp_table_from_heap(THD *thd, TABLE *table, new_table.no_rows= table->no_rows; if (create_internal_tmp_table(&new_table, table->key_info, start_recinfo, recinfo, - thd->lex->select_lex.options | - thd->variables.option_bits)) + thd->lex->select_lex.options | + thd->variables.option_bits)) goto err2; if (open_tmp_table(&new_table)) goto err1; @@ -17203,7 +17210,7 @@ create_internal_tmp_table_from_heap(THD *thd, TABLE *table, new_table.s= table->s; // Keep old share *table= new_table; *table->s= share; - + table->file->change_table_ptr(table, table->s); table->use_all_columns(); if (save_proc_info) diff --git a/sql/sql_select.h b/sql/sql_select.h index 7d53731..9cad225 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1788,10 +1788,6 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, bool table_cant_handle_bit_fields, bool make_copy_field, uint convert_blob_length); -bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, - TMP_ENGINE_COLUMNDEF *start_recinfo, - TMP_ENGINE_COLUMNDEF **recinfo, - ulonglong options, my_bool big_tables); /* General routine to change field->ptr of a NULL-terminated array of Field @@ -1879,20 +1875,20 @@ void make_possible_keys_line(TABLE *table, key_map possible_keys, String *line); #define RATIO_TO_PACK_ROWS 2 #define MIN_STRING_LENGTH_TO_PACK_ROWS 10 -TABLE *create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, - ORDER *group, bool distinct, bool save_sum_fields, - ulonglong select_options, ha_rows rows_limit, - const char* alias, bool do_not_open=FALSE, +TABLE *create_tmp_table(THD *thd, TMP_TABLE_PARAM *param, List<Item> &fields, + ORDER *group, bool distinct, bool save_sum_fields, + ulonglong select_options, ha_rows rows_limit, + const char* alias, bool do_not_open=FALSE, bool keep_row_order= FALSE); void free_tmp_table(THD *thd, TABLE *entry); bool create_internal_tmp_table_from_heap(THD *thd, TABLE *table, TMP_ENGINE_COLUMNDEF *start_recinfo, - TMP_ENGINE_COLUMNDEF **recinfo, + TMP_ENGINE_COLUMNDEF **recinfo, int error, bool ignore_last_dupp_key_error, bool *is_duplicate); -bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, +bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, TMP_ENGINE_COLUMNDEF *start_recinfo, - TMP_ENGINE_COLUMNDEF **recinfo, + TMP_ENGINE_COLUMNDEF **recinfo, ulonglong options); bool open_tmp_table(TABLE *table); void setup_tmp_table_column_bitmaps(TABLE *table, uchar *bitmaps); Regards, Vicențiu

2 2

[Maria-developers] MDEV-7628 Row-based replication of old DECIMAL to new DECIMAL
by Alexander Barkov 25 Feb '15

25 Feb '15

Hi Sergei, Kristian, all, Thanks to everyone who participated in the discussion on this topic. I tried to collect all ideas into a JIRA task: https://mariadb.atlassian.net/browse/MDEV-7628 Please have a look. Thanks.

1 0

[Maria-developers] Contributing in Support for GTID in mysqlbinlog for GSoC'15
by Rohit Kashyap 24 Feb '15

24 Feb '15

HI Kristian, I am Rohit Kashyap, I am currently working on MDEV-7569 and recently came over to your post on Support for GTID in mysqlbinlog [MDEV-4989] I would like to ask you for guidance and leads on this so that I can take it up as my GSoC'15 Project under MariaDB. -- Kind Regards, Rohit

2 3

[Maria-developers] auth_socket/unix_socket auth plugin naming incompatibility with Percona Server
by John Leach 23 Feb '15

23 Feb '15

Hi, I just tested a switch from Percona Server 5.6 to MariaDB 10.0.16 and hit a problem with socket authentication. I had it set up to auth root using the auth_socket plugin, but when I switched to MariaDB I could no longer login as root. I get this error from the client: ERROR 1524 (HY000): Plugin 'auth_socket' is not loaded Anyway, after I bunch of investigation, I found that the plugin used to expose itself as socket_peercred but was renamed due to a conflict and Percona and MariaDB chose different names to fix it. Percona renamed it to auth_socket, matching the actual library filename auth_socket.so and MariaDB chose unix_socket, but keeping the filename auth_socket.so: https://github.com/MariaDB/server/commit/b8b7b4eb6bef26d05257272be02674ae55… https://github.com/percona/percona-server/commit/91a2afcbcba8af28d2f10f8083… This isn't great, but it's made worse because the plugin is successfully loaded in both cases (because the filename is auth_socket.so) and no errors are reported in the logs, but the plugin just exposes itself internally using a different name so reports that auth_socket isn't loaded in MariaDB. I fixed it by starting mysql with skip-grant-tables and running: update mysql.user set plugin='unix_socket' where plugin='auth_socket'; but that alone doesn't work, because MariaDB doesn't know that unix_socket is provided by auth_socket.so: ERROR 1524 (HY000): Plugin 'unix_socket' is not loaded So I then added this to the config file, which fixed it: plugin-load=unix_socket=auth_socket.so Any thoughts on what to do here? Can the plugin be made to recognise both names, so other users don't end up in this situation? I presume there would need to be both auth_socket.so and unix_socket.so. I also presume Percona would need to provide the same, to help those moving from MariaDB to Percona. Thanks, John. -- https://www.brightbox.com

2 4

[Maria-developers] (no subject)
by Rohit Kashyap 22 Feb '15

22 Feb '15

HI Kristian, I am Rohit Kashyap, I am currently working on MDEV-7569 and recently came over to your post on Support for GTID in mysqlbinlog [MDEV-4989] I would like to ask you for guidance and leads on this so that I can take it up as my GSoC'15 Project under MariaDB. -- Kind Regards, Rohit

1 0

[Maria-developers] Suggestion for MariaDB Workbench
by Rohit Kashyap 22 Feb '15

22 Feb '15

Hi, Based on the following posts http://stackoverflow.com/questions/22616861/can-i-use-mysql-workbench-to-cr… https://mariadb.com/kb/en/mariadb/guiworkbench-for-mariadb-aria/ https://mariadb.com/kb/en/mariadb/graphical-clients/ Can we build a Standalone GUI Client for MariaDB. -- Kind Regards, Rohit

1 0

[Maria-developers] Google Summer of Code 2015
by Delveri chick 22 Feb '15

22 Feb '15

Hi sergii i have some working knowledge of ldap not much though but I think following your post, it will be great for MariaDb to incorporate an ldap plugin that could be used by organisations running ldap servers and mariadb. For example most large organisations like Google keep information about their workers in a directory service on the servers. Creating users tables to hold this info will take too much time. Managing this table is also a huge task which can also reduce performance due to overpopulation. The ldap plugin will serve as an interface between mariadb and the directory service such that info can be retrieved with ease. The cool stuff with ldap is that if a request is made to the directory service and the requested data is not there, a reference to another directory service that contains it is returned. The Ldap plugin if incorporated into mariadb can be used to authenticate users since in runs directly on the TCT/IP stack. Please request for more details if you need more explanation that will convince mariadb developpers to include this task at GSoc 2015. Best regards Chick

1 0

[Maria-developers] binlog_row_image
by Rasmus Johansson 19 Feb '15

19 Feb '15

Hi, Is anyone familiar with binlog_row_image in MySQL 5.6, would it make sense to add it to MariaDB? I received a request for it where they have a wide table with high write activity and only a few fields are updated for each DML. Apparently binlog_row_image would be efficient in this case. There is also a JIRA issue about binlog_row_image from the MySQL compatibility point of view: https://mariadb.atlassian.net/browse/MDEV-7471 Rasmus -- Rasmus Johansson, VP Engineering MariaDB | t: +358 50 499 9589 | Skype: ratzpo

2 1

Re: [Maria-developers] e91559c: MDEV-7006 MDEV-7007: SET STATEMENT and slow log
by Sergei Golubchik 16 Feb '15

16 Feb '15

Hi, Oleksandr! On Jan 28, Oleksandr Byelkin wrote: > revision-id: e91559cf7f2b19378e9e5d3f72c3a6794a09d1e0 > parent(s): cbc318fcf3680c01dca1320b87f625124a497528 > committer: Oleksandr Byelkin > branch nick: work-maria-10.1-MDEV-6997 > timestamp: 2014-11-26 11:54:29 +0100 > message: > > MDEV-7006 MDEV-7007: SET STATEMENT and slow log > fixed embedded server tests > > old values of SET STATENENT variables now saved in its own Query_arena and restored later Basically, I have two comments: 1. I think it might be kind of expensive to create MEM_ROOT for every SET STATEMENT. And perhaps a user will never need to set-statement these log variables. I don't see a good solution for that. Either we can drop the support for log related variables in SET STATEMENT, basically not using your patch. I wouldn't like that, from a user point of view this is a pretty artificial limitation, he doesn't care about memroots. Or we can only create memroot for log related variables and put other variables in the statement memroot, which also means restoring values in two steps. Seems like too complex for a solution. A compromise solution would be to do almost like in your patch, but not to free memroot after every statement. That is, a memroot is created once, for the first SET STATEMENT. At the end of the statement you only MY_MARK_BLOCKS_FREE or MY_KEEP_PREALLOC. Then the next SET STATEMENT wouldn't need to allocate that much. Not perfect, but might do as a tradeoff. Or, perhaps you can suggest a better solution. 2. I didn't quite like that you've added restore_set_statement_var, reset_arena_for_set_stmt, free_arena_for_set_stmt, etc everywhere. I'd prefer you to add them to one function which is called from all these places. Like, there must be some cleanup-after-statement function that you should be able to use. > diff --git a/mysql-test/t/set_statement.test b/mysql-test/t/set_statement.test > index a658071..108c1a3 100644 > --- a/mysql-test/t/set_statement.test > +++ b/mysql-test/t/set_statement.test > @@ -995,6 +985,57 @@ set global general_log=0; > set statement lock_wait_timeout=1 for select @@lock_wait_timeout; > set global general_log=@save_general_log; > > +--echo # MDEV-7006 MDEV-7007: SET statement and slow log > + > +set @save_long_query_time= @@long_query_time; > +set @save_slow_query_log= @@slow_query_log; > +set @save_log_output= @@log_output; > + > +set statement long_query_time=default for select @@long_query_time; > +set statement log_slow_filter=default for select @@log_slow_filter; > +set statement log_slow_verbosity=default for select @@log_slow_verbosity; > +set statement log_slow_rate_limit=default for select @@log_slow_rate_limit; > +set statement slow_query_log=default for select @@slow_query_log; > + > +truncate table mysql.slow_log; > +set slow_query_log= 1; > +set global log_output='TABLE'; > + > +select sql_text from mysql.slow_log; > +set @@long_query_time=0.01; > +--echo #should be written > +select sleep(0.1); > +set @@long_query_time=@save_long_query_time; > +select sql_text from mysql.slow_log; > +--echo #--- > +--echo #should be written > +set statement long_query_time=0.01 for select sleep(0.1); > +select sql_text from mysql.slow_log; Okay, I hope it'll work, but please do try it in a separate branch in buildbot. all these timing-related tests have proven to be very fragile, so I've learned to be very cautious about these stuff. even in test that looks safe to me :) > +--echo #--- > +set @@long_query_time=0.01; > +--echo #should NOT be written > +set statement slow_query_log=0 for select sleep(0.1); > +set @@long_query_time=@save_long_query_time; > +select sql_text from mysql.slow_log; > +--echo #--- > +--echo #should be NOT written > +set statement long_query_time=0.01,log_slow_filter='full_scan' for select sleep(0.1); > +select sql_text from mysql.slow_log; > +--echo #--- > +--echo #should be NOT written > +set statement long_query_time=0.01,log_slow_rate_limit=9999 for select sleep(0.1); > +select sql_text from mysql.slow_log; > +--echo #--- > +# > +# log_slow_verbosity is impossible to check because results are not written > +# in TABLE mode > +# > + > +set global log_output= @save_log_output; > +set @@slow_query_log= @save_slow_query_log; > +set @@long_query_time= @save_long_query_time; > + > + > # > # Prohibited Variables > # > diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc > index 6432e19..08094ce 100644 > --- a/sql/sql_lex.cc > +++ b/sql/sql_lex.cc > @@ -4235,6 +4236,53 @@ int LEX::print_explain(select_result_sink *output, uint8 explain_flags, > return res; > } > > +void LEX::set_arena_for_set_stmt(Query_arena *backup) > +{ > + DBUG_ENTER("LEX::set_arena_for_set_stmt"); > + DBUG_ASSERT(arena_for_set_stmt== 0); > + MEM_ROOT *mem_root= new MEM_ROOT(); > + if (!(mem_root)) > + DBUG_VOID_RETURN; > + init_sql_alloc(mem_root, ALLOC_ROOT_MIN_BLOCK_SIZE, 0, > + MYF(MY_THREAD_SPECIFIC)); > + if (!(arena_for_set_stmt= new Query_arena(mem_root, > + Query_arena::STMT_INITIALIZED))) > + DBUG_VOID_RETURN; 1. allocate a new memroot for every SET STATEMENT? 2. no error reporting? > + DBUG_PRINT("info", ("mem_root: 0x%lx arena: 0x%lx", > + (ulong) mem_root, (ulong) arena_for_set_stmt)); > + thd->set_n_backup_active_arena(arena_for_set_stmt, backup); > + DBUG_VOID_RETURN; > +} > + > + > +void LEX::reset_arena_for_set_stmt(Query_arena *backup) > +{ > + DBUG_ENTER("LEX::reset_arena_for_set_stmt"); > + DBUG_ASSERT(arena_for_set_stmt); > + thd->restore_active_arena(arena_for_set_stmt, backup); > + DBUG_PRINT("info", ("mem_root: 0x%lx arena: 0x%lx", > + (ulong) arena_for_set_stmt->mem_root, > + (ulong) arena_for_set_stmt)); > + DBUG_VOID_RETURN; > +} > + > + > +void LEX::free_arena_for_set_stmt() > +{ > + DBUG_ENTER("LEX::free_arena_for_set_stmt"); > + if (!arena_for_set_stmt) > + return; > + DBUG_PRINT("info", ("mem_root: 0x%lx arena: 0x%lx", > + (ulong) arena_for_set_stmt->mem_root, > + (ulong) arena_for_set_stmt)); > + arena_for_set_stmt->free_items(); > + free_root(arena_for_set_stmt->mem_root, MYF(0)); > + delete(arena_for_set_stmt->mem_root); > + delete(arena_for_set_stmt); Eh... The arena is allocated in the memroot. I don't think you can free the memroot before the arena. Probably something like this: MEM_ROOT *memroot= arena_for_set_stmt->mem_root; delete arena_for_set_stmt; free_root(memroot, MYF(0)); delete memroot; > + arena_for_set_stmt= 0; > + DBUG_VOID_RETURN; > +} > + > void LEX::restore_set_statement_var() > { > DBUG_ENTER("LEX::restore_set_statement_var"); > @@ -4243,7 +4291,9 @@ void LEX::restore_set_statement_var() > DBUG_PRINT("info", ("vars: %d", old_var_list.elements)); > sql_set_variables(thd, &old_var_list, false); > old_var_list.empty(); > + free_arena_for_set_stmt(); > } > + DBUG_ASSERT(!is_arena_for_set_stmt()); the indentation is broken like this in many parts of the patch. May be that's because you've forwarded it with your MUA... > DBUG_VOID_RETURN; > } > > diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc > index 5af700b..ae831d0 100644 > --- a/sql/sql_parse.cc > +++ b/sql/sql_parse.cc > @@ -1956,6 +1958,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, > > /* Check that some variables are reset properly */ > DBUG_ASSERT(thd->abort_on_warning == 0); > + thd->lex->restore_set_statement_var(); too bad you had to put these restore_set_statement_var, reset_arena_for_set_stmt, free_arena_for_set_stmt, etc everywhere explicitly. > DBUG_RETURN(error); > } > Regards, Sergei

2 2