July 2013 - developers - lists.mariadb.org

[Maria-developers] Extendet FederatedX storage engine to support updating Sphinx RT indexes
by Markus Lidel 12 Jun '14

12 Jun '14

Hello, the Sphinx Search engine has RT indexes, which could be updated with a subset of SQL commands, refered to as SphinxQL: http://sphinxsearch.com/docs/2.1.1/sphinxql-reference.html Because the FederatedX storage engine uses some commands, which Sphinx does not know, here is a patch, wich extends the FederatedX storage engine to support this subset of commands. Now its possible to update Sphinx RT indexes directly from MariaDB. To create a connection to the RT index in the Sphinx default RT-index: index rt { type = rt path = @CONFDIR@/data/rt rt_field = title rt_field = content rt_attr_string = title rt_attr_string = content rt_attr_uint = gid } you just have to call: CREATE TABLE `rt` ( `id` BIGINT UNSIGNED NOT NULL, `title` TEXT, `content` TEXT, `gid` INT UNSIGNED ) ENGINE=FEDERATED CONNECTION='sphinxql://root@localhost:9306/rt'; It would be great, if the attached patch could be integrated into MariaDB. If you have any suggestions, please feel free to contact me. Best regards, Markus Lidel

4 8

[Maria-developers] Flashback Feature patch review
by Lixun Peng 22 Aug '13

22 Aug '13

Hi Monty, I patched my flashback feature to 10.0-base, and this is the diff file, please help me to review it. How to use this feature? I added several new arguments for mysqlbinlog: --flashback (-B), it will let mysqlbinlog working on FLASHBACK mode. --table (-T), it likes -d, but this argument is for table. --review, it will le mysqlbinlog print the SQL for reviewing. Reviewing feature will create a new "review" table to record the data that will be changed by FLASHBACK feature. If you aren't special the --review-dbname/tablename, "review" table will created on current DB, and the table name will be "__"+original_table_name. And for getting the original table struct, mysqlbinlog need to connect mysql, so --user/--host/--password is needed if necessary. --review-dbname, the DB that you want to store the review table. --review-tablename the TABLE that you want to store the changed data. Only if you set -T, this argument is useful. For example: I have a table "t" in database "test", CREATE TABLE `t` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `info` varchar(32) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=9043880 DEFAULT CHARSET=utf8; And I done this operation, root@localhost : (none) 14:52:50> reset master; root@localhost : (none) 14:53:02> use test root@localhost : test 14:53:08> delete from t limit 10; root@localhost : test 14:53:25> insert into t (info) select "你好"; root@localhost : test 14:54:01> update t set info ='hello你好' limit 5; We can compare the output with --flashback or not. #client/mysqlbinlog /data/mysqldata_10.0/binlog/mysql-bin.000001 -vv -d test -T t --start-datetime="2013-03-27 14:54:00" > /tmp/1.sql #client/mysqlbinlog /data/mysqldata_10.0/binlog/mysql-bin.000001 -vv -uroot -d test -T t --start-datetime="2013-03-27 14:54:00" -B --review > /tmp/2.sql How to implement Flashback: 1. mysqlbinlog tool can parse the binlog files and print them, so we can use the most of code in mysqlbinlog. 2. Changing the event type (INSERT -> DELETE, DELETE -> INSERT) 3. Exchanging the SET/WHERE part in UPDATE (UPDATE table SET x=1 WHERE y=2 -> UPDATE table SET y=2 WHERE x=1) 4. Invert the event output, from end to beginning (binlog: e1,e2,e3... -> flashback_log: en...e3,e2,e1) Then, importing the flashback output can flashback database/table to the special time. But binlog_format should be ROW. Thanks, Lixun -- Senior MySQL Developer @ Taobao.com Mobile Phone: +86 18658156856 (Hangzhou) Gtalk: penglixun(at)gmail.com Twitter: http://www.twitter.com/plinux Blog: http://www.penglixun.com

2 3

[Maria-developers] ALTER ONLINE TABLE syntax
by Sergei Golubchik 18 Aug '13

18 Aug '13

Hi, You've added this ALTER ONLINE TABLE syntax, where ONLINE de facto means "without copying the data". Now, after 5.6 merge we also have ALGORITHM=COPY|INPLACE and LOCK=NONE|SHARED|EXCLUSIVE. I've mapped ONLINE to ALGORITHM=INPLACE, because that's what it means. But it's confusing, one can have an "inplace" operation under an exclusive lock, if the engine wants it that way. And it won't be "online" by any stretch of imagination. One can also technically have a "copy" operation with a very permissive write-allow-write lock, and it'll be as online as one can get it. I mean, logically ONLINE should mean LOCK=NONE, not ALGORITHM=INPLACE. But that would change the existing behavior and the test results too. For example, *any* ALTER on the temporary table would always be "online", because, well, it wouldn't take any lock on that table. Alternatively, we can keep ONLINE as ALGORITHM=INPLACE, and deprecate it, issue a warning, suggesting to use the new 5.6 syntax. Opinions? Regards, Sergei

5 7

[Maria-developers] 10.x compatibility and separate namespace
by Honza Horak 13 Aug '13

13 Aug '13

Hi Guys, since 10.x won't be compatible with mysql in every aspect any more, I'm wondering if there happen to be any plans to move all compatibility left-overs (client binary names, client library name, daemon binary name, etc.). Are there any such ideas? I understand that we would lose the compatibility for any later (keeping original names was mentioned in [1] as a MUST for compatibility), but when keeping the original names, it could become tricky to say which tools are compatible and which not any more in mariadb 10+. How this information will be provided actually? How to get users informed properly, which tools are not compatible any more? And a bit another POV -- is the incompatibility in 10.x strictly limited to the server only (so client side will stay compatible for anytime later)? [1] https://lists.launchpad.net/maria-discuss/msg00658.html Regards, Honza

3 2

[Maria-developers] RFC: Compile-time checking for unmatched DBUG_ENTER/LEAVE via unused variable
by Jeremy Cole 11 Aug '13

11 Aug '13

Maria developers/captains, Prior to posing it as a final patch contribution or opening a JIRA ticket, I wanted to propose this idea. The attached patch adds what amounts to compile-time checking for unmatched DBUG_ENTER/DBUG_LEAVE (DBUG_RETURN, DBUG_VOID_RETURN) by introducing a variable in DBUG_ENTER which is only used in DBUG_LEAVE. This allows any compiler which can robustly detect unused variables to detect the mismatch at compile-time. There is already a run-time check for this case, but it is somewhat limited as it requires _db_return_ to be called in order to detect the mismatch, and this is in practice not always the case. Particularly three cases allow this to escape detection: 1. Some instrumented functions are called only from non-instrumented functions. 2. Some instrumented functions are called only from non-returning functions, such as abort or die functions. 3. Some instrumented functions are called from functions who call my_end or my_thread_end (making cs unavailable) before returning. In any case please see the attached DRAFT patch for a full implementation of the idea. Note one bit of ugliness is that non-returning functions, after this patch, must be marked explicitly as DBUG_ENTER_NO_RETURN -- this actually is not really a bad thing, though in and of itself. Regards, Jeremy

4 4

[Maria-developers] Is it a bug?
by Alexey Botchkov 09 Aug '13

09 Aug '13

Hi, SerG. The code in sql/sql_plugin.cc function read_maria_plugin_info() sym= dlsym(plugin_dl->handle, maria_plugin_declarations_sym); ... if (plugin_dl->mariaversion != MARIA_PLUGIN_INTERFACE_VERSION) { ... if ((sym= dlsym(plugin_dl->handle, maria_sizeof_st_plugin_sym))) sizeof_st_plugin= *(int *)sym; ... if (sizeof_st_plugin != sizeof(st_mysql_plugin)) { ... sym= cur; } } plugin_dl->plugins= (struct st_maria_plugin *)sym; So that when we enter the first 'if' but not the second (sizeof_st_plugin == sizeof(st_mysql_plugin) the sym still points at the maria_sizeof_st_plugin_sym which makes a bad st_maria_plugin pointer. I think it's a bug, isn't it? Best regards. HF

2 1

Re: [Maria-developers] [Commits] Rev 3772: MDEV-4645: Incorrect reads of frozen binlog events; FDE corrupted in relay log in file:///home/bell/maria/bzr/work-maria-10.0-MDEV-4548/
by Jeremy Cole 08 Aug '13

08 Aug '13

Sanja, Re: https://mariadb.atlassian.net/browse/MDEV-4645 Re: http://lists.askmonty.org/pipermail/commits/2013-July/005093.html I saw your commit on the commits list (sorry, wasn't on the list before the mail went out, so I can't reply directly to that message). A couple of points related to the commit: - You seem to have an error in the get_header_len, as it's implemented only in the base class, and you've left functions with the correct signature for it but the wrong names in the two frozen classes (they were left named has_fixed_minimal_header). This would mean the change is completely broken. :) - The change to get_header_len I think is in general fine, although it does alter the point of the whole thing -- there is again no way to exactly identify which events have frozen headers, programmatically (i.e. you can't differentiate them from events who just "happen" to have header_len = LOG_EVENT_MINIMAL_HEADER_LEN). I think that doesn't matter for this patch, but does defeat the point of what I was trying to add. - I don't really understand why you've made the hex printing code so complex and completely unreadable (IMHO). This is not performance-sensitive code and in my opinion should favor readability over performance. All you seem to have saved in this change is to avoid printing some static formatting characters ("#", "|", spaces, etc.) inside the loop. However, I can hardly even figure out what it's supposed to be doing now. - Additionally, you've changed the output slightly -- normally the ASCII character section prints its ending "|" immediately after the last character; it seems now to be fixed position (leaving extra spaces before "|". This differs from the output of hexdump, and it somewhat ambiguous/confusing. - You've mixed tabs and spaces. :( Regards, Jeremy

2 8

Re: [Maria-developers] [Commits] Rev 3215: MDEV-4823: Server crashes in Item_func_not::fix_fields on creating a table with a virtual column using NOT in file:///home/bell/maria/bzr/work-maria-5.2-MDEV-4823/
by Sergei Petrunia 31 Jul '13

31 Jul '13

Hi Sanja, On Tue, Jul 30, 2013 at 11:00:59AM +0300, sanja(a)montyprogram.com wrote: > At file:///home/bell/maria/bzr/work-maria-5.2-MDEV-4823/ > > ------------------------------------------------------------ > revno: 3215 > revision-id: sanja(a)montyprogram.com-20130730080057-ylgl6h11l2b3yflc > parent: wlad(a)montyprogram.com-20130709202457-6n9syq59jdd2sy3b > committer: sanja(a)montyprogram.com > branch nick: work-maria-5.2-MDEV-4823 > timestamp: Tue 2013-07-30 11:00:57 +0300 > message: > MDEV-4823: Server crashes in Item_func_not::fix_fields on creating a table with a virtual column using NOT > > fix_field() call protocol was brocken (zero pointer passed as link to item which is possible only if you are sure that there can not be Items which transforms). ... > === modified file 'sql/table.cc' > --- a/sql/table.cc 2013-01-16 00:46:27 +0000 > +++ b/sql/table.cc 2013-07-30 08:00:57 +0000 > @@ -1812,7 +1812,7 @@ bool fix_vcol_expr(THD *thd, > bool result= TRUE; > TABLE_LIST tables; > TABLE_LIST *save_table_list, *save_first_table, *save_last_table; > - int error; > + int error= 0; > Name_resolution_context *context; > const char *save_where; > char* db_name; > @@ -1860,7 +1860,13 @@ bool fix_vcol_expr(THD *thd, > save_use_only_table_context= thd->lex->use_only_table_context; > thd->lex->use_only_table_context= TRUE; > /* Fix fields referenced to by the virtual column function */ > - error= func_expr->fix_fields(thd, (Item**)0); > + if (!func_expr->fixed) > + error= func_expr->fix_fields(thd, (Item**)&vcol_info->expr_item); There is no need to use (Item**) cast, please remove it. Ok to push after that. > + > + /* fix_fields could change the expression */ > + func_expr= vcol_info->expr_item; > + /* Number of columns will be checked later */ > + > /* Restore the original context*/ > thd->lex->use_only_table_context= save_use_only_table_context; > context->table_list= save_table_list; > BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] Plugin security
by Leif Walsh 31 Jul '13

31 Jul '13

Hi, I'm working on adding a plugin API (not exactly a storage engine API, rather an extension one) to TokuMX[1] and I'm looking for advice on security. The basic idea is fairly simple: a plugin is a shared library (we're only targeting Linux right now, by the way) that defines a symbol to bootstrap the loading of additional functionality. We have an admin-only command that calls dlopen and dlsym to load the plugin. I haven't read any of the MariaDB plugin code yet, so pointers to where to start reading would be appreciated. Apart from that, I'm just looking for any advice from you all about what to watch out for. My concerns break down into two main areas: 1. When loading a single plugin, what should I watch out for? The command itself is admin-only so calling it is protected, but what about an attacker that drops a malicious plugin in a directory earlier on the load path? What should I check about the permissions/owner of the library file and the directory in which it lives? Is erroring out on world-writable libraries enough? If my process is setuid, should I be more careful? What does Maria do here? 2. About plugin persistence/autoloading: I understand MariaDB has a system table that tracks which plugins are installed and automatically loads those on startup. I believe I can do the same thing in TokuMX and I can restrict access to that collection to the admin user. What does MariaDB store in that table and how does it use it? I could imagine storing the checksum of the installed plugin in the system table and verifying it before loading the plugin, but this seems rather draconian and it might make plugin upgrades too difficult. Does MariaDB verify the permissions of the data files that store this system table? I could imagine an attack where you would replace this system table with one that includes instructions to load your malicious plugin, while the server is offline. Again, how does MariaDB solve these problems? Another option is to autoload all libraries in some directory, and to just be very careful about the permissions of that directory, but this seems very hard to get totally right so I'm leaning away from it. [1]: http://www.tokutek.com/products/tokumx-for-mongodb -- Cheers, Leif

3 5

[Maria-developers] Master slave
by Richard Couture 30 Jul '13

30 Jul '13

Is it possible to set up replication in such a manner as to permit writing records to either a master or a slave replica? We want to set up a fail safe replica that can easily take over when our connection to the main replica fails, which, unfortunately, is fairly often. I read a document, some time ago which mentioned several types of replication, i.e.: by record, by table ... and the pitfalls, like IDs not necessarily matching... which confused me more than anything else... Can someone point me to some good documentation to enable me to pick the correct type of replication that I need to accomplish my task?? Thanks Richard -- LinuxCabal Asociación Civil Ing. Richard Couture Novell CNE, ECNE, MCNE HP/Compaq ASE Tel.: (+52) (333) 145-2638 Cel.: (+52) (044) 333 377-7505 Cel.: (+52) (044) 333 377-7506 Web: http://www.LinuxCabal.org E-Mail: rrc(a)linuxcabal.org Hosted en la nube Cloud Sigma - www.CloudSigma.com AVISO DE CONFIDENCIALIDAD: Este correo electrónico, incluyendo en su caso, los archivos adjuntos al mismo, pueden contener información de carácter confidencial y/o privilegiada, y se envían a la atención única y exclusivamente de la persona y/o entidad a quien va dirigido. La copia, revisión, uso, revelación y/o distribución de dicha información confidencial sin la autorización por escrito de LinuxCabal está prohibida. Si usted no es el destinatario a quien se dirige el presente correo, favor de contactar al remitente respondiendo al presente correo y eliminar el correo original incluyendo sus archivos, así como cualesquiera copia del mismo. Mediante la recepción del presente correo usted reconoce y acepta que en caso de incumplimiento de su parte y/o de sus representantes a los términos antes mencionados, LinuxCabal tendrá derecho a los daños y perjuicios que esto le cause.

1 0

Re: [Maria-developers] Implementing implicit primary key in mysql server
by Lixun Peng 30 Jul '13

30 Jul '13

Hi Sergei, You are right, let users add primary key is best. But I can't let users who don't want to create primary key can't use our MySQL service. Amazon RDS also allow users to create the tables without primary key, just change binlog_format to MIXED to solve replication problem. I think this feature is very useful for any MySQL cloud service providers, all of them will face this problem in one day. I will try to do some analysis/research in this feature implement first, I will need your help :-) I will notice any new updates in this email. Thanks, Lixun On Wed, Jun 19, 2013 at 5:14 PM, Sergei Golubchik <serg(a)mariadb.org> wrote: > Hi, Lixun! > > On Jun 18, Lixun Peng wrote: > > Hi, > > > > As we know, InnoDB has implicit primary key if a table hasn't defined > > a primary key. However MySQL server doesn't know this primary key, so > > this primary key will not apear in binlog. > > > > When we are using ROW format binlog for replication, if a table has no > any > > indexes, that's a disaster. If a table without indexes do a DML > > (UPDATE/DELETE), of course it will run a long time in master, but in > slave, > > it still need a long time. It will cause serious slave replication delay. > ... > > I think mysql server can do the same thing as InnoDB do, if user doesn't > > define the primary key, mysql can add the primary key automatically. > > > > How do you think? > > Well, that's doable. A much easier solution would be to require a user > to create a primary key. It's a one-line change: > > - Table_flags ha_table_flags() const { return cached_table_flags; } > + Table_flags ha_table_flags() const { return cached_table_flags | > HA_REQUIRE_PRIMARY_KEY; } > > But what you suggest is possible too, I believe. > > Regards, > Sergei > -- Senior Database Engineer @ Taobao.com Mobile Phone: +86 18658156856 (Hangzhou) Gtalk: penglixun(at)gmail.com Twitter: http://www.twitter.com/plinux Blog: http://www.penglixun.com

4 8

Re: [Maria-developers] [Commits] Rev 3792: main.gis test fixed. in file:///home/hf/wmar/10.0-serg/
by Sergey Vojtovich 27 Jul '13

27 Jul '13

Hi Alexey, I just checked 5.6 and 10.0-base, this test is passing as is. I'm a bit worried that something functional was broken during the merge. Regards, Sergey 26.07.2013, в 16:13, <holyfoot(a)askmonty.org> написал(а): > At file:///home/hf/wmar/10.0-serg/ > > ------------------------------------------------------------ > revno: 3792 > revision-id: holyfoot(a)askmonty.org-20130726110356-9s17c1kw558ls14a > parent: svoj(a)mariadb.org-20130726091143-o2v0tt08n81n923m > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: 10.0-serg > timestamp: Fri 2013-07-26 16:03:56 +0500 > message: > main.gis test fixed. > === modified file 'mysql-test/r/gis.result' > --- a/mysql-test/r/gis.result 2013-03-27 09:03:28 +0000 > +++ b/mysql-test/r/gis.result 2013-07-26 11:03:56 +0000 > @@ -918,25 +918,25 @@ SELECT Overlaps(@horiz1, @point2) FROM D > Overlaps(@horiz1, @point2) > 0 > DROP TABLE t1; > -create table t1(f1 geometry, f2 point, f3 linestring); > +create table t1(f1 geometry, f2 linestring, f3 linestring); > select f1 from t1 union select f1 from t1; > f1 > -insert into t1 (f2,f3) values (GeomFromText('POINT(1 1)'), > +insert into t1 (f2,f3) values (GeomFromText('LINESTRING(1 1, 2 2)'), > GeomFromText('LINESTRING(0 0,1 1,2 2)')); > select AsText(f2),AsText(f3) from t1; > AsText(f2) AsText(f3) > -POINT(1 1) LINESTRING(0 0,1 1,2 2) > +LINESTRING(1 1,2 2) LINESTRING(0 0,1 1,2 2) > select AsText(a) from (select f2 as a from t1 union select f3 from t1) t; > AsText(a) > -POINT(1 1) > +LINESTRING(1 1,2 2) > LINESTRING(0 0,1 1,2 2) > create table t2 as select f2 as a from t1 union select f3 from t1; > desc t2; > Field Type Null Key Default Extra > -a point YES NULL > +a linestring YES NULL > select AsText(a) from t2; > AsText(a) > -POINT(1 1) > +LINESTRING(1 1,2 2) > LINESTRING(0 0,1 1,2 2) > drop table t1, t2; > SELECT 1; > > === modified file 'mysql-test/t/gis.test' > --- a/mysql-test/t/gis.test 2013-03-27 09:03:28 +0000 > +++ b/mysql-test/t/gis.test 2013-07-26 11:03:56 +0000 > @@ -609,9 +609,9 @@ DROP TABLE t1; > # > # Bug#28763: Selecting geometry fields in UNION caused server crash. > # > -create table t1(f1 geometry, f2 point, f3 linestring); > +create table t1(f1 geometry, f2 linestring, f3 linestring); > select f1 from t1 union select f1 from t1; > -insert into t1 (f2,f3) values (GeomFromText('POINT(1 1)'), > +insert into t1 (f2,f3) values (GeomFromText('LINESTRING(1 1, 2 2)'), > GeomFromText('LINESTRING(0 0,1 1,2 2)')); > select AsText(f2),AsText(f3) from t1; > select AsText(a) from (select f2 as a from t1 union select f3 from t1) t; > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

1 0

[Maria-developers] we have seen sporadic crashes in the Protocol::net_store_data function
by Rich Prohaska 26 Jul '13

26 Jul '13

Crash occurs when using the TokuDB storage engine in MySQL 5.5.30. Any insight into what may be causing this problem would be really nice. Sorry, but this is all the info that i have. Here is a stack trace from the mysql error log: #1 0x00000000006b760f in handle_fatal_signal (sig=11) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/signal_handler.cc:247 #2 <signal handler called> #3 0x00007ff213a3b447 in __strncasecmp_l_sse2 () from /lib64/libc.so.6 #4 0x00000000005651a7 in Protocol::net_store_data (this=0x0, this@entry=0x7ff18f01e4b8, from=0x0, length=1936615494) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/protocol.cc:59 #5 0x00000000005662e4 in Protocol::store_string_aux (this=this@entry=0x7ff18f01e4b8, from=<optimized out>, length=<optimized out>, fromcs=<optimized out>, tocs=tocs@entry=0x1022920 <my_charset_latin1>) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/protocol.cc:960 #6 0x00000000005663a5 in Protocol_text::store (this=0x7ff18f01e4b8, field=<optimized out>) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/protocol.cc:1119 #7 0x0000000000565ea0 in Protocol::send_result_set_row (this=0x7ff18f01e4b8, row_items=<optimized out>) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/protocol.cc:847 #8 0x000000000059fc37 in select_send::send_data (this=0x7fe338243b60, items=...) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_class.cc:2184 #9 0x00000000005f920c in end_send (join=0x7fe77f4a4010, join_tab=<optimized out>, end_of_records=<optimized out>) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_select.cc:12762 #10 end_send (join=0x7fe77f4a4010, join_tab=<optimized out>, end_of_records=<optimized out>) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_select.cc:12739 #11 0x00000000005e8a32 in evaluate_join_record (join=join@entry=0x7fe77f4a4010, join_tab=join_tab@entry=0x7fe77f470a60, error=<optimized out>) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_select.cc:11925 #12 0x00000000005e8c36 in sub_select (join=0x7fe77f4a4010, join_tab=0x7fe77f470a60, end_of_records=<optimized out>) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_select.cc:11778 #13 0x00000000005f681d in do_select (join=join@entry=0x7fe77f4a4010, fields=fields@entry=0x7ff18f020130, table=table@entry=0x0, procedure=0x0) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_select.cc:11543 #14 0x000000000060655e in JOIN::exec (this=0x7fe77f4a4010) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_select.cc:2385 #15 0x0000000000602095 in mysql_select (thd=thd@entry=0x7ff18f01e000, rref_pointer_array=rref_pointer_array@entry=0x7ff18f0201f8, tables=<optimized out>, wild_num=<optimized out>, fields=..., conds=<optimized out>, og_num=0, order=0x0, group=0x0, having=0x0, proc_param=0x0, select_options=2147748608, result=result@entry=0x7fe338243b60, unit=0x7ff18f01fa00, select_lex=select_lex@entry=0x7ff18f020020) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_select.cc:2604 #16 0x0000000000608235 in handle_select (thd=0x7ff18f01e000, lex=0x7ff18f01f950, result=0x7fe338243b60, setup_tables_done_option=0) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_select.cc:297 #17 0x00000000005c23d1 in execute_sqlcom_select (thd=thd@entry=0x7ff18f01e000, all_tables=0x7fe338243270) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_parse.cc:4604 #18 0x00000000005ca700 in mysql_execute_command (thd=thd@entry =0x7ff18f01e000) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_parse.cc:2154 #19 0x00000000005cd7c2 in mysql_parse (parser_state=0x7ff21213a7e0, thd=0x7ff18f01e000, rawbuf=<optimized out>, length=<optimized out>) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_parse.cc:5641 #20 mysql_parse (thd=0x7ff18f01e000, rawbuf=<optimized out>, length=65, parser_state=0x7ff21213a7e0) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_parse.cc:5565 #21 0x00000000005cebcc in dispatch_command (command=COM_QUERY, thd=0x7ff18f01e000, packet=<optimized out>, packet_length=65) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_parse.cc:1041 #22 0x000000000066495f in do_handle_one_connection (thd_arg=thd_arg@entry =0x7ff18f01e000) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_connect.cc:853 #23 0x0000000000664a11 in handle_one_connection (arg=0x7ff18f01e000) at mysql-5.5.30-tokudb-7.0.1-linux-x86_64-build/mysql-5.5.30-tokudb-7.0.1/sql/sql_connect.cc:772 #24 0x00007ff214711851 in start_thread () from /lib64/libpthread.so.0

1 0

[Maria-developers] help with mdev-4687 - aria engina problem with <= operator
by Roberto Spadim 26 Jul '13

26 Jul '13

hi guys i have a problem with aria https://mariadb.atlassian.net/browse/MDEV-4687 some queries that depend on <= operator don't return right rows (return different from myisam or innodb) i'm getting back to myisam, or innodb these are read intensive tables, and innodb runs slower, and myisam have a crash safe problem (but runs...) please any help is very wellcome thanks guys -- Roberto Spadim

2 4

[Maria-developers] innodb key comparisons
by Rich Prohaska 25 Jul '13

25 Jul '13

i am interested in the performance of in memory join queries on tokudb and innodb and, for innodb, i would like to know how many key comparisons were needed when running the query. i counted the number of calls to a function called "cmp_dtuple_rec_with_match". does this include ALL of the key comparisons? thanks rich prohaska

1 0

[Maria-developers] Documentation for old regex library calls
by Sudheera Palihakkara 25 Jul '13

25 Jul '13

Hi all, I'm replacing the current regular expression library with modern library(pcre) for mariadb. I need some information about the ways that code uses the old regex library. The relevant codes are in sql/item_cmpfunc.cc directory. For exapmle in the function : int Item_func_regex::regcomp(bool send_error) I can't understand most of the lines, and the code is not well-commented. In the new library(pcre) uses different way to compile a regEx so I have to understand this and code for pcre preserving the functionalists of the class. Is there any documentation for this file or the way they used to work with old regex library ? thanks. -- *Sudheera Palihakkara.* Undergraduate Department of *Computer Science and Engineering, *Faculty of Engineering, *University of Moratuwa*, Sri Lanka.

2 2

[Maria-developers] some bugs in dingqing parallel replication
by nanyi607rao 22 Jul '13

22 Jul '13

Hi,guys I have worked on this branch https://code.launchpad.net/~knielsen/maria/dingqi-parallel-replication for some days, and found bugs listed below.May this would be helpful to you. 1, when slave switch on table filter,this bug could lead server crash. how to reappear: on slave set replicate-wild-ignore-table = test.t5 in config file on master do these operations CREATE TABLE test.t3 (a INT AUTO_INCREMENT PRIMARY KEY, b DECIMAL(20,20), c INT); SET INSERT_ID=1; SET @c=2; SET @@rand_seed1=10000000, @@rand_seed2=1000000; INSERT INTO t3 VALUES (NULL, RAND(), @c); codes lead this bug: In execute_single_transaction() case RAND_EVENT: need_remove_from_trans= true; if(!rli->is_deferred_event(ev)) delete ev; break; reason: Rand Event object is deleted in execute_single_transaction(), but it's pointer would be used is slave_execute_deferred_events() later. 2, SQL thread could read and apply some log events repeated. how to reappear: it's a little hard to reappear. if you set max_relay_log_size=100M and keep SQL thread closed to IO thread, this bug may reappear. codes lead this bug: In reopen_relay_log() rli->event_relay_log_pos= max(rli->event_relay_log_pos, BIN_LOG_HEADER_SIZE); my_b_seek(cur_log,rli->event_relay_log_pos); reason: when SQL thread use a hot log,but the hot log was closed by IO thread just recently, SQL thread need to reopen this log and set read offset to rli->event_relay_log_pos, while rli->event_relay_log_pos could be set new value in other thread for there are many threads apply log events.so rli->event_relay_log_pos could be less then rli->future_event_relay_log_pos. 3, SQL thread do not report error information in result of "show slave status"and replication do not stop, when the slave insert duplicate record into a table with primary key. how to reappear: Just need to change master_log_pos to read duplicate records from master. codes lead this bug: In execute_single_transaction() retry_transaction: ev= trans->event_list_head; ... ... if (ret && rli->trans_retries < slave_trans_retries) { ... goto retry_transaction; } reason: as I have sayed in other email: Rows_log_event::do_apply_event() do twice but return different results for m_curr_row==m_rows_end in the second time. 4, when do oparetions such as "show slave status" and "stop slave", it could be blocked for a long time. how to reappear: just do "show slave status" again and again. codes lead this bug: In the queue_event() case FORMAT_DESCRIPTION_EVENT: ... wait_for_all_dml_done(&mi->rli, true); and in process_io_rotate() wait_for_all_dml_done(&mi->rli, true); reason: IO thread could wait in wait_for_all_dml_done() while holding the rpl_mi->data_lock, so operations like "show slave status" could be blocked for waiting rpl_mi->data_lock. 5, "START SLAVE UNTIL" make replication stop in different place. how to reappear: suppose log events in relay log like: BEGIN; ------->pos1 LOG_EVENT1; LOG_EVENT2; COMMIT; ------>pos2 BEGIN; ------>pos3 LOG_EVENT3; --->stop_pos LOG_EVENT4; COMMIT; ------>pos4 If we do START SLAVE UNTIL relay_log_pos=stop_pos; The replication should stop at pos4 but it stop pos2. 6, log_event->thd is wrong. suppose log_event was read is thread_1 so the log_event->thd==thread_1, but this log_event may be dispatch to other thread (suppose thread_2).the log_event is applyed in thread_2 but the log_event->thd==thread_1.this problem can make log event apply failed in MySQL, but in mariaDB it seems ok. 2013-07-19 nanyi607rao

2 1

[Maria-developers] RFC getting information from image (blob)
by Roberto Spadim 21 Jul '13

21 Jul '13

Hi guys, i will implement a gis system, but my problem isn't gis, my problem is raster (bitmap) images I will save images at mariadb using longblobs And i will create a table with, datetime and image I will need read each r,g,b value from each pixel, example.. Select rvalue(1,2,loadimage(blobfield)) >From table Order by datetime Rvalue= red value of x1 and y2 What's the faster or at least, how to use less cpu and memory I didn't search about images udf functions for mysql Any help is wellcome and ideas too :) Well i will use others sum, max, min functions too I don't want to read all images at client side, i want that server do this job I don't know the image size (it can be any pratical size, max near to 16mega pixels), image format could be png, jpg, or another one but i can use client side to rewrite image file to right format I'm considering implement some imagemagick functions inside mariadb, what you think? Thanks guys

2 2

[Maria-developers] Make error - cannot find -lregex
by Sudheera Palihakkara 21 Jul '13

21 Jul '13

Hi all, I have done some editing to sql/item_cmpfunc.cc file and CMakeList filesand then when I run the make command( after running cmake) it halts with this error in the middle. ([68%]) Linking CXX executable explain_filename-t /usr/bin/ld.bfd.real: cannot find -lregex collect2: error: ld returned 1 exit status make[2]: *** [unittest/mysys/explain_filename-t] Error 1 make[1]: *** [unittest/mysys/CMakeFiles/explain_filename-t.dir/all] Error 2 make: *** [all] Error 2 what might have gone wrong. :( -- *Sudheera Palihakkara.* Undergraduate Department of *Computer Science and Engineering, *Faculty of Engineering, *University of Moratuwa*, Sri Lanka.

2 3

[Maria-developers] Structure of MariaDB 10.0 binary logs
by Giuseppe Maxia 20 Jul '13

20 Jul '13

Hi, Where can I find a detailed structure of the binary logs supported by MariaDB 10.0.x? Specifically, I would like to know * what are the differences between binary logs in MariaDB 5.5 and 10.0 * what are the differences between binary logs in MariaDB 10.0 and MySQL 5.6. The purpose of this request id to parse the binary logs for usage in external applications. Thanks Giuseppe

2 2

[Maria-developers] Help about patchs in mariadb - jira and lauchpad url
by Roberto Spadim 18 Jul '13

18 Jul '13

Hi guys, where patchs are commited in mariadb? for example this one: https://mariadb.atlassian.net/browse/MDEV-617 it don't have a link to any patch, there's a link to any lauchpad code? -- Roberto Spadim

2 5

[Maria-developers] MariaDB 5.5.32 Release Prep
by Daniel Bartholomew 18 Jul '13

18 Jul '13

All, I've begun the prep work for the MariaDB 5.5.32 release. The packages are uploaded and the mirrors should start picking them up soon. The draft changelog and release notes are here: - https://kb.askmonty.org/en/mariadb-5532-changelog/ - https://kb.askmonty.org/en/mariadb-5532-release-notes/ Please let me know ASAP if there's anything that needs to be mentioned/highlighted/removed/etc... Assuming all goes well, the plan is to activate the release at around 12:00 US Eastern Time tomorrow (18 Jul 2013). Thanks. -- Daniel Bartholomew Google+ - http://gplus.to/dbart Twitter - http://twitter.com/daniel_bart MariaDB: An Enhanced Drop-in Replacement for MySQL Website - http://mariadb.org Twitter - http://twitter.com/mariadb Google+ - http://google.com/+mariadb Facebook - http://fb.com/MariaDB.dbms Knowledgebase - http://kb.askmonty.org

2 4

Re: [Maria-developers] [Commits] Rev 3839: Fix of using uninitialized variadle. in file:///home/bell/maria/bzr/work-maria-5.5-valgrind/
by Sergei Petrunia 18 Jul '13

18 Jul '13

Hi Sanja, On Thu, Jul 18, 2013 at 11:16:21AM +0300, sanja(a)montyprogram.com wrote: > At file:///home/bell/maria/bzr/work-maria-5.5-valgrind/ > > ------------------------------------------------------------ > revno: 3839 > revision-id: sanja(a)montyprogram.com-20130718081618-6ax63urznfnqmzgt > parent: sanja(a)montyprogram.com-20130717140359-123bw8dzelj6wddn > committer: sanja(a)montyprogram.com > branch nick: work-maria-5.5-valgrind > timestamp: Thu 2013-07-18 11:16:18 +0300 > message: > Fix of using uninitialized variadle. > === modified file 'sql/sql_select.cc' > --- a/sql/sql_select.cc 2013-07-17 13:42:13 +0000 > +++ b/sql/sql_select.cc 2013-07-18 08:16:18 +0000 > @@ -15674,6 +15674,8 @@ create_internal_tmp_table_from_heap2(THD > const char *save_proc_info; > int write_err= 0; > DBUG_ENTER("create_internal_tmp_table_from_heap2"); > + if (is_duplicate) > + *is_duplicate= FALSE; > > if (table->s->db_type() != heap_hton || > error != HA_ERR_RECORD_FILE_FULL) > > === modified file 'sql/sql_union.cc' > --- a/sql/sql_union.cc 2013-07-16 05:22:17 +0000 > +++ b/sql/sql_union.cc 2013-07-18 08:16:18 +0000 > @@ -83,7 +83,7 @@ int select_union::send_data(List<Item> & > */ > return -1; > } > - bool is_duplicate; > + bool is_duplicate= FALSE; If you do the part in create_internal_tmp_table_from_heap2(), is this change really necessary? > /* create_internal_tmp_table_from_heap will generate error if needed */ > if (table->file->is_fatal_error(write_err, HA_CHECK_DUP) && > create_internal_tmp_table_from_heap(thd, table, > Ok to push either way. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] LDAP authentication plugin
by Sergei 18 Jul '13

18 Jul '13

Hi, Ilija! On Jul 11, Ilija Lazarevic wrote: > Hi Sergei, > > The reason I'm writing you is because I'm interested > in details about this gsoc2013 proposal, and I saw you were > supposed to be the mentor. > > Is it open for contributing apart from gsoc? Yes, it is. But please, write to maria-developers(a)lists.launchpad.net next time, not to me personally. Regards, Sergei

3 2

[Maria-developers] help creating error messages
by Roberto Spadim 16 Jul '13

16 Jul '13

hi guys, how could i create a new error / warning message in mariadb? 1) how to add the message text to error list (there's a list, right?) 2) how to return (send) a error to client 3) how to add a message to 'warning list' and after get it with SHOW WARNINGS maybe some example or point lines / files that i should read thanks guys :) -- Roberto Spadim

2 5

[Maria-developers] More enum values in enum fields
by Roberto Spadim 16 Jul '13

16 Jul '13

Hi guys, i have a problem, that i don't know how to easly solve (ok i know but i want the user easy way) i have a ENUM column with some values (today 248 distinct values) i see that in a near future i will have more than 65535 different values inside this enum column, the first solution is change it to varchar, but my problem will be data size the enum is very optimized in size, a char is 'converted' to a smallint value my second solution is a int column, and a external table with int/text values, but here i need to change apps, i don't want the second one, but i don't want a very big database (char column) how could i change the limit of enum size? maybe a new enum2 type? with a limit of bigint value (64bits), ok maybe less (32bits) today (reading code) i see that big enum is a problem for .frm file that don't allow this size of enums and i need to get back to a second table, but what should be done to allow a very big enum field? there's a "easy" way to change mariadb code to allow a bigger enum size? thanks guys -- Roberto Spadim

4 19

[Maria-developers] The funcation of retry_transaction in parallen replication
by nanyi607rao 16 Jul '13

16 Jul '13

hi, In order to test "retry_transaction" in function execute_single_transaction(), I change Relay_log_pos to make SQL thread insert Duplicate entry, but I find it successed and do not report error! so I debug the function execute_single_transaction() and find the reason : at first time, the insert Rows_log_event::do_apply_event() return 121, that means insert fails. But when retry the insert Rows_log_event::do_apply_event(),it return 0, that means insert success! it seems the Rows_log_event::do_apply_event() do twice, but return different results. how this happened? is it a bug of Rows_log_event::do_apply_event() ? By the way, I do this test in mysql-5.5.30, do mariaDB has the some problem? 2013-07-12 nanyi607rao

3 3

[Maria-developers] What issue tracker should we use?
by Roberto Spadim 16 Jul '13

16 Jul '13

hi guys, i see that mariadb have three issue tracker, i'm right? i saw the https://askmonty.org/worklog/Server-RawIdeaBin/?tid=145 (ask monty), jira, and lauchpad what issue tracker should be used? there's any idea porting the others issue to the main issue tracker? -- Roberto Spadim SPAEmpresarial

3 4

[Maria-developers] Reserved words
by Ian Gilfillan 14 Jul '13

14 Jul '13

How can one find a definitive list of reserved words for a particular version? The comments in sql/lex.h say that that's a list of all reserved words and functions, but it appears to contain some words that are neither (such as ACTION). SELECT * FROM mysql.help_keyword also lists ACTION ACTION is listed in the MYSQL docs as an example of one of the keywords that MySQL permits "because many people previously used them"

2 1

[Maria-developers] Pluggable authentication, custom error messages
by Vladislav Vaintroub 14 Jul '13

14 Jul '13

Hi Serg, is there any possibility to return own error messages and codes , if pluggable authentication failed on client on some reason ? Case in point here is Kerberos (GSSAPI or SSPI) - it may fail on client or on server, with some GSSAPI/SSPI specific code. We would like user to know what exactly happened , rather than return a generic CR_ERROR. Perhaps user can fix the situation - maybe he just needs to obtain Kerberos ticket with kinit, or login as Windows domain user, or something like that. If error happens on the server side, at least there it is possible to write to error log. But on the client side, there is no error log, and writing to stdout/err is not a good idea. Is there a trick that allows custom messages on the client? Wlad

2 2

[Maria-developers] MariaDB 10/trunk (re)install destructively overwrites existing my.cnf* @ spec'd SYSCONFDIR
by darx＠sent.com 14 Jul '13

14 Jul '13

Hi, I've a custom my.cnf ls -al /usr/local/etc/mariadb/my.cnf -rw-r--r--+ 1 root root 7.9K Jul 13 13:03 /usr/local/etc/mariadb/my.cnf If I (re)install mariadb 10/trunk from a src build with SYSCONFDIR spec'd for that dir, as done similarly to a MySQL build, cd mariadb/bld cmake .. \ ... -DINSTALL_SYSCONFDIR=/usr/local/etc/mariadb \ ... make make install The INSTALL process *destructively* overwrites the existing my.cnf ... -- Up-to-date: /usr/local/etc/mariadb/logrotate.d/mysql -- Up-to-date: /usr/local/etc/mariadb/init.d/mysql -- Installing: /usr/local/etc/mariadb/my.cnf <================================ !! -- Up-to-date: /usr/local/etc/mariadb/my.cnf.d/client.cnf -- Up-to-date: /usr/local/etc/mariadb/my.cnf.d/mysql-clients.cnf -- Up-to-date: /usr/local/etc/mariadb/my.cnf.d/server.cnf ... with an older default cnf, ls -al /usr/local/etc/mariadb/my.cnf -rw-r--r--+ 1 root root 202 Jul 12 11:31 /usr/local/etc/mariadb/my.cnf with no backup made of the existing cnf, find /usr/local/etc/mariadb -type f -name 'my.cnf*' /usr/local/etc/mariadb/my.cnf This is critically different behavior that MySQL. If that's intended, how are we to exec a mariadb install without overwriting our config files/dirs? If it's not, I suspect this should be fixed. Thanks.

2 2

[Maria-developers] building MariaDB 10/trunk with external SSL generates errors/warnings. Docs are inconsistent. What's the right procedure?
by darx＠sent.com 13 Jul '13

13 Jul '13

hi, building cd /usr/local/src/mariadb bzr log | head -n 5 ------------------------------------------------------------ revno: 3766 [merge] committer: Alexander Barkov <bar(a)mariadb.org> branch nick: maria-10.0.ms timestamp: Wed 2013-07-10 18:46:33 +0400 reading ./BUILD/SETUP.sh ... 120 # SSL library to use.--with-ssl will select our bundled yaSSL # implementation of SSL. To use OpenSSL you will need to specify # the location of OpenSSL headers and libs on your system. # Ex --with-ssl=/usr <================================= OK, do this SSL_LIBRARY=--with-ssl ... configuring @ `cmake` cd /usr/local/src/mariadb rm -rf bld mkdir bld cd bld cmake .. \ -DWITH_SSL=/usr/local/ssl \ -DOPENSSL_INCLUDE_DIR=/usr/local/ssl/include \ -DOPENSSL_SSL_LIBRARY=/usr/local/ssl/lib64/libssl.so \ -DOPENSSL_CRYPTO_LIBRARY=/usr/local/ssl/lib64/libcrypto.so fails, returning, ... CMake Error at cmake/ssl.cmake:90 (MESSAGE): Wrong option for WITH_SSL. Valid values are : yes, no, bundled Call Stack (most recent call first): CMakeLists.txt:260 (MYSQL_CHECK_SSL) ... -- Configuring incomplete, errors occurred! vi ../CmakeLists.txt ... # Add bundled or system zlib. MYSQL_CHECK_ZLIB_WITH_COMPRESS() # Optionally add bundled yassl/taocrypt or system openssl. 260 MYSQL_CHECK_SSL() # Add readline or libedit. MYSQL_CHECK_READLINE() checking vi cmake/ssl.cmake ... # MYSQL_CHECK_SSL # # Provides the following configure options: # WITH_SSL=[yes|no|bundled] MACRO (MYSQL_CHECK_SSL) IF(NOT WITH_SSL) IF(WIN32) CHANGE_SSL_SETTINGS("bundled") ELSE() CHANGE_SSL_SETTINGS("no") ENDIF() ENDIF() IF(WITH_SSL STREQUAL "bundled") MYSQL_USE_BUNDLED_SSL() ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL STREQUAL "yes") # Check for system library SET(OPENSSL_FIND_QUIETLY TRUE) INCLUDE(FindOpenSSL) FIND_LIBRARY(CRYPTO_LIBRARY crypto) MARK_AS_ADVANCED(CRYPTO_LIBRARY) INCLUDE(CheckSymbolExists) SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) CHECK_SYMBOL_EXISTS(SHA512_DIGEST_LENGTH "openssl/sha.h" HAVE_SHA512_DIGEST_LENGTH) SET(CMAKE_REQUIRED_INCLUDES) IF(OPENSSL_FOUND AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH) SET(SSL_SOURCES "") SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY}) SET(SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR}) SET(SSL_INTERNAL_INCLUDE_DIRS "") SET(SSL_DEFINES "-DHAVE_OPENSSL") CHANGE_SSL_SETTINGS("system") ELSE() IF(WITH_SSL STREQUAL "system") MESSAGE(SEND_ERROR "Cannot find appropriate system libraries for SSL. Use WITH_SSL=bundled to enable SSL su ENDIF() MYSQL_USE_BUNDLED_SSL() ENDIF() ELSEIF(NOT WITH_SSL STREQUAL "no") MESSAGE(SEND_ERROR "Wrong option for WITH_SSL. Valid values are : yes, no, bundled") ENDIF() ENDMACRO() there's no accommodation for "--with-ssl=/path/to/ssl/install". If I instead cmake .. \ -DWITH_SSL=yes \ -DOPENSSL_INCLUDE_DIR=/usr/local/ssl/include \ -DOPENSSL_SSL_LIBRARY=/usr/local/ssl/lib64/libssl.so \ -DOPENSSL_CRYPTO_LIBRARY=/usr/local/ssl/lib64/libcrypto.so it returns, ... -- Running cmake version 2.8.11.1 -- MariaDB 10.0.3 -- Packaging as: mariadb-10.0.3-Linux-x86_64 -- Found OpenSSL: /usr/local/ssl/lib64/libssl.so;/usr/local/ssl/lib64/libcrypto.so (found version "1.0.1e") ... -- Configuring done then a bunch of these messages: ... CMake Warning at cmake/plugin.cmake:184 (ADD_LIBRARY): Cannot generate a safe runtime search path for target feedback because files in some directories may conflict with libraries in implicit directories: runtime library [libcrypto.so.1.0.0] in /usr/lib64 may be hidden by files in: /usr/local/ssl/lib64 Some of these libraries may not be found correctly. Call Stack (most recent call first): plugin/feedback/CMakeLists.txt:20 (MYSQL_ADD_PLUGIN) CMake Warning at cmake/libutils.cmake:259 (ADD_LIBRARY): Cannot generate a safe runtime search path for target libmysql because files in some directories may conflict with libraries in implicit directories: runtime library [libcrypto.so.1.0.0] in /usr/lib64 may be hidden by files in: /usr/local/ssl/lib64 Some of these libraries may not be found correctly. Call Stack (most recent call first): libmysql/CMakeLists.txt:374 (MERGE_LIBRARIES) CMake Warning at client/CMakeLists.txt:78 (ADD_EXECUTABLE): Cannot generate a safe runtime search path for target async_example because files in some directories may conflict with libraries in implicit directories: runtime library [libcrypto.so.1.0.0] in /usr/lib64 may be hidden by files in: /usr/local/ssl/lib64 Some of these libraries may not be found correctly. ... What's the right method to find/use external SSL libs/headers in a MariaDB build without errors or warnings? --darx

2 1

[Maria-developers] Doubts about index and optimization
by Roberto Spadim 13 Jul '13

13 Jul '13

Hi guys i have two doubts... First the r-tree index Could i index two integer or float or decimal columns using rtree And queries like X>=1 and x<=2 and y>=1 and y<=2 Be optimized using rtree? Another doubt... i dont have a mariadb now to test, i'm in cellphone... this kind of query is optimized if i have a x,y btree index? Btree will use x only, or x and y? Second doubt I'm thinking about enum rewrite optimzation and i didn't write anything yet, just studying mariadb code... When using queries like this Where x<=5 Or where x>=5 Or without = part Does mysql know what's the max and min value of x, and rewrite it to something X<=5. To. X in (0,1,2,3,4,5) when x is a integer for example and min(x)=0 I'm thinking about this, in conditions like the rtree optimization, example... we could optimize x and y with something like X>1 and x<5 and y>1 and y<5 to X in (2,3,4) and y in (2,3,4) It's something like enum optimization but using integers and max min informations Well i don't know the full code but i didn't found this information (i don't remember at least) Anyone know something about this in source? If not i will consider this optimization when doing the enum optimization (i don't remember the mdev number now, but anyone interested in this optimization can search in jira and find it, i reported and done any job yet just the raw and high implementation idea) Thanks guys

1 0

[Maria-developers] OLAP
by Roberto Spadim 12 Jul '13

12 Jul '13

Hi guys, there's any good OLAP tool for mariadb? maybe one that we could package with mariadb as default? -- Roberto Spadim

2 5

[Maria-developers] Status on MDEV-4506, parallel replication
by Kristian Nielsen 12 Jul '13

12 Jul '13

So I have been working for some weeks now on implementing MDEV-4506. This task is about making the slave apply (some) events in parallel threads, to speed up replication and reduce the risk of slave not being able to keep up with a busy master. Events are applied in parallel on the slave if they were group-committed together on the master. This is an easy way to detect transactions that are independent. Note that this is transparent to applications; while transactions are executed in parallel on the slave, they are still committed in the same order as on the master. I also added parallel execution of events with different GTID domain id. This makes testing a lot easier (no need to carefully arrange timing to get a specific group commit on the master), and also really is the whole point of much of my hard work on GTID. So if we have multi-source M1->S1, M2->S1, and S1->S2, then S2 will be able to execute events from M1 in parallel with those from M2, just like S1 can. And the user can explicitly set the domain_id different for eg. a long-running ALTER or UPDATE, and this way get it to run in parallel and not cause a huge replication delay. ---- On the master, I added to each GTID event a commit_id. If two transactions group-commit together, they are binlogged with the same commit_id; if not, they get different commit_ids. Thus, the slave can detect the possibility of executing two transactions in parallel by checking if the commit_ids are equal. On the master, I implemented --binlog-commit-wait-count=N and --binlog-commit-wait-usec=T. A transaction will wait at most T microseconds for at least N transactions to queue up and be ready for group commit. This allows to deliberately delay transactions on the master in order to get bigger group commits and thus better opportunity for parallel execution (and again it makes testing easier). On the slave, I implemented --slave-parallel-threads=N. If N>0, that many threads will be spawned, and events will be executed in parallel (if possible) by those threads. ---- The current code is pushed here (it is based on 10.0-base): lp:~maria-captains/maria/10.0-knielsen It is still far from finished, but it now works sufficiently that I could do some basic benchmarking (just on my laptop, completely unscientifically). First, I prepared a binlog on the master with plenty of opportunity for parallel replication. I started the master with --binlog-commit-wait-count=20 --binlog-commit-wait-usec=1000000. I then ran this Gypsy script: ----------------------------------------------------------------------- i|1|DROP TABLE IF EXISTS t1 i|1|CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(100)) ENGINE=InnoDB p|1|REPLACE INTO t1 (a,b) VALUES (? MOD 10000, ?)|int,varchar /home/knielsen/my/gypsy/words ----------------------------------------------------------------------- gypsy --queryfile=simple_replace_load.gypsy --duration=20 --threads=40 This results in a binlog with about 65k updates to the table, group-committed in batches of 20 transactions. I then started a fresh slave and let it replicate everything with START SLAVE UNTIL; the time to replicate all the events is then easy to see in the slave error log. The time to replicate everything with unmodified 10.0-base was 99 seconds. With --slave-parallel-threads=25, it was just 22 seconds. So that is a 4.5 times speedup, which is quite promising. Also note that at 22 seconds, the slave is within 10% of the speed of the master. ---- But as I said, there is still significant work left to do. I put a ToDo list at the top of sql/rpl_parallel.cc. Some of the big remaining issues: 1. The existing code is not thread-safe for class Relay_log_info. This class contains a bunch of stuff that is specific to executed transactions, not related to relay-log at all. This needs to be moved to the new struct rpl_group_info I introduced, and all code updated to pass around a pointer to that struct instead. There may also be a need to add additional locking on Relay_log_info, existing code needs review for this. 2. Error handling needs to be implemented, it is rather more complex in the parallel case. If one transaction fails (and retry also fails), then we need to somehow get hold of all later transactions that are in the process of parallel execution, and abort them + roll them back. Otherwise we get inconsistent binlog position for the next slave restart. 3. In the old code, when the SQL thread is stopped, it has logic to let the current event group (=transaction) replicate to completeness first, with a timeout to force a stop in the middle of the event group if eg. the master has disappeared. This logic needs to be re-implemented to work when having any number of event groups executing in parallel. (It is important to let the groups complete execution when doing non-transactional stuff that cannot be rolled back, otherwise again the slave position becomes inconsistent for next slave restart). So as you see, there is quite a bit of work left on this (as well as on GTID). So I would very much welcome any help on this to avoid causing delays for 10.0-GA ... - Kristian.

1 0

[Maria-developers] a bug of ding-qing parallel replication
by nanyi607rao 11 Jul '13

11 Jul '13

hi guys, I find a bug of ding-qing parallel replication. let's consider a table like this: create table t1( a int(11) NOT NULL DEFAULT '0', b varchar(10), PRIMARY KEY (a) )ENGINE=InnoDB if we do transactions on master(binlog_format=ROW) like this: trans 1: begin; insert into t1 values(1, "tt"); update t1 set a=2 where a=1; commit; trans 2; begin; update t1 set b="kk" where a=2; commit; then this two transactions binlog transmit to the slave, because trans 1 and trnas 2 has different primary keys, it would disaptch in different threads like this: thread 1 do trans 1 thread 2 do trans 2 thread 2 may update t1 before thread 1, then it will fail. maybe thread 2 can retry sever times ,but it don't solve this problem compeletly.. 2013-07-11 nanyi607rao

3 2

[Maria-developers] deferred_event
by nanyi607rao 10 Jul '13

10 Jul '13

Hi guys, as I know, when replication filter used, the defered events is a container hold on events(such as Intvar-, Rand-, User_var- log_event)that be applied delay. why those events need be applied delay? and what is parent Query mentioned in codes? Thanks! 2013-07-10 nanyi607rao

2 1

[Maria-developers] buildbot config
by Leif Walsh 09 Jul '13

09 Jul '13

Hi, I'm learning buildbot and I was wondering if I could take a look at the master.cfg for buildbot.askmonty.org as a reference for learning common practices and things like that. Is it available somewhere? -- Cheers, Leif

2 2

[Maria-developers] merge for MySQL56 FSP data types
by Alexander Barkov 09 Jul '13

09 Jul '13

Hi Serg, Please review the patch merging MySQL-5.6 fractional second precision enabled data types. Thanks.

3 7

[Maria-developers] Connect: compilation warnings
by Alexander Barkov 08 Jul '13

08 Jul '13

Hi Oliver, I fixed almost all compilation warnings that happened in Connect on my Fedora 17 laptop with gcc-4.7.2. Most of them were "variable is initialized but not used" and "no previous declaration". There were not serious, but very unpleasant for developers. (Note, we try to keep the tree in a shape that it compiles without warnings. Connect must follow this rule as well!!!) I think there was a bug in one place: how SQLSetStmtAttr() was called. See "bzr diff -c 3827" for details. The value of m_RowsetSize was erroneously passed, but SQLSetStmtAttr() expects the address of a SQLUINT variable (not a value!). See the ODBC docs for the details: http://msdn.microsoft.com/en-us/library/windows/desktop/ms712631%28v=vs.85%… One compilation warning still remains: maria-10.0-connect/storage/connect/tabsys.cpp:279:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] It looks like a bug. Cast from 4-byte integer to 8-byte pointer is obviously wrong. Please address the problem. Thanks.

1 0

[Maria-developers] Warning in dynamic columns code
by Sergei Petrunia 08 Jul '13

08 Jul '13

Hi Sanja, I have been seeing this warning on a number of platforms: 10.0-monty/sql/item_strfunc.cc: In member function ‘virtual bool Item_func_dyncol_create::fix_fields(THD*, Item**)’: 10.0-monty/sql/item_strfunc.cc:3887: warning: suggest a space before ‘;’ or explicit braces around empty body in ‘for’ statement I assume it is harmless, but just in case, passing it over to you. Could you please check it and get rid of it? Thanks Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1

[Maria-developers] SO_REUSEPORT and mariadb
by Roberto Spadim 08 Jul '13

08 Jul '13

hi guys, i was reading the SO_REUSEPORT of kernel 3.9, and i didn't found it in mariadb maybe we could use it? here are the SO_REUSEPORT topics: https://lwn.net/Articles/542629/ http://linux.dell.com/files/presentations/Linux_Plumbers_Conf_2010/Scaling_… here the important parts: ------------------ 1)The first of the traditional approaches is to have a single listener thread that accepts all incoming connections and then passes these off to other threads for processing. The problem with this approach is that the listening thread can become a bottleneck in extreme cases. In early discussions<http://thread.gmane.org/gmane.linux.network/102140/focus=102150> on SO_REUSEPORT, Tom noted that he was dealing with applications that accepted 40,000 connections per second. Given that sort of number, it's unsurprising to learn that Tom works at Google. 2)The second of the traditional approaches used by multithreaded servers operating on a single port is to have all of the threads (or processes) perform an accept() call on a single listening socket in a simple event loop of the form: while (1) { new_fd = accept(...); process_connection(new_fd); } ------------------ i didn -- Roberto Spadim

1 1

[Maria-developers] Replication
by Roberto Spadim 05 Jul '13

05 Jul '13

hi guys, i don't know if it's the better place to ask... maybe in user list is the right one, please tell me what's better... i'm using replication, and i need to mark all tables that don't replicate, it's very sad boring time consuming, etc etc... there's a easier way to mark tables? maybe alter table xxxx REPLICATION=ON/OFF if not, could we add this feature? thanks guys -- Roberto Spadim

1 0

[Maria-developers] Developer course
by Roberto Spadim 05 Jul '13

05 Jul '13

hi guys, there's a internal mysql/mariadb developer course? i'm studying source, but it's a bit difficult understand what's the best class/methods to use, maybe a course could help me developing and understanding better the source any one know about a course like it? i will focus on query rewrite (select.cc), optimizer (opt_range.cc/opt_*) and partition engine, others engine (myisam,heap,innodb,aria) is not my priority now -- Roberto Spadim

2 3

[Maria-developers] Review request : MDEV-573 (mysqlreport update)
by Jean Weisbuch 04 Jul '13

04 Jul '13

Hi, I have been doing modifications to the MariaDB mysqlreport version (which is shipped on the Debian/Ubuntu packages and can be found on the debian/additions/ directory), especially to add stats/informations about MariaDB specific functions but also to fix some bugs and limitations of the tool. As of today, the script works without throwing a warning and seems to output correct informations on MariaDB 5.5 (either with or without threadpool and binary log activated), MariaDB 5.5 + TokuDB, MySQL 5.1, MySQL 5.5 and it solves some small bugs and issues that could lead warning messages, invalid values returned or truncated values. The main additions are the AriaDB pagecache stats, binlog cache stats, subquery cache stats, TokuDB stats and Threadpool stats. There are also some "cosmetic" changes/fixes : the addition of values such as the % of disk tables used or the InnoDB read "From file" modified to "From disk" as of the documentation of the status variables states ; values such as the threads cache size or the table cache size that were limited to 3 chars are now limited to 5 chars ; the per seconds stats was truncated to 5 chars max on Questions and Query Cache sections (for example 153.6k/s was truncated to 153.6/s). The JIRA task : https://mariadb.atlassian.net/browse/MDEV-573 The GIT repository where i put the latest revisions (i only have been using it lately but i commented all the changes and bugfixes along the time on the JIRA task and could provide older revisions/diff if required) : https://github.com/jb-boin/mariadb/blob/5.5.30/debian/additions/mysqlreport I would like to be sure that the values/stats i added are really useful to monitor (and the calculations of these correct) and that the way informations are shown, named and ordered is clear enough ; for example, the way the test that determines if its a MariaDB or a MySQL server might not be the best possible (it checks if the Aria engine is available). There is still an upstream bug on the "Questions" and the "SELECT and Sort" section, the %Total values are not correctly calculated and lead to values > 100%, i havent got time to give it a look yet and i included in the example output below values hitting that bug. Here is an example of the output of the latest revision on a server having about all the possible functions enabled (values are mixed from different servers) : MariaDB 5.5.30-tokudb-7.0.1 uptime 70 9:4:47 Thu Jul 4 01:48:24 2013 __ Key _________________________________________________________________ Buffer used 651.41M of 1.00G %Used: 63.61 Current 675.43M %Usage: 65.96 Write hit 79.79% Read hit 99.99% __ Questions ___________________________________________________________ Total 2.57M 0.4/s -Unknown 39.92M 6.6/s %Total: 1550.4 DMS 39.78M 6.5/s 1545.3 Com_ 2.71M 0.4/s 105.09 COM_QUIT 444 0.0/s 0.02 Slow 4 s 285 0.0/s 0.01 %DMS: 0.00 Log: OFF DMS 39.78M 6.5/s 1545.3 UPDATE 39.76M 6.5/s 1544.5 99.95 SELECT 21.11k 0.0/s 0.82 0.05 REPLACE 0 0/s 0.00 0.00 DELETE 0 0/s 0.00 0.00 INSERT 0 0/s 0.00 0.00 Com_ 2.71M 0.4/s 105.09 show_proces 2.51M 0.4/s 97.33 admin_comma 152.51k 0.0/s 5.92 show_status 9.23k 0.0/s 0.36 __ Rows ________________________________________________________________ Rows 186.00G 240.3k/s Using idx 168.06G 217.1k/s %Index: 90.35 Rows/question 158.90 __ SELECT and Sort _____________________________________________________ Scan 42.33k 0.0/s %SELECT: 200.53 Range 0 0/s 0.00 Full join 19.27k 0.0/s 91.29 Range check 0 0/s 0.00 Full rng join 0 0/s 0.00 Sort scan 0 0/s Sort range 0 0/s Sort mrg pass 0 0/s __ Table Locks _________________________________________________________ Waited 8.86M 11.4/s %Total: 0.46 Immediate 1.93G 2.5k/s __ Tables ______________________________________________________________ Open 6843 of 8192 %Cache: 83.53 Opened 14.14k 0.0/s __ Connections _________________________________________________________ Max used 5403 of 22000 %Max: 24.56 Total 176.48M 228.0/s __ Created Temp ________________________________________________________ Disk table 7.76k 0.0/s %Disk: 14.55 Table 53.38k 0.0/s Size: 64.0M File 12 0.0/s __ Threads _____________________________________________________________ Running 274 of 2788 Created 181.68k 0.2/s Slow 0 0/s Threadpool 892 of 1200 %Used: 74.33 Running 458 of 1200 %Running: 38.17 Idle 434 of 1200 %Idle: 36.17 __ Aborted _____________________________________________________________ Clients 5.03k 0.0/s Connects 3.65k 0.0/s __ Bytes _______________________________________________________________ Sent 1.51T 1.9M/s Received 445.91G 576.0k/s __ InnoDB Buffer Pool __________________________________________________ Usage 25.97G of 26.00G %Usage: 99.89 Read hit 100.00% Pages Free 1.83k %Total: 0.11 Data 1.67M 98.23 %Drty: 0.07 Misc 28381 1.67 Latched 0 0.00 Reads 527.54G 681.5k/s From disk 100.00k 0.1/s %Disk: 0.00 Ahead Rnd 0 0/s Writes 5.21G 6.7k/s Flushes 17.35M 22.4/s Wait Free 9 0.0/s %Wait: 0.00 __ InnoDB Lock _________________________________________________________ Waits 36660726 47.4/s Current 0 Time acquiring Total 627441780 ms Average 171 ms Max 1537520 ms __ InnoDB Data, Pages, Rows ____________________________________________ Data Reads 512.26k 0.7/s Writes 181.92M 235.0/s fsync 2.07M 2.7/s Pending Reads 0 Writes 0 fsync 0 Pages Created 3.72M 4.8/s Read 512.18k 0.7/s Written 17.35M 22.4/s Rows Deleted 175.85M 227.2/s Inserted 200.46M 259.0/s Read 174.52G 225.4k/s Updated 224.40M 289.9/s __ Aria Pagecache ______________________________________________________ Buffer used 3.43M of 512.00M %Used: 0.67 Current 20.26M %Usage: 3.96 Write hit 47.09% Read hit 99.96% __ Subquery Cache ______________________________________________________ Hit ratio 99.91% Hits 38.63G 49.9k/s Miss 35.97M 46.5/s __ Binary Log Cache _____________________________________________________ Disk use Transactional 0.43% Non transactional 0.50% __ TokuDB ______________________________________________________________ Cachetable 4.00G of 4.00G %Usage: 99.99 Miss 1.83M 0.3/s Evictions 1.95M 0.3/s Thanks in advance, Jean Weisbuch

1 0

Re: [Maria-developers] Rev 3824: MDEV-4472 Audit plugin
by Sergei Golubchik 03 Jul '13

03 Jul '13

Hi, Holyfoot! Generally, it looks pretty good. One comment, see below about MARIADB_ONLY. On Jul 02, holyfoot(a)askmonty.org wrote: > revno: 3824 > revision-id: holyfoot(a)askmonty.org-20130702213841-xwmzadaotzxqhz2k > parent: sergii(a)pisem.net-20130701155424-lx0dvaocejx0cn8l > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev-4472 > timestamp: Wed 2013-07-03 02:38:41 +0500 > message: > MDEV-4472 Audit plugin. > Plugin implemented in plugin/server_audit/server_audit.c. > Rotating log file support modified to be mysql-service. > === added directory 'plugin/server_audit' > === added file 'plugin/server_audit/CMakeLists.txt' > --- a/plugin/server_audit/CMakeLists.txt 1970-01-01 00:00:00 +0000 > +++ b/plugin/server_audit/CMakeLists.txt 2013-07-02 21:38:41 +0000 > @@ -0,0 +1,16 @@ > +# Copyright (C) 2012 Monty Program Ab. > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; version 2 of the License. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program; if not, write to the Free Software > +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > + > +MYSQL_ADD_PLUGIN(server_audit server_audit.c MODULE_ONLY) I'd remove MODULE_ONLY, if the plugin can be complied as a static plugin. No need to add artificial restrictions. > === added file 'plugin/server_audit/server_audit.c' > --- a/plugin/server_audit/server_audit.c 1970-01-01 00:00:00 +0000 > +++ b/plugin/server_audit/server_audit.c 2013-07-02 21:38:41 +0000 ... > +#ifndef MARIADB_ONLY > +#define MYSQL_SERVICE_LOGGER_INCLUDED > +#endif /*MARIADB_ONLY*/ Is MARIADB_ONLY normally defined? As far as I can see, it's not. So in the packages this plugin won't have MARIADB_ONLY. That's ok in your tree, but let's think about how to solve this before pushing into the main tree. Regards, Sergei

2 1

[Maria-developers] merge for MySQL56 temporal literals
by Alexander Barkov 03 Jul '13

03 Jul '13

Hi Serg, Please review the patch merging MySQL-5.6 temporal literals. Thanks.

3 4

[Maria-developers] MDEV-4667 DATE('string') incompability between mysql and mariadb
by Alexander Barkov 03 Jul '13

03 Jul '13

Hi Serg, my review comments for http://bazaar.launchpad.net/~maria-captains/maria/5.3-serg/revision/3665 The patch looks ok. Just a couple of small comments: > === modified file 'include/my_time.h' > --- include/my_time.h 2011-12-11 09:34:44 +0000 > +++ include/my_time.h 2013-07-03 07:46:20 +0000 > @@ -68,14 +68,17 @@ > #endif > > /* Flags to str_to_datetime */ > -#define TIME_FUZZY_DATE 1 > + > +/* > + TIME_FUZZY_DATES is used for the result will only be used for comparison > + purposes. Conversion is as relaxed as possible. > +*/ > +#define TIME_FUZZY_DATES 1 > #define TIME_DATETIME_ONLY 2 > #define TIME_TIME_ONLY 4 > -/* Must be same as MODE_NO_ZERO_IN_DATE */ > -#define TIME_NO_ZERO_IN_DATE (65536L*2*2*2*2*2*2*2) > -/* Must be same as MODE_NO_ZERO_DATE */ > -#define TIME_NO_ZERO_DATE (TIME_NO_ZERO_IN_DATE*2) > -#define TIME_INVALID_DATES (TIME_NO_ZERO_DATE*2) > +#define TIME_NO_ZERO_IN_DATE (1UL << 23) /* == MODE_NO_ZERO_IN_DATE */ > +#define TIME_NO_ZERO_DATE (1UL << 24) /* == MODE_NO_ZERO_DATE */ > +#define TIME_INVALID_DATES (1UL << 25) /* == MODE_INVALID_DATES */ > > #define MYSQL_TIME_WARN_TRUNCATED 1 > #define MYSQL_TIME_WARN_OUT_OF_RANGE 2 > > === modified file 'libmysql/libmysql.c' > --- libmysql/libmysql.c 2013-01-10 14:40:21 +0000 > +++ libmysql/libmysql.c 2013-07-03 07:46:20 +0000 > @@ -3549,7 +3549,7 @@ > case MYSQL_TYPE_TIME: > { > MYSQL_TIME *tm= (MYSQL_TIME *)buffer; > - str_to_time(value, length, tm, TIME_FUZZY_DATE, &err); > + str_to_time(value, length, tm, 0, &err); > *param->error= test(err); > break; > } > @@ -3558,7 +3558,7 @@ > case MYSQL_TYPE_TIMESTAMP: > { > MYSQL_TIME *tm= (MYSQL_TIME *)buffer; > - (void) str_to_datetime(value, length, tm, TIME_FUZZY_DATE, &err); > + (void) str_to_datetime(value, length, tm, 0, &err); > *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE && > tm->time_type != MYSQL_TIMESTAMP_DATE); > break; > @@ -3681,9 +3681,7 @@ > case MYSQL_TYPE_DATETIME: > { > int error; > - value= number_to_datetime(value, 0, > - (MYSQL_TIME *) buffer, TIME_FUZZY_DATE, > - &error); > + value= number_to_datetime(value, 0, (MYSQL_TIME *) buffer, 0, &error); > *param->error= test(error); > break; > } > > === modified file 'mysql-test/r/adddate_454.result' > --- mysql-test/r/adddate_454.result 2012-08-29 15:55:59 +0000 > +++ mysql-test/r/adddate_454.result 2013-07-03 07:46:20 +0000 > @@ -4,6 +4,8 @@ > d > 2012-00-00 > update t1 set d = adddate(d, interval 1 day); > +Warnings: > +Warning 1292 Incorrect datetime value: '2012-00-00' > select * from t1; > d > NULL > > === modified file 'mysql-test/r/cast.result' > --- mysql-test/r/cast.result 2013-03-17 06:41:22 +0000 > +++ mysql-test/r/cast.result 2013-07-03 07:46:20 +0000 > @@ -268,37 +268,37 @@ > 0001-02-03 10:11:12 > select cast(120010203101112.121314 as datetime); > cast(120010203101112.121314 as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '120010203101112.121314' > select cast(cast(1.1 as decimal) as datetime); > cast(cast(1.1 as decimal) as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '1' > select cast(cast(-1.1 as decimal) as datetime); > cast(cast(-1.1 as decimal) as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '-1' > select cast('0' as date); > cast('0' as date) > -0000-00-00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '0' > select cast('' as date); > cast('' as date) > -0000-00-00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '' > select cast('0' as datetime); > cast('0' as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '0' > select cast('' as datetime); > cast('' as datetime) > -0000-00-00 00:00:00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '' > select cast('0' as time); > @@ -306,7 +306,7 @@ > 00:00:00 > select cast('' as time); > cast('' as time) > -00:00:00 > +NULL > Warnings: > Warning 1292 Truncated incorrect time value: '' > select cast(NULL as DATE); > @@ -323,13 +323,13 @@ > NULL > select cast(cast(120010203101112.121314 as double) as datetime); > cast(cast(120010203101112.121314 as double) as datetime) > -0000-00-00 00:00:00 > +NULL > select cast(cast(1.1 as double) as datetime); > cast(cast(1.1 as double) as datetime) > 0000-00-00 00:00:01 > select cast(cast(-1.1 as double) as datetime); > cast(cast(-1.1 as double) as datetime) > -0000-00-00 00:00:00 > +NULL > explain extended select cast(10 as double(5,2)); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used > @@ -764,4 +764,10 @@ > CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY > NULL > Warnings: > -Warning 1292 Truncated incorrect date value: '0000-00-00' > +Warning 1292 Incorrect datetime value: '0000-00-00' > +SET SQL_MODE=ALLOW_INVALID_DATES; > +SELECT DATE("foo"); > +DATE("foo") > +NULL > +Warnings: > +Warning 1292 Incorrect datetime value: 'foo' > > === modified file 'mysql-test/r/date_formats.result' > --- mysql-test/r/date_formats.result 2013-03-17 06:41:22 +0000 > +++ mysql-test/r/date_formats.result 2013-07-03 07:46:20 +0000 > @@ -586,7 +586,7 @@ > 1 AM > SELECT DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896); > DATE_FORMAT('%Y-%m-%d %H:%i:%s', 1151414896) > -1151414896 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '%Y-%m-%d %H:%i:%s' > select str_to_date('04 /30/2004', '%m /%d/%Y'); > > === modified file 'mysql-test/r/func_sapdb.result' > --- mysql-test/r/func_sapdb.result 2013-03-17 06:41:22 +0000 > +++ mysql-test/r/func_sapdb.result 2013-07-03 07:46:20 +0000 > @@ -168,7 +168,7 @@ > 1997-12-31 > select date("1997-13-31 23:59:59.000001"); > date("1997-13-31 23:59:59.000001") > -0000-00-00 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '1997-13-31 23:59:59.000001' > select time("1997-12-31 23:59:59.000001"); > @@ -176,7 +176,7 @@ > 23:59:59.000001 > select time("1997-12-31 25:59:59.000001"); > time("1997-12-31 25:59:59.000001") > -00:00:00 > +NULL > Warnings: > Warning 1292 Truncated incorrect time value: '1997-12-31 25:59:59.000001' > select microsecond("1997-12-31 23:59:59.000001"); > @@ -250,8 +250,6 @@ > select microsecond(19971231235959.01) as a; > a > 10000 > -Warnings: > -Warning 1292 Truncated incorrect time value: '19971231235959.01' > select date_add("1997-12-31",INTERVAL "10.09" SECOND_MICROSECOND) as a; > a > 1997-12-31 00:00:10.090000 > > === modified file 'mysql-test/r/func_time.result' > --- mysql-test/r/func_time.result 2013-06-17 15:25:55 +0000 > +++ mysql-test/r/func_time.result 2013-07-03 07:46:20 +0000 > @@ -1239,14 +1239,13 @@ > set time_zone= @@global.time_zone; > select str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE; > str_to_date('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE > -NULL > -Warnings: > -Error 1411 Incorrect datetime value: '10:00 PM' for function str_to_date > +22:10:00 > select str_to_date("1997-00-04 22:23:00","%Y-%m-%D") + interval 10 minute; > str_to_date("1997-00-04 22:23:00","%Y-%m-%D") + interval 10 minute > NULL > Warnings: > -Error 1411 Incorrect datetime value: '1997-00-04 22:23:00' for function str_to_date > +Warning 1292 Truncated incorrect date value: '1997-00-04 22:23:00' > +Warning 1292 Incorrect datetime value: '1997-00-04' > create table t1 (field DATE); > insert into t1 values ('2006-11-06'); > select * from t1 where field < '2006-11-06 04:08:36.0'; > @@ -1452,13 +1451,15 @@ > NULL > SELECT WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1); > WEEK(DATE_ADD(FROM_DAYS(1),INTERVAL 1 MONTH), 1) > -0 > +NULL > +Warnings: > +Warning 1292 Incorrect datetime value: '0000-00-00' > # > # Bug#12584302 AFTER FIX FOR #12403504: ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0, > # > DO WEEK((DATE_ADD((CAST(0 AS DATE)), INTERVAL 1 YEAR_MONTH)), 5); > Warnings: > -Warning 1292 Incorrect datetime value: '0' > +Warning 1292 Incorrect datetime value: '0000-00-00' > # > # BUG#13458237 INCONSISTENT HANDLING OF INVALIDE DATES WITH ZERO DAY > # SIMILAR TO '2009-10-00' > @@ -1755,7 +1756,7 @@ > Warning 1441 Datetime function: time field overflow > select cast('131415.123e0' as time); > cast('131415.123e0' as time) > -00:00:00 > +NULL > Warnings: > Warning 1292 Truncated incorrect time value: '131415.123e0' > select cast('2010-01-02 03:04:05' as datetime) between null and '2010-01-02 03:04:04'; > @@ -1775,12 +1776,12 @@ > NULL > select truncate(date('2010-40-10'), 6); > truncate(date('2010-40-10'), 6) > -0.000000 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '2010-40-10' > select extract(month from '2010-40-50'); > extract(month from '2010-40-50') > -0 > +NULL > Warnings: > Warning 1292 Incorrect datetime value: '2010-40-50' > select subtime('0000-00-10 10:10:10', '30 10:00:00'); > @@ -1858,6 +1859,8 @@ > select timestampadd(week, 1, f1) from t1; > timestampadd(week, 1, f1) > NULL > +Warnings: > +Warning 1292 Incorrect datetime value: '0000-00-00' > select timestampadd(week, 1, date("0000-00-00")); > timestampadd(week, 1, date("0000-00-00")) > NULL > > === modified file 'mysql-test/r/parser.result' > --- mysql-test/r/parser.result 2011-03-01 12:24:36 +0000 > +++ mysql-test/r/parser.result 2013-07-03 07:46:20 +0000 > @@ -555,14 +555,10 @@ > DROP TABLE IF EXISTS t1; > SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE; > STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL 10 MINUTE > -NULL > -Warnings: > -Error 1411 Incorrect datetime value: '10:00 PM' for function str_to_date > +22:10:00 > SELECT STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE; > STR_TO_DATE('10:00 PM', '%h:%i %p') + INTERVAL (INTERVAL(1,2,3) + 1) MINUTE > -NULL > -Warnings: > -Error 1411 Incorrect datetime value: '10:00 PM' for function str_to_date > +22:01:00 > SELECT "1997-12-31 23:59:59" + INTERVAL 1 SECOND; > "1997-12-31 23:59:59" + INTERVAL 1 SECOND > 1998-01-01 00:00:00 > > === modified file 'mysql-test/r/partition_pruning.result' > --- mysql-test/r/partition_pruning.result 2013-03-17 06:41:22 +0000 > +++ mysql-test/r/partition_pruning.result 2013-07-03 07:46:20 +0000 > @@ -1906,10 +1906,9 @@ > # test with an invalid date, which lead to item->null_value is set. > EXPLAIN PARTITIONS SELECT * FROM t1 WHERE b < CAST('2009-04-99' AS DATETIME); > id select_type table partitions type possible_keys key key_len ref rows Extra > -1 SIMPLE t1 p20090401 ALL NULL NULL NULL NULL 2 Using where > +1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables > Warnings: > Warning 1292 Incorrect datetime value: '2009-04-99' > -Warning 1292 Incorrect datetime value: '2009-04-99' > DROP TABLE t1; > CREATE TABLE t1 > (a INT NOT NULL AUTO_INCREMENT, > > === modified file 'mysql-test/r/type_date.result' > --- mysql-test/r/type_date.result 2013-06-28 08:00:25 +0000 > +++ mysql-test/r/type_date.result 2013-07-03 07:46:20 +0000 > @@ -136,7 +136,7 @@ > 1311 > select year(@d), month(@d), day(@d), cast(@d as date); > year(@d) month(@d) day(@d) cast(@d as date) > -0 0 0 0000-00-00 > +NULL NULL NULL NULL > Warnings: > Warning 1292 Incorrect datetime value: '1311' > Warning 1292 Incorrect datetime value: '1311' > > === modified file 'mysql-test/r/type_datetime.result' > --- mysql-test/r/type_datetime.result 2013-06-28 08:00:25 +0000 > +++ mysql-test/r/type_datetime.result 2013-07-03 07:46:20 +0000 > @@ -657,8 +657,8 @@ > insert into t1 values ('2000-12-03','22:55:23'),('2008-05-03','10:19:31'); > select case when d = '2012-12-12' then d else t end as cond, group_concat( d ) from t1 group by cond; > cond group_concat( d ) > -0000-00-00 00:00:00 2000-12-03 > -0000-00-00 00:00:00 2008-05-03 > +NULL 2000-12-03 > +NULL 2008-05-03 > Warnings: > Warning 1292 Incorrect datetime value: '22:55:23' > Warning 1292 Incorrect datetime value: '10:19:31' > > === modified file 'mysql-test/suite/vcol/r/vcol_misc.result' > --- mysql-test/suite/vcol/r/vcol_misc.result 2013-01-22 05:29:19 +0000 > +++ mysql-test/suite/vcol/r/vcol_misc.result 2013-07-03 07:46:20 +0000 > @@ -187,7 +187,11 @@ > tsv TIMESTAMP AS (ADDDATE(ts, INTERVAL 1 DAY)) VIRTUAL > ) ENGINE=MyISAM; > INSERT INTO t1 (tsv) VALUES (DEFAULT); > +Warnings: > +Warning 1292 Incorrect datetime value: '0000-00-00' > INSERT DELAYED INTO t1 (tsv) VALUES (DEFAULT); > +Warnings: > +Warning 1292 Incorrect datetime value: '0000-00-00' > FLUSH TABLES; > SELECT COUNT(*) FROM t1; > COUNT(*) > > === modified file 'mysql-test/t/cast.test' > --- mysql-test/t/cast.test 2012-05-20 12:57:29 +0000 > +++ mysql-test/t/cast.test 2013-07-03 07:46:20 +0000 > @@ -439,3 +439,6 @@ > # > SELECT CAST(TIME('10:20:30') AS DATE) + INTERVAL 1 DAY; > > +SET SQL_MODE=ALLOW_INVALID_DATES; > +SELECT DATE("foo"); > + > > === modified file 'sql-common/my_time.c' > --- sql-common/my_time.c 2012-06-08 17:15:01 +0000 > +++ sql-common/my_time.c 2013-07-03 07:46:20 +0000 > @@ -83,7 +83,7 @@ > { > if (not_zero_date) > { > - if ((((flags & TIME_NO_ZERO_IN_DATE) || !(flags & TIME_FUZZY_DATE)) && > + if (((flags & TIME_NO_ZERO_IN_DATE) && > (ltime->month == 0 || ltime->day == 0)) || ltime->neg || > (!(flags & TIME_INVALID_DATES) && > ltime->month && ltime->day > days_in_month[ltime->month-1] && > @@ -115,7 +115,7 @@ > length Length of string > l_time Date is stored here > flags Bitmap of following items > - TIME_FUZZY_DATE Set if we should allow partial dates > + TIME_FUZZY_DATE > TIME_DATETIME_ONLY Set if we only allow full datetimes. > TIME_NO_ZERO_IN_DATE Don't allow partial dates > TIME_NO_ZERO_DATE Don't allow 0000-00-00 date > @@ -1324,7 +1324,7 @@ > if (nr > 9999999 && neg == 0) > { > if (number_to_datetime(nr, sec_part, ltime, > - TIME_FUZZY_DATE | TIME_INVALID_DATES, was_cut) < 0) > + TIME_INVALID_DATES, was_cut) < 0) > return -1; > > ltime->year= ltime->month= ltime->day= 0; > > === modified file 'sql/field.cc' > --- sql/field.cc 2013-02-28 20:48:47 +0000 > +++ sql/field.cc 2013-07-03 07:46:20 +0000 > @@ -5127,10 +5127,9 @@ > Lazy_string_str str(from, len); > > func_res= str_to_datetime(from, len, &ltime, > - (TIME_FUZZY_DATE | > - (thd->variables.sql_mode & > + (thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), > + MODE_INVALID_DATES)), Why not to add a new method in THD to return these sql_mode datetime flags? These flags repeat many times. Something similar to sql_mode_for_dates(), but always returning the "strict_date_checking" version that ORs all three flags: return thd->variables.sql_mode & (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE | MODE_INVALID_DATES); By the way, sql_mode_for_dates() is used in str_to_datetime_with_warn() and Item::send(). Do you know why? Perhaps they also should follow all these three sql_mode date flags... > &error); > return store_TIME_with_warning(&ltime, &str, error, func_res > MYSQL_TIMESTAMP_ERROR); > } > @@ -5144,11 +5143,10 @@ > Lazy_string_double str(nr); > > longlong tmp= double_to_datetime(nr, &ltime, > - (TIME_FUZZY_DATE | > - (thd->variables.sql_mode & > + (thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | > MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), &error); > + MODE_INVALID_DATES)), &error); > return store_TIME_with_warning(&ltime, &str, error, tmp != -1); > } > > @@ -5161,11 +5159,10 @@ > THD *thd= table->in_use; > Lazy_string_num str(nr); > > - tmp= number_to_datetime(nr, 0, &ltime, (TIME_FUZZY_DATE | > - (thd->variables.sql_mode & > + tmp= number_to_datetime(nr, 0, &ltime, (thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | > MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), &error); > + MODE_INVALID_DATES)), &error); > > return store_TIME_with_warning(&ltime, &str, error, tmp != -1); > } > @@ -5181,17 +5178,16 @@ > structure always fit into DATETIME range. > */ > have_smth_to_conv= !check_date(&l_time, pack_time(&l_time) != 0, > - (TIME_FUZZY_DATE | > - (current_thd->variables.sql_mode & > + (current_thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), &error); > + MODE_INVALID_DATES)), &error); > return store_TIME_with_warning(&l_time, &str, error, have_smth_to_conv); > } > > my_decimal *Field_temporal::val_decimal(my_decimal *d) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) Now get_date() is called in a lot of places with 0 flags. Why not to add a method: bool get_date(MYSQL_TIME *ltime) { return get_date(ltime, 0); } And a similar wrapper for get_arg0_date(), with flags==0... ? > { > bzero(&ltime, sizeof(ltime)); > ltime.time_type= mysql_type_to_time_type(type()); > @@ -5330,7 +5326,8 @@ > bool Field_time::get_date(MYSQL_TIME *ltime, uint fuzzydate) > { > THD *thd= table->in_use; > - if (!(fuzzydate & (TIME_FUZZY_DATE|TIME_TIME_ONLY))) > + if (!(fuzzydate & TIME_TIME_ONLY) && > + (fuzzydate & TIME_NO_ZERO_IN_DATE)) > { > push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, > ER_WARN_DATA_OUT_OF_RANGE, > @@ -5459,7 +5456,7 @@ > ltime->time_type= MYSQL_TIMESTAMP_TIME; > ltime->hour+= (ltime->month*32+ltime->day)*24; > ltime->month= ltime->day= 0; > - return fuzzydate & (TIME_FUZZY_DATE | TIME_TIME_ONLY) ? 0 : 1; > + return !(fuzzydate & TIME_TIME_ONLY) && (fuzzydate & TIME_NO_ZERO_IN_DATE); > } > > > @@ -5848,7 +5845,7 @@ > bool Field_datetime::send_binary(Protocol *protocol) > { > MYSQL_TIME tm; > - Field_datetime::get_date(&tm, TIME_FUZZY_DATE); > + Field_datetime::get_date(&tm, 0); > return protocol->store(&tm, 0); > } > > @@ -5931,7 +5928,7 @@ > if (!tmp) > return (fuzzydate & TIME_NO_ZERO_DATE) != 0; > if (!ltime->month || !ltime->day) > - return !(fuzzydate & TIME_FUZZY_DATE); > + return fuzzydate & TIME_NO_ZERO_IN_DATE; > return 0; > } > > @@ -5984,11 +5981,10 @@ > error= 2; > } > else > - tmp= number_to_datetime(nr, sec_part, &ltime, (TIME_FUZZY_DATE | > - (thd->variables.sql_mode & > + tmp= number_to_datetime(nr, sec_part, &ltime, (thd->variables.sql_mode & > (MODE_NO_ZERO_IN_DATE | > MODE_NO_ZERO_DATE | > - MODE_INVALID_DATES))), &error); > + MODE_INVALID_DATES)), &error); > > return store_TIME_with_warning(&ltime, &str, error, tmp != -1); > } > @@ -5996,7 +5992,7 @@ > bool Field_datetime_hires::send_binary(Protocol *protocol) > { > MYSQL_TIME ltime; > - Field_datetime_hires::get_date(&ltime, TIME_FUZZY_DATE); > + Field_datetime_hires::get_date(&ltime, 0); > return protocol->store(&ltime, dec); > } > > @@ -6004,14 +6000,14 @@ > double Field_datetime_hires::val_real(void) > { > MYSQL_TIME ltime; > - Field_datetime_hires::get_date(&ltime, TIME_FUZZY_DATE); > + Field_datetime_hires::get_date(&ltime, 0); > return TIME_to_double(&ltime); > } > > longlong Field_datetime_hires::val_int(void) > { > MYSQL_TIME ltime; > - Field_datetime_hires::get_date(&ltime, TIME_FUZZY_DATE); > + Field_datetime_hires::get_date(&ltime, 0); > return TIME_to_ulonglong_datetime(&ltime); > } > > @@ -6020,7 +6016,7 @@ > String *unused __attribute__((unused))) > { > MYSQL_TIME ltime; > - Field_datetime_hires::get_date(&ltime, TIME_FUZZY_DATE); > + Field_datetime_hires::get_date(&ltime, 0); > str->alloc(field_length+1); > str->length(field_length); > my_datetime_to_str(&ltime, (char*) str->ptr(), dec); > @@ -6035,7 +6031,7 @@ > if (!packed) > return fuzzydate & TIME_NO_ZERO_DATE; > if (!ltime->month || !ltime->day) > - return !(fuzzydate & TIME_FUZZY_DATE); > + return fuzzydate & TIME_NO_ZERO_IN_DATE; > return 0; > } > > > === modified file 'sql/field_conv.cc' > --- sql/field_conv.cc 2012-04-05 21:07:18 +0000 > +++ sql/field_conv.cc 2013-07-03 07:46:20 +0000 > @@ -413,7 +413,7 @@ > static void do_field_temporal(Copy_field *copy) > { > MYSQL_TIME ltime; > - copy->from_field->get_date(&ltime, TIME_FUZZY_DATE); > + copy->from_field->get_date(&ltime, 0); > copy->to_field->store_time_dec(&ltime, copy->from_field->decimals()); > } > > @@ -884,7 +884,7 @@ > if (from->cmp_type() == TIME_RESULT) > { > MYSQL_TIME ltime; > - if (from->get_date(&ltime, TIME_FUZZY_DATE)) > + if (from->get_date(&ltime, 0)) > return to->reset(); > else > return to->store_time_dec(&ltime, from->decimals()); > > === modified file 'sql/filesort.cc' > --- sql/filesort.cc 2013-03-17 06:41:22 +0000 > +++ sql/filesort.cc 2013-07-03 07:46:20 +0000 > @@ -868,7 +868,7 @@ > else > { > MYSQL_TIME buf; > - if (item->get_date_result(&buf, TIME_FUZZY_DATE | TIME_INVALID_DATES)) > + if (item->get_date_result(&buf, TIME_INVALID_DATES)) > { > DBUG_ASSERT(maybe_null); > DBUG_ASSERT(item->null_value); > > === modified file 'sql/item.cc' > --- sql/item.cc 2013-03-17 06:41:22 +0000 > +++ sql/item.cc 2013-07-03 07:46:20 +0000 > @@ -252,7 +252,7 @@ > String *Item::val_string_from_date(String *str) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE) || > + if (get_date(&ltime, 0) || > str->alloc(MAX_DATE_STRING_REP_LENGTH)) > { > null_value= 1; > @@ -308,7 +308,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > { > my_decimal_set_zero(decimal_value); > null_value= 1; // set NULL, stop processing > @@ -367,7 +367,7 @@ > int Item::save_date_in_field(Field *field) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return set_field_to_null_with_conversions(field, 0); > field->set_notnull(); > return field->store_time_dec(&ltime, decimals); > @@ -1205,7 +1205,7 @@ > if allowed, otherwise - null. > */ > bzero((char*) ltime,sizeof(*ltime)); > - return null_value|= (fuzzydate & (TIME_NO_ZERO_DATE|TIME_NO_ZERO_IN_DATE)); > + return null_value|= !(fuzzydate & TIME_FUZZY_DATES); > } > > bool Item::get_seconds(ulonglong *sec, ulong *sec_part) > @@ -6032,7 +6032,7 @@ > case MYSQL_TYPE_TIMESTAMP: > { > MYSQL_TIME tm; > - get_date(&tm, TIME_FUZZY_DATE | sql_mode_for_dates()); > + get_date(&tm, sql_mode_for_dates()); > if (!null_value) > { > if (f_type == MYSQL_TYPE_DATE) > @@ -8161,8 +8161,8 @@ > } > else > { > - field->get_date(&field_time, TIME_FUZZY_DATE | TIME_INVALID_DATES); > - item->get_date(&item_time, TIME_FUZZY_DATE | TIME_INVALID_DATES); > + field->get_date(&field_time, TIME_INVALID_DATES); > + item->get_date(&item_time, TIME_INVALID_DATES); > } > return my_time_compare(&field_time, &item_time); > } > @@ -8343,7 +8343,7 @@ > value_cached= true; > > MYSQL_TIME ltime; > - if (example->get_date_result(&ltime, TIME_FUZZY_DATE)) > + if (example->get_date_result(&ltime, 0)) > value=0; > else > value= pack_time(&ltime); > > === modified file 'sql/item.h' > --- sql/item.h 2013-05-03 13:07:13 +0000 > +++ sql/item.h 2013-07-03 07:46:20 +0000 > @@ -936,7 +936,7 @@ > Item **ref, bool skip_registered); > virtual bool get_date(MYSQL_TIME *ltime,uint fuzzydate); > bool get_time(MYSQL_TIME *ltime) > - { return get_date(ltime, TIME_TIME_ONLY | TIME_FUZZY_DATE); } > + { return get_date(ltime, TIME_TIME_ONLY); } > bool get_seconds(ulonglong *sec, ulong *sec_part); > virtual bool get_date_result(MYSQL_TIME *ltime,uint fuzzydate) > { return get_date(ltime,fuzzydate); } > > === modified file 'sql/item_cmpfunc.cc' > --- sql/item_cmpfunc.cc 2013-02-25 03:16:11 +0000 > +++ sql/item_cmpfunc.cc 2013-07-03 07:46:20 +0000 > @@ -713,7 +713,7 @@ > bool value; > int error; > enum_mysql_timestamp_type timestamp_type; > - int flags= TIME_FUZZY_DATE | MODE_INVALID_DATES; > + int flags= TIME_FUZZY_DATES | MODE_INVALID_DATES; > > if (warn_type == MYSQL_TIMESTAMP_TIME) > flags|= TIME_TIME_ONLY; > @@ -885,7 +885,7 @@ > else > { > MYSQL_TIME ltime; > - uint fuzzydate= TIME_FUZZY_DATE | TIME_INVALID_DATES; > + uint fuzzydate= TIME_FUZZY_DATES | TIME_INVALID_DATES; > if (f_type == MYSQL_TYPE_TIME) > fuzzydate|= TIME_TIME_ONLY; > if (item->get_date(&ltime, fuzzydate)) > > === modified file 'sql/item_func.cc' > --- sql/item_func.cc 2013-06-28 08:00:25 +0000 > +++ sql/item_func.cc 2013-07-03 07:46:20 +0000 > @@ -2538,7 +2538,7 @@ > if (compare_as_dates) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > > return TIME_to_double(&ltime); > @@ -2567,7 +2567,7 @@ > if (compare_as_dates) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > > return TIME_to_ulonglong(&ltime); > @@ -2597,7 +2597,7 @@ > if (compare_as_dates) > { > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > > return date2my_decimal(&ltime, dec); > > === modified file 'sql/item_strfunc.cc' > --- sql/item_strfunc.cc 2013-03-26 18:09:47 +0000 > +++ sql/item_strfunc.cc 2013-07-03 07:46:20 +0000 > @@ -3618,10 +3618,10 @@ > } > break; > case DYN_COL_DATETIME: > - args[valpos]->get_date(&vals[i].x.time_value, TIME_FUZZY_DATE); > + args[valpos]->get_date(&vals[i].x.time_value, 0); > break; > case DYN_COL_DATE: > - args[valpos]->get_date(&vals[i].x.time_value, TIME_FUZZY_DATE); > + args[valpos]->get_date(&vals[i].x.time_value, 0); > break; > case DYN_COL_TIME: > args[valpos]->get_time(&vals[i].x.time_value); > > === modified file 'sql/item_timefunc.cc' > --- sql/item_timefunc.cc 2013-06-28 08:00:25 +0000 > +++ sql/item_timefunc.cc 2013-07-03 07:46:20 +0000 > @@ -791,7 +791,7 @@ > MYSQL_TIME ltime; > longlong res; > int dummy; /* unused */ > - if (get_arg0_date(&ltime, TIME_FUZZY_DATE)) > + if (get_arg0_date(&ltime, 0)) > { > /* got NULL, leave the incl_endp intact */ > return LONGLONG_MIN; > @@ -855,14 +855,14 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - return get_arg0_date(&ltime, TIME_FUZZY_DATE) ? 0 : (longlong) ltime.day; > + return get_arg0_date(&ltime, 0) ? 0 : (longlong) ltime.day; > } > > longlong Item_func_month::val_int() > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - return get_arg0_date(&ltime, TIME_FUZZY_DATE) ? 0 : (longlong) ltime.month; > + return get_arg0_date(&ltime, 0) ? 0 : (longlong) ltime.month; > } > > > @@ -907,7 +907,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_arg0_date(&ltime, TIME_FUZZY_DATE)) > + if (get_arg0_date(&ltime, 0)) > return 0; > return (longlong) ((ltime.month+2)/3); > } > @@ -981,7 +981,7 @@ > DBUG_ASSERT(fixed == 1); > uint year; > MYSQL_TIME ltime; > - if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE)) > + if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE)) > return 0; > return (longlong) calc_week(&ltime, > week_mode((uint) args[1]->val_int()), > @@ -994,7 +994,7 @@ > DBUG_ASSERT(fixed == 1); > uint year,week; > MYSQL_TIME ltime; > - if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE)) > + if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE)) > return 0; > week= calc_week(&ltime, > (week_mode((uint) args[1]->val_int()) | WEEK_YEAR), > @@ -1008,7 +1008,7 @@ > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > > - if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE)) > + if (get_arg0_date(&ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE)) > return 0; > > return (longlong) calc_weekday(calc_daynr(ltime.year, ltime.month, > @@ -1050,7 +1050,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - return get_arg0_date(&ltime, TIME_FUZZY_DATE) ? 0 : (longlong) ltime.year; > + return get_arg0_date(&ltime, 0) ? 0 : (longlong) ltime.year; > } > > > @@ -1082,7 +1082,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_arg0_date(&ltime, TIME_FUZZY_DATE)) > + if (get_arg0_date(&ltime, 0)) > { > /* got NULL, leave the incl_endp intact */ > return LONGLONG_MIN; > @@ -1354,7 +1354,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > longlong v= TIME_to_ulonglong(&ltime); > return ltime.neg ? -v : v; > @@ -1365,7 +1365,7 @@ > { > DBUG_ASSERT(fixed == 1); > MYSQL_TIME ltime; > - if (get_date(&ltime, TIME_FUZZY_DATE)) > + if (get_date(&ltime, 0)) > return 0; > return TIME_to_double(&ltime); > } > @@ -1744,7 +1744,7 @@ > int is_time_flag = is_time_format ? TIME_TIME_ONLY : 0; > DBUG_ASSERT(fixed == 1); > > - if (get_arg0_date(&l_time, TIME_FUZZY_DATE | is_time_flag)) > + if (get_arg0_date(&l_time, is_time_flag)) > return 0; Perhaps now it's easier to put the expression directly to get_arg0_date(), instead of having a variable. > > if (!(format = args[1]->val_str(str)) || !format->length()) > @@ -1923,10 +1923,15 @@ > { > INTERVAL interval; > > - if (args[0]->get_date(ltime, TIME_NO_ZERO_DATE | TIME_FUZZY_DATE | TIME_NO_ZERO_IN_DATE) || > + if (args[0]->get_date(ltime, 0) || > get_interval_value(args[1], int_type, &value, &interval)) > return (null_value=1); > > + if (ltime->time_type != MYSQL_TIMESTAMP_TIME && > + check_date_with_warn(ltime, TIME_NO_ZERO_DATE | TIME_NO_ZERO_IN_DATE, > + MYSQL_TIMESTAMP_ERROR)) > + return (null_value=1); > + > if (date_sub_interval) > interval.neg = !interval.neg; > > @@ -2019,7 +2024,7 @@ > long neg; > int is_time_flag = date_value ? 0 : TIME_TIME_ONLY; One more time (see the previous comment) > - if (get_arg0_date(&ltime, TIME_FUZZY_DATE | is_time_flag)) > + if (get_arg0_date(&ltime, is_time_flag)) > return 0; > neg= ltime.neg ? -1 : 1; > > @@ -2430,7 +2435,7 @@ > > if (is_date) // TIMESTAMP function > { > - if (get_arg0_date(&l_time1, TIME_FUZZY_DATE) || > + if (get_arg0_date(&l_time1, 0) || > args[1]->get_time(&l_time2) || > l_time1.time_type == MYSQL_TIMESTAMP_TIME || > l_time2.time_type != MYSQL_TIMESTAMP_TIME) > > === modified file 'sql/time.cc' > --- sql/time.cc 2013-06-28 12:25:06 +0000 > +++ sql/time.cc 2013-07-03 07:46:20 +0000 > @@ -263,7 +263,7 @@ > @param nr integer part of the number to convert > @param sec_part microsecond part of the number > @param ltime converted value will be written here > - @param fuzzydate conversion flags (TIME_FUZZY_DATE, etc) > + @param fuzzydate conversion flags (TIME_INVALID_DATE, etc) > @param str original number, as a Lazy_string. For the warning > @param field_name field name or NULL if not a field. For the warning > > @@ -280,6 +280,7 @@ > > if (fuzzydate & TIME_TIME_ONLY) > { > + fuzzydate= TIME_TIME_ONLY; // clear other flags > f_type= MYSQL_TYPE_TIME; > res= number_to_time(neg, nr, sec_part, ltime, &was_cut); > } > @@ -289,7 +290,7 @@ > res= neg ? -1 : number_to_datetime(nr, sec_part, ltime, fuzzydate, &was_cut); > } > > - if (res < 0 || (was_cut && !(fuzzydate & TIME_FUZZY_DATE))) > + if (res < 0 || (was_cut && (fuzzydate & TIME_NO_ZERO_IN_DATE))) > { > make_truncated_value_warning(current_thd, > MYSQL_ERROR::WARN_LEVEL_WARN, str,

2 1

[Maria-developers] MDEV-4472 (audit plugin)
by Alexey Botchkov 03 Jul '13

03 Jul '13

Hi, Sergei. Here is the plugin code for you to check out. It constists of a single new file, so i send you the link to it. http://myoffice.izhnet.ru/~alex/server_audit/server_audit.c What's missing in it as i'm not sure how it can be done: - No server host/ip in the log. How get that information? - SYSLOG logging. The SysLog i knew was declared in the syslog.h. That's the interface talking to the local syslogd instance. If it's what we need to use, then i have no idea how to specify the Syslog server IP for that daemon (which is required by the spec). I see nothing in the API about it and i thought it should be configured with the daemon's cfg file or something like that. Best regards. HF

2 6

[Maria-developers] On the question of whether select_id allow to reconstruct the query tree
by Sergei Petrunia 02 Jul '13

02 Jul '13

1 0

[Maria-developers] Dynamic Columns Test Error
by River wubx 02 Jul '13

02 Jul '13

MariaDB [test]> show create table assets ; +--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Table | Create Table | +--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | assets | CREATE TABLE `assets` ( `item_name` varchar(32) NOT NULL, `dynamic_cols` blob, PRIMARY KEY (`item_name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 | +--------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------+ 1 row in set (0.00 sec) MariaDB [test]> insert into assets values ('MariaDB T-shirt', COLUMN_CREATE('color', 'blue', 'size', 'XL')); ERROR 1921 (22007): Illegal value used as argument of dynamic column function MariaDB [test]> select version(); +--------------------+ | version() | +--------------------+ | 5.5.31-MariaDB-log | +--------------------+ 1 row in set (0.00 sec) Why? -- 姓名： river/吴炳锡手机：13501245755 http://www.mysqlsupport.cn 创业公司MySQL 支持，优化，架构设计

2 1