- developers - lists.mariadb.org

[Maria-developers] MYSQL_TYPE_DECIMAL type
by Zardosht Kasheff 08 May '13

08 May '13

Hello all, Under what circumstances can a table be created with MYSQL_TYPE_DECIMAL as being one of the columns? I thought MYSQL_TYPE_DECIMAL was deprecated pre 5.1. I thought all new tables use MYSQL_TYPE_NEWDECIMAL. We have a user reporting a table he wants to alter has that type. However, when I create that table, I don't get that type. As an aside, we don't support that type, mainly because I thought it was impossible to have a table created with it (I am apparently wrong). Is there a way to ensure that tables undergoing an alter convert that column to MYSQL_TYPE_NEWDECIMAL? Thanks -Zardosht

3 3

[Maria-developers] is this a bug?
by jhx1008 08 May '13

08 May '13

hi all: I have a problem about the type cast when I have read the source of Maria & MySQL I notice that when cast from string into int, Maria & MySQL do it like the C function atoi code: for (ul= 0 ; str < end9 && (ch= (uchar) (*str - '0')) < 10; str++) { ul= ul * 10 + ch; } but cast from hex into int, the code is: code: char *end=(char*) str_value.ptr()+str_value.length(), *ptr=end-min(str_value.length(),sizeof(longlong)); ulonglong value=0; for (; ptr != end ; ptr++) value=(value << 8)+ (ulonglong) (uchar) *ptr; so I do the test blew: create table t(id int auto_increment primary key, a int)engine=innodb; insert into t(a) values('1'); insert into t(a) values(0x31); everything is ok, I get the result: mysql> select * from t; +----+------+ | id | a | +----+------+ | 1 | 1 | | 2 | 49 | +----+------+ the value 0x31 is the ascii of the string '1', but we got the different result after inserting maybe it's not a problem, but in the replication environment, it maybe cause the data of slave not the same as master In the master, when we set the connection characterset into multi-bytes characterset and this characterset may escape with backslash is dangerous (like gbk, cp932) and then we use the prepared statement to do the insert, the string value in the insert must be cast into hex before write into the binlog, so we do the insert(insert into t(a) values('1')) on the master, but in the slave it does the another(insert into t(a) values(0x31)) , the data is not the same. how to reappear: master(binlog format=statement): create table t(id int auto_increment primay key, a int) engine=innodb; set names gbk; prepare stmt from 'insert into t(a) values(?)'; set @a='1'; execute stmt using @a; the result in master is: mysql> select * from t; +----+------+ | id | a | +----+------+ | 1 | 1 | +----+------+ and result in slave is: mysql> select * from t; +----+------+ | id | a | +----+------+ | 1 | 49 | +----+------+ I test the newest release version mariadb-10.0.2 and MySQL-5.6.10, the problem is still exist, is this a bug? 2013-04-28 jhx1008 @netease

4 7

[Maria-developers] MariaDB allows for slave to connect with non-existent GTID
by Pavel Ivanov 07 May '13

07 May '13

Kristian, I've realized that the way slaves are processed now on the master allows them to connect even if they request non-existent GTID. Is it "works as intended" and will be different in the "strict mode" or you didn't want for such things to happen even in non-strict mode? I've attached a test reproducing the problem. It sets up replication 1->2->3, executes transaction on 1, executes transaction on 2, disconnects 3, executes one more transaction on 1, fails over to 2, executes one more transaction on 2. Then when it tries to connect 3 to 1 it should fail because 1 doesn't have the last transaction that 3 has. I agree that this scenario is artificial, but in reality scenario can be e.g. like this: 2 is slave of 1, then it gets disconnected and executes one extra transaction, then backup is taken from 2, then 2 gets restarted and restored to the state of 1, then failover happens and 2 becomes master, then 3 restores from the backup taken earlier from 2 and if all this time 1 and then 2 as masters executed some transactions 3 will be able to connect to 2 even though its last transaction doesn't exist on 2... Pavel

2 3

[Maria-developers] Missing locking around THD::set_db() ?
by Kristian Nielsen 07 May '13

07 May '13

Hi, I was looking at a Valgrind warning in Buildbot (appended below). What happens seems to be this: Thread 1 is running SHOW PROCESSLIST, it grabs the pointer THD::db to the current database of thread 2. Thread 2 then does THD::set_db(), freeing the old THD::db pointer and allocating a new one with the new data. Thread 1 then resumes, doing strdup() of the _old_, now invalid, THD::db pointer, which reads garbage data (or could even segfault if we get really unlucky). This seems like a genuine bug. I see absolutely no locking protecting against this race :-( Any suggestions for how to deal with this? The only locking I see in mysqld_list_processes() is holding LOCK_thread_count, but taking that for every THD::set_db() sounds quite bad for scalability (for example, set_db() is run by every query replicated by a slave thread). Should we use LOCK_thd_data also for THD::db ? Or maybe we could have a fixed buffer in THD for the db? Seems we would need 193 bytes. Then SHOW PROCESSLIST could sometimes show a random mix of old and new db name if we race, but at least we would not read invalid memory or crash due to mummap() ... Any better ideas? - Kristian. ----------------------------------------------------------------------- Original valgrind warning, for reference: rpl.rpl_stop_slave 'mix,xtradb' w5 [ fail ] Found warnings/errors in server log file! Test ended at 2013-04-22 22:05:12 line ==9897== Thread 20: ==9897== Invalid read of size 1 ==9897== at 0x4C2826B: memcpy (mc_replace_strmem.c:878) ==9897== by 0xBAF9E8: strmake_root (my_alloc.c:424) ==9897== by 0x63C74E: mysqld_list_processes(THD*, char const*, bool) (sql_class.h:771) ==9897== by 0x5C8574: mysql_execute_command(THD*) (sql_parse.cc:3149) ==9897== by 0x5CC844: mysql_parse(THD*, char*, unsigned int, Parser_state*) (sql_parse.cc:5759) ==9897== by 0x5CDDC9: dispatch_command(enum_server_command, THD*, char*, unsigned int) (sql_parse.cc:1068) ==9897== by 0x5CE4BD: do_command(THD*) (sql_parse.cc:794) ==9897== by 0x6A4E23: do_handle_one_connection(THD*) (sql_connect.cc:1266) ==9897== by 0x6A4F23: handle_one_connection (sql_connect.cc:1181) ==9897== by 0x8F0027: pfs_spawn_thread (pfs.cc:1015) ==9897== by 0x4E3506F: start_thread (in /lib64/libpthread-2.9.so) ==9897== by 0x62F713C: clone (in /lib64/libc-2.9.so) ==9897== Address 0x1a06a973 is 3 bytes inside a block of size 5 free'd ==9897== at 0x4C257D8: free (vg_replace_malloc.c:446) ==9897== by 0xBB96BB: my_free (my_malloc.c:115) ==9897== by 0x838C86: Query_log_event::do_apply_event(Relay_log_info const*, char const*, unsigned int) (sql_class.h:2846) ==9897== by 0x53904C: apply_event_and_update_pos(Log_event*, THD*, Relay_log_info*) (log_event.h:1230) ==9897== by 0x5446DD: exec_relay_log_event(THD*, Relay_log_info*) (slave.cc:2766) ==9897== by 0x545BD9: handle_slave_sql (slave.cc:3627) ==9897== by 0x8F0027: pfs_spawn_thread (pfs.cc:1015) ==9897== by 0x4E3506F: start_thread (in /lib64/libpthread-2.9.so) ==9897== by 0x62F713C: clone (in /lib64/libc-2.9.so)

4 4

Re: [Maria-developers] [Gsoc] Regex enhancements Project
by Sergei Golubchik 04 May '13

04 May '13

Hi, Sudheera! On Apr 19, Sudheera Palihakkara wrote: > Hi, > I went through other threads on this topic. In one thread you mentioned to > choose a suitable regex library. > > *( Preliminary research - only about chosing a regex library to use in > MariaDB. You should be able to explain why we should use this library and > not some other one.) > > * > What do you mean by "choosing"? don't we have to enhance the exiting regex > library? Or choose from exiting already implemented libraries which are > free to use? sorry if it's a stupid question, but I'm confused. :O Enhancing our old regex library to support all modern features and multiple charsets is complex and bug-prone work. I don't see why we should bother doing it, when there are plenty of regex libraries available. There's PHP's mb_regex, there's prce, and many others too. We'd better just pick one that works better for MariaDB, and put it instead of Henry Spencer's library. Regards, Sergei P.S. Please, don't reply to me only, use reply-to-all, so that your mails appear on the mailing list.

3 9

[Maria-developers] Fwd: MariaDB release numbering
by Jorge Manuel B. S. Vicetto 03 May '13

03 May '13

Hi. I've emailed Kristian about this subject and he suggested I sent this to your mailing list to get a more complete picture. On our work packaging MariaDB for Gentoo, me and Robin need to decide how to deal with the packaging of MySQL vs MariaDB and to that it would be really helpful to have an idea of how you plan to number your future releases. AFAIK, currently we can compare MySQL vs MariaDB as: MySQL MariaDB 5.1 5.1 / 5.2 / 5.3 5.5 5.5 (including MariaDB features from 5.2/5.3) 5.6 10.0 (based on MySQL 5.5 with backports from MySQL 5.6 and features from previous MariaDB versions) 5.7 ??? The first question for us is what version number will you use for a newer version based on MySQL-5.7. Another question is if you plan to port all your work to the 5.7 codebase or if you'll keep working on the current 10.0 codebase and do backports from 5.7 (like you did for MySQL 5.6). A second question is whether you still claim binary compatibility with MySQL[1] and how would you compare the latest versions of MariaDB and MySQL (10.0 vs 5.6, 5.7). [1] - https://kb.askmonty.org/en/mariadb-versus-mysql-compatibility/ Any info you can share on the release versioning plans would be really helpful. If this is still too early for any definitions or comments, is there any way we can follow or learn about such decisions? Thank you and regards, Jorge Manuel B. S. Vicetto Gentoo Developer

2 1

[Maria-developers] Forked mytop - conflicts, issues
by Honza Horak 03 May '13

03 May '13

Hi guys, MariaDB forked mytop utility source some time back, but it causes some issues for us in Fedora for example (and similarly in other distributions I guess) -- particularly the MariaDB's binary mytop conflicts with the same utility from separate package mytop. So, I'd like to take a look at possible solutions. Since there was a small commit in mytop upstream few weeks back, it doesn't really look like totally dead upstream. So the ideal solution from my POV would be including enhancements that MariaDB did to mytop back to upstream and not including mytop utility in MariaDB any more. Would something like that be possible from the perspective of MariaDB? Cheers, Honza

4 4

[Maria-developers] xa transaction cause replication broken
by jhx1008 02 May '13

02 May '13

hello I have another problem witch seems like a bug(Server version: 5.5.5-10.0.2-MariaDB-log MariaDB Server). the problem is about the replication for the xa transactions when the master crashed and then restarted. I know when we do a transaction, the queries will be stored in the binlog cache, after commit, flush the binlog cache into the binlog file, any normal un-committed transactions will be rollbacked when the server crashed then restarted, but the prepared xa transactions are not. Prepared xa transactions can be recovered use the command 'xa recover', then committed use 'xa commit xid', but the binlog cache is empty when the master restart, so if we do the 'xa commit xid', nothing to be recorded into the binlog files, the replication will be broken. test: master mysql> create table t(id int auto_increment primary key, a int) engine=innodb; mysql> xa start '111'; mysql> insert into t(a) values(1); mysql> xa end '111'; mysql> xa prepare '111'; kill -9 master_pid restart the master mysql> xa recover; +----------+--------------+--------------+------+ | formatID | gtrid_length | bqual_length | data | +----------+--------------+--------------+------+ | 1 | 3 | 0 | 111 | +----------+--------------+--------------+------+ mysql> xa commit '111'; mysql> select * from t; Empty set (0.00 sec) why? I did the xa commit '111', but no result return, maybe another bug? do the test continue mysql> xa start '222'; mysql> insert into t(a) values(2); mysql> xa end '222'; mysql> prepare '222'; mysql> xa commit '111'; mysql> select * from t; +----+------+ | id | a | +----+------+ | 1 | 1 | | 2 | 2 | +----+------+ value(1,1) return at this time, why? what's hanppen on the slave? mysql> select * from t; +----+------+ | id | a | +----+------+ | 2 | 2 | +----+------+ the replication is broken now!! by the way, when the xa transactions preapred, if the client exit, the transactions will be rollbacked in the THD::cleanup function, maybe the server rollback all the xa prepared transcations when restart is a good method? 2013-05-02 jhx1008 @netease

2 2

[Maria-developers] GTIDs, events sequence and alternate futures
by Pavel Ivanov 01 May '13

01 May '13

Kristian, I can't find the answer to my questions in the code and don't know if there's some documentation I can use (is there such thing?), so I'm writing my questions here. As I understand GTID is constructed as <domain id>-<server id>-<sequence number>. Is it guaranteed that sequence numbers are always increasing inside the domain id? So let's say two servers have GTID 0-1-100 and if they have alternate futures then one server will have GTIDs 0-1-101, 0-1-102 and so on, while second server will have 0-2-101, 0-2-102 etc. Is that correct? BTW, where in the code is sequence number increased exactly? Thank you, Pavel

2 4

Re: [Maria-developers] Installing jemalloc on build VMs
by Kristian Nielsen 26 Apr '13

26 Apr '13

Daniel Bartholomew <dbart(a)mariadb.org> writes: > I'm getting ready to install jemalloc on the buildslaves for TODO-459 - > https://mariadb.atlassian.net/browse/TODO-459 , and wanted to know if > there was a preferred way to do it. Since we want to use a specific > version of jemalloc (3.1.0), I figured I would build from source on all > of the build machines. Has this been thought through properly with respect to packaging? My guess is it has not. For .debs, which are what I know about, it is generally expected that one can rebuild from `apt-get source mariadb-server`. This requires proper build dependencies. It doesn't work to install random stuff on random machines. It does not appear that jemalloc 3.1 is available on most .deb distros we support. Wheezy seems to have 3.0.0. It is said that tokutek "requires" jemalloc - maybe it would be better to fix tokutek to work with standard libraries? The proper way to produce .debs with custom jemalloc requires creating new custom packages for libjemalloc and including them in our repos. - Kristian.

8 11

Re: [Maria-developers] MariaDB and jemalloc
by Axel Schwenke 24 Apr '13

24 Apr '13

Hi Sanja, Oleksandr Byelkin wrote: > 24.04.2013 19:00, Axel Schwenke пишет: > [skip] >> >> OLTP ro transactions per second relative to glibc malloc >> ---------------------------------------------------------------------- >> Threads jemalloc-3.3.1 glibc malloc tcmalloc jemalloc-3.1.0 >> 4 +3.2% +0.0% +11.6% +61.9% >> 8 +0.9% +0.0% -2.3% +8.0% >> 16 +9.6% +0.0% +4.7% +12.9% >> 32 +1.8% +0.0% +0.9% +5.8% >> 64 -5.1% +0.0% +2.1% +5.4% >> 128 -4.8% +0.0% +0.2% +4.5% >> 256 -4.2% +0.0% +0.7% +5.0% >> 512 -13.3% +0.0% +1.8% +4.1% > > Strange that results jumps up and down when percona had quite smooth > one. Is it possible that computer was doing something else? or we need > more tests to take average? It's not so "jumpy" when you look at the absolute numbers. The difference to Percona is, that they tested their own server, where MariaDB tries to minimize the number of malloc() calls. I wouldn't give too much on the numbers for 4 threads, since this is the buffer pool warmup phase. Also I've run each test for only 100 seconds to get results fast. Re "jumpy" - see the attached pdf with the scatter plot. Each point represents the tps from a 5 second interval. Numbers are in fact rather smooth, except for 512 threads. The main takeaway is, that I can reproduce the regression in jemalloc 3.3. With TokuDB there is no way around jemalloc anyway. XL

2 1

[Maria-developers] MariaDB and jemalloc
by Axel Schwenke 24 Apr '13

24 Apr '13

Hi, Monty asked me to do a quick check how MariaDB performs with jemalloc. This is in the light of the upcoming integration of TokuDB into the MariaDB tree. TokuDB requires jemalloc. While I did use tcmalloc in the connect speed benchmarks with good results, I did no use jemalloc before. This article from Percona http://www.mysqlperformanceblog.com/2013/03/08/mysql-performance-impact-of-… suggests that jemalloc and tcmalloc perform very comparable, but also that jemalloc shows a regression in 3.2.0 and later. The benchmark I used is sysbench OLTP ro, 16 tables, data fitting into buffer pool. I used the new 64 (virtual, 32 real) core machine and compared 4 different malloc implementations as below: OLTP ro transactions per second relative to glibc malloc ---------------------------------------------------------------------- Threads jemalloc-3.3.1 glibc malloc tcmalloc jemalloc-3.1.0 4 +3.2% +0.0% +11.6% +61.9% 8 +0.9% +0.0% -2.3% +8.0% 16 +9.6% +0.0% +4.7% +12.9% 32 +1.8% +0.0% +0.9% +5.8% 64 -5.1% +0.0% +2.1% +5.4% 128 -4.8% +0.0% +0.2% +4.5% 256 -4.2% +0.0% +0.7% +5.0% 512 -13.3% +0.0% +1.8% +4.1% (more data in attached spread sheet) Observations: - the effect is rather limited - jemalloc 3.1.0 clearly wins - jemalloc 3.3.1 performs bad at higher concurrency Conclusion It's fine to build MariaDB with jemalloc in the future. However we mustn't use jemalloc-3.3.1, but rather jemalloc-3.1.0. XL

1 0

[Maria-developers] Fwd: Fwd: gsoc13
by Samarth Mathur 24 Apr '13

24 Apr '13

Hi! I have a few doubts. Going through the internet, I've come across two major implementations of LDAP protocol The openLDAP, and the libpam_ldap library. Both have a detailed information of client side implementation. However, openLDAP gives the slapd which is a standalone server daemon, whereas from the libpam_ldap library, I am able to gather the existence of an inbuilt ldap authentication system. Am I correct about that? Which do you think will be useful to implement as a plugin for mariadb? Thanks!

2 2

[Maria-developers] log analyzer
by Roberto Spadim 23 Apr '13

23 Apr '13

Hi guys, I was looking for something that give me the 'prepared statement' of a SQL query for example: statment = SELECT * FROM table WHERE field="value" prepared statement = SELECT * FROM table WHERE field=? why do this? well my idea is build a log analyzer and get commong queries since some programs don't use native prepared statement, reading the slow query log, or query log only will give me many different queries what i want is: 1)read queries log 2)get queries 3)get the 'prepared statement' of the query 4)create a table with prepared statement / unique id (maybe md5 of (database name + prepared statement) ) 5)create statistics using the unique id of prepared statement and check if the same 'kind' of queries are running with a mean time, or have some low and high times (for example) or getting information if some index is being used or not, well here i have many ideas but it's not the 'problem' for now the problem is the item (3), i have a query and i need the 'prepared statement' of this query, even the query was not executed with prepared statements this should work for INSERT, DELETE, UPDATE, SELECT, CREATE TABLE and others queries too (for now SELECT is enought, but in future others kinds of query will be nice) anyone know something that could do this job? maybe part of the mariadb query parser could/should be used? i was thinking about a command that could be executed in mariadb, today we have the EXPLAIN, we could have PARSE or other name? simplifying the problem: read the query, parse it and change constant values with "?" willcard thanks! any help is welcome -- Roberto Spadim

1 2

[Maria-developers] MariaDB 10.0.2-alpha release prep
by Daniel Bartholomew 23 Apr '13

23 Apr '13

I've begun prepping MariaDB 10.0.2-alpha for release. Draft changelog and release notes are here: - https://kb.askmonty.org/en/mariadb-1002-release-notes/ - https://kb.askmonty.org/en/mariadb-1002-changelog/ In the draft release notes I've listed MDEV-26 (Global Transaction ID), and the CONNECT handler. Please let me know of other features or fixes I should highlight ASAP. 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 Monty Program - http://montyprogram.com

2 1

[Maria-developers] ALTER TABLE xxx ENGINE=aria, progress only works in copying stage
by Roberto Spadim 22 Apr '13

22 Apr '13

hi guy, i was changing myisam to aria on some big tables (15gb) and show processlist stop reset the progress at 16% the operation started with 'copying to tmp table', and i saw 1%, 2% ... 16% now the table is doing "repair by sorting" and progress is 0% the point is... could the processlist show, at least, the last progress percentage? without get back to 0%? or maybe a column of current operation progress and another of total process operation? does 'repair by sorting' have progress algoritm implemented? i'm running mariadb 10.0.1 on linux 64bits thanks guys -- Roberto Spadim

1 0

[Maria-developers] performance monitoring
by MARK CALLAGHAN 21 Apr '13

21 Apr '13

After reading this I wonder if there is an opportunity for SkySQL and Percona to offer "performance tuning for performance schema" classes. I don't think performance monitoring should be this hard. What are the plans for MariaDB moving forward -- more user_stats/table_stats/index_stats and maybe statement_stats or integrate with the PS? http://dev.mysql.com/doc/refman/5.6/en/performance-schema.html http://marcalff.blogspot.com/2013/04/on-configuring-performance-schema.html -- Mark Callaghan mdcallag(a)gmail.com

2 1

Re: [Maria-developers] Fwd: gsoc13
by Sergei Golubchik 21 Apr '13

21 Apr '13

Hi, Samarth! On Apr 20, Samarth Mathur wrote: > "See also the authentication plugin examples in plugin/auth/." > > I couldn't locate this folder in the source code (mariadb 10). > Does it not exist there? No, but there are mariadb-10.0 $ ls -dl plugin/auth* drwx------ 3 serg serg 4096 Apr 20 10:13 plugin/auth_dialog drwx------ 3 serg serg 4096 Apr 20 10:13 plugin/auth_examples drwx------ 5 serg serg 4096 Apr 20 10:13 plugin/auth_pam drwx------ 3 serg serg 4096 Apr 20 10:13 plugin/auth_socket make your choice. Regards, Sergei

1 0

[Maria-developers] Aria engine integrity
by Roberto Spadim 21 Apr '13

21 Apr '13

Hi guys, another doubt about mariadb, now about aria... i'm using aria since myisam is a bit unsecure and have a slow recovery/repair process, aria storage is more secure my doubt is... could i use aria engine over a ext2 file system and have a 'security' near a jornaled file system (xfs for example) + myisam? or maybe xfs+aria? what's better? just one repair, from aria engine, or two repairs, one from file system and other from aria? thanks guys -- Roberto Spadim

3 3

[Maria-developers] User question
by Roberto Spadim 20 Apr '13

20 Apr '13

hi guys, i read about multi master replication but didn't found examples there's a wiki or an example of how to setup 2 masters and 1 slave replication? using different databases, like: create database db1; (on slave) create database db2; (on slave) master1 will replicate on db1 and master2 on db2 Thanks! -- Roberto Spadim

3 8

[Maria-developers] Enquire
by MAYANK PANDITA 19 Apr '13

19 Apr '13

I am pursuing B.E. C.S.E. I have experience in C, C++ and SQL. I am keen to work on Regex Enhancements and Roles project. I need to know more about these projects. How can I contact the mentors. -- Mayank Pandita

2 1

[Maria-developers] Fwd: LDAP authentication plugin: GSOC Application
by Ionel Merca 19 Apr '13

19 Apr '13

---------- Forwarded message ---------- From: Ionel Merca <mercaexilonx(a)gmail.com> Date: 2013/4/18 Subject: Re: [Maria-developers] LDAP authentication plugin: GSOC Application To: Sergei Golubchik <serg(a)askmonty.org> Hi, Thank you for the response! I have downloaded the source code from https://downloads.mariadb.org/ the 10.0 Series. I followed these steps : I installed cmake and run cmake . , after that I run make and make install... everything worked ok without any errors, but I don't know how can I run the application. I hope this is not a very stupid question but make run is not working or something like that... Regards, Merca 2013/4/18 Sergei Golubchik <serg(a)askmonty.org> > Hi, Ionel! > > On Apr 18, Ionel Merca wrote: > > Hi, > > > > My name is Merca Ionel and I am a student at Politehnica University of > > Bucharest studying Computer Science in the third year. I am interested in > > the project with ldap authentication. I would like to know how can I > > download the source code and what relevant bugs can I fix to prove that I > > am capable of finishing the job. > > MariaDB is Open Source project, you can download the source code easily. > > No need to fix any bugs, just write a good proposal. Don't forget to > show that you understand how LDAP works, and cover how your LDAP > authentication plugin will be different from using MariaDB PAM > authentication plugin together with pam_ldap.so. > > Regards, > Sergei >

2 1

[Maria-developers] [Gsoc] Regex enhancements Project
by Sudheera Palihakkara 19 Apr '13

19 Apr '13

Hi, I'm Sudheera Palihakkara, an undergraduate of Department of Computer Science and Engineering of University of Moratuwa. I'm interested in "Regex enhancements Project" and I need more information to get a clear picture about the project. Can I know what is the regex implementation used in mariadb is it the Henry Spencer's implementation or any newer implementation? And I want to know that is there any developer documentation on this classes present? I did a bit of search but unable to find. thank you. -- *Sudheera Palihakkara.* Undergraduate Department of *Computer Science and Engineering, *Faculty of Engineering, *University of Moratuwa*, Sri Lanka.

2 1

[Maria-developers] Fwd: gsoc13
by Samarth Mathur 19 Apr '13

19 Apr '13

Hi, I'm interested in the LDAP authentication plugin. I read the earlier correspondence on this particular topic, so as I understand I need to get well acquainted with the LDAP protocol. Do you have more tips or recommendations as requisites for the same? Best Regards looking forward to a reply Sam

2 1

[Maria-developers] GSoC 2013
by Shivam Agarwal 19 Apr '13

19 Apr '13

Hello please kindly provide me the basic requirements of programming languages needed to be participate in your project at GSoC 2013.

2 1

[Maria-developers] GSoC:Regex Project
by Tamás Kövesdan 19 Apr '13

19 Apr '13

Hello, I'm interested in this project. I have read the other thread about this. I've checked the available regex implementations and I've written a draft application. Is there any potential mentor who would review my application and help to improve it? Thanks in advance. Best whishes, Tamás Kövesdán

3 3

[Maria-developers] Fedora test day for replacing MySQL with MariaDB
by Colin Charles 19 Apr '13

19 Apr '13

Hi all, By now you must know of the movement to replace MySQL with MariaDB in Fedora-land (http://fedoraproject.org/wiki/Features/ReplaceMySQLwithMariaDB) One important thing is to ensure that MariaDB is a drop-in replacement. Fedora is a fast-moving high quality Linux distribution, so their focus aims are to ensure that MariaDB and MySQL are compatible, data can be migrated easily and there are minimal/no upgrade issues (and if so, they need to be documented) This is why on 30 April 2013, there is a Fedora test day dedicated to this very important task: http://fedoraproject.org/wiki/Test_Day:2013-04-30_MariaDB I plan to be on IRC for as long as humanly possible on #fedora-test-day (freenode) and will be watching the process closely. If you would like to participate, this is naturally welcome to help new MariaDB users Thanks! cheers, -colin -- Colin Charles, http://bytebot.net/blog/ | twitter: @bytebot | skype: colincharles MariaDB: Community developed. Feature enhanced. Backward compatible. Download it at: http://www.mariadb.org/ Open MariaDB/MySQL documentation at the Knowledgebase: http://kb.askmonty.org/

1 0

Re: [Maria-developers] GTID and replication of mysql database
by Kristian Nielsen 18 Apr '13

18 Apr '13

Pavel Ivanov <pivanof(a)google.com> writes: > Could you please tell me, in your implementation of GTIDs did you make > something special for the case when mysql database is replicated? I > guess mysql.rpl_slave_state cannot be replicated in any circumstances, > so did you put any safeguards to not replicate it or it's totally up > to MariaDB users? In rpl_slave_state::record_gtid(), there is this to prevent replicating updates of the mysql.rpl_slave_state table: table->no_replicate= 1; Other than that, I do not know of any special handling needed for the mysql database. Did you have something special in mind? Note that the user should not update mysql.rpl_slave_state manually. Except perhaps to ALTER TABLE ... ENGINE=xxx (which can be replicated). To change the GTID position, use SET GLOBAL gtid_pos='0-1-10', which will update mysql.rpl_slave_state as needed. BTW, yesterday I merged GTID into lp:maria/10.0, so now the code is in the main tree and will be included in the next 10.0.2 alpha release. - Kristian.

2 4

[Maria-developers] GSoC 2013 -- the Kerberos authentication plugin project
by QIU Shuang 18 Apr '13

18 Apr '13

Hi community, This is Shuang Qiu, a student from Shanghai, China, major in Software Engineering. My field of interests is distributed storage (also a little knowledge of information retrieval). I've focused on the MariaDB project for a while and want to make this GSoC a first step into this community :). Based on my experience, I think the Kerberos plugin project meets more my taste (also the full text search one, unfortunately, which has been crossed out from the slate). Although not a very tough task at first glance, but I believe there must be some tricky things behind the scene. I've skip the pointer on MariaDB GSoC2013 home page and have some point unclear. How will we configure the Kerberos server? Do we need some name resolve protocol to discover the Kerberos service? Thank you very much and best regards! Sincerely, Shuang

2 2

[Maria-developers] LDAP authentication plugin: GSOC Application
by Ionel Merca 18 Apr '13

18 Apr '13

Hi, My name is Merca Ionel and I am a student at Politehnica University of Bucharest studying Computer Science in the third year. I am interested in the project with ldap authentication. I would like to know how can I download the source code and what relevant bugs can I fix to prove that I am capable of finishing the job. Thanks in advance, Merca

2 1

[Maria-developers] GSoC 2013
by Dammina Sahabandu 17 Apr '13

17 Apr '13

Hi All, I'm Dammina Sahabandu, 3rd year undergraduate of University of Moratuwa(dept. of Computer of Science and Engineering) which has consecutively won GSOC’s most number of participant’s award from 2009 to 2012. I'm willing to contribute for a MariaDB project in this years GSoC. I went through the project ideas page and found the project "Self-Tuning Optimizer" interesting. So can you give me an insight of the project. -regards Dammina

2 1

[Maria-developers] MDEV-260 auditing table accesses
by Sergei Golubchik 17 Apr '13

17 Apr '13

Hi, Monty, Here's a patch for MDEV-260 (auditing table accesses). Please review and see whether it's safe for 5.5. Regards, Sergei

1 0

[Maria-developers] Bug in MariaDB 5.5.30 mysql_secure_installation: find_mysql_client command not found
by Viljo Hakala 16 Apr '13

16 Apr '13

When I rn mysql_secure_installation I get a warning: "379: find_mysql_client: command not found" On line 379 on mysql_secure_installation find:mysql_client command/function is called, but there is no such command and no such definition of command in MariaDB 5.5.30. It doesn't cause a problem -- the script runs successfully, but it is just a small annoying message. Can this be fixed?

2 2

Re: [Maria-developers] incomplete index stats in MariaDB
by Axel Schwenke 16 Apr '13

16 Apr '13

Igor Babaev wrote: > On 04/12/2013 09:00 AM, Axel Schwenke wrote: >> Hi Igor, Timour, >> >> when I wrote the script to translate MariaDB table statistics to MySQL, >> I found one problem. Imagine this simple table: >> >> create table t1 (c1 int, c2 int, c3 int, >> primary key (c1, c2), >> index `secondary`(c3)); >> >> Here the secondary index has 3 parts, it can be used as (c3), (c3, c1) >> and (c3, c1, c2). Obviously the avg_frequency is 1 for (c3, c1, c2), but >> it is not obvious how it is for (c3, c1). Such data I'd expect to see in >> the index_stats table under prefix_arity=2, but it's not there. > > To get this you have to run analyze with > set optimizer_switch='extended_keys=on'; Thanks Igor, this is a piece I was missing. While I see the point to obey the extended_keys optimizer switch in ANALYZE TABLE, I wonder if this is a good idea. The optimizer switch is dynamic, so a user can change it, even for a single query. But when the statistics for the extended key is not available, this makes not much sense. I suggest to always collect extended keys statistics, regardless of the setting of the extended_keys optimizer switch. Rationale: it is easy to simply not use the data when extended_keys=off. The only counter argument would be that this is costly - but I cannot see this. XL

1 0

Re: [Maria-developers] I would like to run a buildbot
by Kristian Nielsen 16 Apr '13

16 Apr '13

Dan Demeter <dan(a)apexis.ro> writes: > I would be happy to compile and install the latest CLANG if you > want. Currently I am compiling with > gcc version 4.4.3 ( the stock one from Ubuntu repos ). I think the currently configured builder (dan_demeter1) is fine for now. For the other one, it sounds like a good idea to install CLANG. > Actually, I managed to install Build Slave on a VM and it connected > and it's running. Yes, it seems to be working fine, great! I am looking into the test failures, and I may need help with tracking down one of them. We have a test that causes the server to crash like this: 130414 13:57:41 [ERROR] mysqld got signal 6 ; stack_bottom = 0x0 thread_stack 0x48000 mysys/stacktrace.c:247(my_print_stacktrace)[0xb2ef89] sql/signal_handler.cc:153(handle_fatal_signal)[0x71cb1b] ??:0(??)[0x7f82edc528f0] ??:0(??)[0x7f82ec98fa83] sql/mysqld.cc:5556(handle_connections_sockets())[0x51ca2e] sql/mysqld.cc:5007(mysqld_main(int, char**))[0x52359f] ??:0(??)[0x7f82ec8d1c4d] ??:0(_start)[0x516c4d] Writing a core file As you see, there is not much information to go by. Here are some suggestions you can try on the dan_demeter1 host to get more information available: - Install gdb (if not there already). mysql-test-run can use gdb to obtain better stack traces from core files. - Enable core files in current directory (if not enabled already). It looks like mysql-test-run does not find any core file, even though the log says that one is written. Maybe there is some default ubuntu security configuration or something that disables core files, or puts them in a different location? Not 100% sure, but something to check... - Maybe you can install debug symbols for libc (apt-get install libc6-dbg) to attempt to get better information in the stack trace (if not there already). - Maybe Serg (Cc:'ed) has an idea about what to install to get better stack traces than the above. Thanks, - Kristian.

3 10

[Maria-developers] GSoC 2013: Regex enhancements
by Gábor Kövesdán 14 Apr '13

14 Apr '13

Hi, I'm a student interested in this GSoC project. I already participated in GSoC several times, one of those involved porting the TRE regex engine to FreeBSD. I also worked on some optimizations for that. Since then I've started the PhD course in modeling and domain-specific languages, which made me more familiar with the theory of parsing and automata. I'm experienced in C and I can get along with C++. I'd like to ask what are the exact requirements of this project? Is it about plugging in an existing regexp engine into MariaDB, like RE2 or TRE? Or writing a new implementation? Could you please give me some pointers where to look at the code to see how regexes are used in MariaDB? Also, what other preliminary research should I do to write a good application? Thanks in advance, Gábor

2 1

[Maria-developers] GSOC2013
by Ajaya Agrawal 11 Apr '13

11 Apr '13

Hi All, I am Ajaya and I am interested in participating in gsoc2013. I am interested in gsoc project LDAP authentication plugin and memcached InnoDB interface. Although I have not worked with mariadb before I have submitted couple of working bug-fixes for drizzle. I would like to know which of these two is more important to mariadb? I would like to implement this https://mariadb.atlassian.net/browse/MDEV-4166?jql=project%20in%20(CONC%2C%… I believe I have sufficient theoretical knowledge about the problem but would appreciate if someone can point me to right direction in the codebase. I have compiled and built mariadb on my ubuntu machine. Thank You, Ajaya

2 1

[Maria-developers] We're accepted into Google Summer of Code 2013
by Colin Charles 10 Apr '13

10 Apr '13

Subject says it all We need people to sign up as mentors (http://www.google-melange.com/gsoc/homepage/google/gsoc2013) against the MariaDB project Students start opening up soon If you know of projects a student can complete in 3 months over a summer, this is the ideal place to list the task: https://kb.askmonty.org/en/google-summer-of-code-2013/ This is the first time MariaDB is going to participate. Some of you have done this in the past against MySQL or Drizzle. Big win for MariaDB this year! cheers, -colin -- Colin Charles, http://bytebot.net/blog/ | twitter: @bytebot | skype: colincharles MariaDB: Community developed. Feature enhanced. Backward compatible. Download it at: http://www.mariadb.org/ Open MariaDB/MySQL documentation at the Knowledgebase: http://kb.askmonty.org/

3 2

Re: [Maria-developers] [Commits] Rev 3197: MDEV-4326 fix.
by Sergei Golubchik 09 Apr '13

09 Apr '13

Hi, Oleksandr! On Apr 09, Oleksandr Byelkin wrote: > 09.04.2013 13:38, Sergei Golubchik пишет: > >> === modified file 'sql/sql_prepare.cc' > >> --- a/sql/sql_prepare.cc 2012-11-06 09:52:55 +0000 > >> +++ b/sql/sql_prepare.cc 2013-04-09 06:58:51 +0000 > >> @@ -787,7 +787,7 @@ static bool insert_params_with_log(Prepa > >> if (param->state == Item_param::NO_VALUE) > >> DBUG_RETURN(1); > >> > >> - if (param->limit_clause_param && param->item_type != Item::INT_ITEM) > >> + if (param->limit_clause_param) > > This looks wrong. Why do you need to convert INT_ITEM to INT_ITEM ? > Because it is not INT Item, it is Item with INT cache (which could be > left from previous run). When we assign value from variable we have > exactly the same code (see item.cc). I know that in your bug it's not an INT_ITEM. May be this exactly is a problem? When the param->item_type is not updated correctly for string parameters? > >> === modified file 'tests/mysql_client_test.c' > >> --- a/tests/mysql_client_test.c 2013-04-06 19:29:12 +0000 > >> +++ b/tests/mysql_client_test.c 2013-04-09 06:58:51 +0000 > >> @@ -16750,7 +16750,11 @@ static void test_bug43560(void) > >> fprintf(stdout, "Skipping test_bug43560: server not DEBUG version\n"); > >> DBUG_VOID_RETURN; > >> } > >> - > >> + if (opt_unix_socket) > >> + { > >> + fprintf(stdout, "Skipping test_bug43560: connected via UNIX socket\n"); > >> + DBUG_VOID_RETURN; > >> + } > > Why is that? There's nothing in the bug depends on how the client is > > connected. > they require TCP connection (see following comment). I am not sure that > it is ok to change connection type in the test, so I make it skipped on > unix socket (otherwise it just fails on connection). Ah, it's not your bug. Okay. Regards, Sergei

1 0

Re: [Maria-developers] [Commits] Rev 3197: MDEV-4326 fix.
by Sergei Golubchik 09 Apr '13

09 Apr '13

Hi, Sanja! On Apr 09, sanja(a)askmonty.org wrote: > revno: 3197 > revision-id: sanja(a)askmonty.org-20130409065851-bb241d1scc8lxo3p > parent: sergii(a)pisem.net-20130406192912-jtwuhe78zijfqfbx > committer: sanja(a)askmonty.org > branch nick: work-maria-5.1-MDEV-4326 > timestamp: Tue 2013-04-09 09:58:51 +0300 > message: > MDEV-4326 fix. > > Removed "optimization" which caused preoblems on second execution of > PS with string parameter in LIMIT clause. > > === modified file 'sql/sql_prepare.cc' > --- a/sql/sql_prepare.cc 2012-11-06 09:52:55 +0000 > +++ b/sql/sql_prepare.cc 2013-04-09 06:58:51 +0000 > @@ -787,7 +787,7 @@ static bool insert_params_with_log(Prepa > if (param->state == Item_param::NO_VALUE) > DBUG_RETURN(1); > > - if (param->limit_clause_param && param->item_type != Item::INT_ITEM) > + if (param->limit_clause_param) This looks wrong. Why do you need to convert INT_ITEM to INT_ITEM ? > { > param->set_int(param->val_int(), MY_INT64_NUM_DECIMAL_DIGITS); > param->item_type= Item::INT_ITEM; > > === modified file 'tests/mysql_client_test.c' > --- a/tests/mysql_client_test.c 2013-04-06 19:29:12 +0000 > +++ b/tests/mysql_client_test.c 2013-04-09 06:58:51 +0000 > @@ -16750,7 +16750,11 @@ static void test_bug43560(void) > fprintf(stdout, "Skipping test_bug43560: server not DEBUG version\n"); > DBUG_VOID_RETURN; > } > - > + if (opt_unix_socket) > + { > + fprintf(stdout, "Skipping test_bug43560: connected via UNIX socket\n"); > + DBUG_VOID_RETURN; > + } Why is that? There's nothing in the bug depends on how the client is connected. > /* > Set up a separate connection for this test to avoid messing up the > general MYSQL object used in other subtests. Use TCP protocol to avoid > @@ -17541,6 +17545,109 @@ static void test_bug13001491() > myquery(rc); > } > > +static void test_mdev4326() > +{ > + MYSQL_STMT *stmt; > + MYSQL_BIND bind; > + char query[]= "SELECT * FROM mysql.user LIMIT ?"; > + char str_data[]= "1"; > + unsigned long length= 0; > + int int_data= 1; > + int rc, count; > + my_bool is_null= 0; > + my_bool error= 0; > + myheader("test_mdev4326"); > + > + rc= mysql_change_user(mysql, opt_user, opt_password, "mysql"); > + myquery(rc); Sanja, I asked to reduce the test case and to remove whatever is not relevant to the bug. Why do you need to change user here? It's not needed for the bug to show up. > + > + rc= mysql_query(mysql, "SET GLOBAL general_log = 1"); > + myquery(rc); > + > + stmt= mysql_stmt_init(mysql); > + check_stmt(stmt); > + > + /* Numeric parameter test */ > + > + rc= mysql_stmt_prepare(stmt, query, strlen(query)); > + check_execute(stmt, rc); > + check_stmt(stmt); > + verify_param_count(stmt, 1); > + > + memset((char *)&bind, 0, sizeof(bind)); > + bind.buffer_type= MYSQL_TYPE_LONG; > + bind.buffer= (char *)&int_data; > + bind.is_null= &is_null; > + bind.length= &length; > + bind.error= &error; Why do you execute the statement with MYSQL_TYPE_LONG parameters? It's not needed for the bug to show up. > + > + rc= mysql_stmt_bind_param(stmt, &bind); > + check_execute(stmt, rc); > + rc= mysql_stmt_execute(stmt); > + check_execute(stmt, rc); > + count= 0; > + while (!(rc= mysql_stmt_fetch(stmt))) > + count++; > + DIE_UNLESS(count == 1); > + rc= mysql_stmt_execute(stmt); > + check_execute(stmt, rc); > + count= 0; > + while (!(rc= mysql_stmt_fetch(stmt))) > + count++; > + DIE_UNLESS(count == 1); > + int_data= 0; > + rc= mysql_stmt_execute(stmt); > + check_execute(stmt, rc); > + count= 0; > + while (!(rc= mysql_stmt_fetch(stmt))) > + count++; > + DIE_UNLESS(count == 0); > + rc= mysql_stmt_close(stmt); > + check_execute(stmt, rc); > + > + /* String parameter test */ > + > + stmt= mysql_stmt_init(mysql); > + rc= mysql_stmt_prepare(stmt, query, strlen(query)); > + check_execute(stmt, rc); > + check_stmt(stmt); > + verify_param_count(stmt, 1); > + > + memset((char *)&bind, 0, sizeof(bind)); > + bind.buffer_type= MYSQL_TYPE_STRING; > + bind.buffer= (char *)str_data; > + length= bind.buffer_length= sizeof(str_data); > + bind.is_null= &is_null; > + bind.length= &length; > + bind.error= &error; > + > + rc= mysql_stmt_bind_param(stmt, &bind); > + check_execute(stmt, rc); > + rc= mysql_stmt_execute(stmt); > + check_execute(stmt, rc); > + count= 0; > + while (!(rc= mysql_stmt_fetch(stmt))) > + count++; > + DIE_UNLESS(count == 1); > + rc= mysql_stmt_execute(stmt); > + check_execute(stmt, rc); > + count= 0; > + while (!(rc= mysql_stmt_fetch(stmt))) > + count++; > + DIE_UNLESS(count == 1); > + str_data[0]= '0'; > + rc= mysql_stmt_execute(stmt); > + check_execute(stmt, rc); > + count= 0; > + while (!(rc= mysql_stmt_fetch(stmt))) > + count++; > + DIE_UNLESS(count == 0); > + rc= mysql_stmt_close(stmt); > + check_execute(stmt, rc); > + > + rc= mysql_change_user(mysql, opt_user, opt_password, current_db); > + myquery(rc); Another useless mysql_change_user. > +} > > static struct my_tests_st my_tests[]= { > { "disable_query_logs", disable_query_logs }, > @@ -17790,6 +17897,7 @@ static struct my_tests_st my_tests[]= { > { "test_bug58036", test_bug58036 }, > { "test_bug56976", test_bug56976 }, > { "test_bug13001491", test_bug13001491 }, > + { "test_mdev4326", test_mdev4326 }, > { 0, 0 } > }; Regards, Sergei

1 0

[Maria-developers] Google Summer of Code 2013 ideas page
by Colin Charles 09 Apr '13

09 Apr '13

Hi all, Team MariaDB wants to participate in Google Summer of Code 2013. We definitely want to ensure that students have lots to do within those three summer months plus continue being MariaDB developers Please contribute to the ideas page: https://kb.askmonty.org/en/google-summer-of-code-2013/ Thanks -- Colin Charles, http://bytebot.net/blog/ | twitter: @bytebot | skype: colincharles MariaDB: Community developed. Feature enhanced. Backward compatible. Download it at: http://www.mariadb.org/ Open MariaDB/MySQL documentation at the Knowledgebase: http://kb.askmonty.org/

1 0

[Maria-developers] Review of last part of discover code
by Michael Widenius 08 Apr '13

08 Apr '13

Hi! Here is finally the review. >=== modified file 'sql/sql_truncate.cc' >--- sql/sql_truncate.cc 2013-01-25 19:40:42 +0000 >+++ sql/sql_truncate.cc 2013-02-27 11:23:42 +0000 >@@ -350,9 +342,15 @@ bool Truncate_statement::lock_table(THD > MYSQL_OPEN_SKIP_TEMPORARY)) > DBUG_RETURN(TRUE); > >- if (dd_check_storage_engine_flag(thd, table_ref->db, table_ref->table_name, >- HTON_CAN_RECREATE, hton_can_recreate)) >+ handlerton *hton; >+ if (!ha_table_exists(thd, table_ref->db, table_ref->table_name, &hton) || >+ !hton || hton == view_pseudo_hton) >+ { >+ my_error(ER_NO_SUCH_TABLE, MYF(0), table_ref->db, table_ref->table_name); > DBUG_RETURN(TRUE); >+ } >+ >+ *hton_can_recreate= hton->flags & HTON_CAN_RECREATE; > } ha_table_exists really needs a comment about what it can return and what the different values of hton means. >=== modified file 'sql/table.cc' >--- sql/table.cc 2013-01-29 14:10:47 +0000 >@@ -292,8 +286,8 @@ TABLE_CATEGORY get_table_category(const > # Share > */ > >-TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key, >- uint key_length) >+TABLE_SHARE *alloc_table_share(const char *db, const char *table_name, >+ char *key, uint key_length) Just so you know, the reason that alloc_table_share took a table list as argument was that it would enable us: - We should be able to use LEX_STRING for db and table_name - Would be trivial to add schema if we wanted to later We need to at some point change to use at least LEX_STRING as this will make build_table_filename faster. <cut> >+ if (memcmp(head, STRING_WITH_LEN("TYPE=VIEW\n")) == 0) > { >- if (head[2] == FRM_VER || head[2] == FRM_VER+1 || >- (head[2] >= FRM_VER+3 && head[2] <= FRM_VER+4)) >- { >- /* Open view only */ >- if (db_flags & OPEN_VIEW_ONLY) >- { >- error_given= 1; >- goto err; >- } >- table_type= 1; >- } >- else >- { >- error= 6; // Unkown .frm version >- goto err; >- } In your new code, you accept head[2] == FRM_VER +2, which the above code doesn't do. Don't remember why this is skipped, but if we want to be compatible we should skip this one too... But I think it's safe to ignore this change. <cut> >+ if (my_fstat(file, &stats, MYF(0))) >+ goto err; The above I don't like. We already store the max possible length of the frm in frm_header+10. Why not store the exact length there and use this instead of doing fstat()? Would save us a file operation (at least for MariaDB files). It would also ensure that we don't easily break if we find a partial .frm file on disk. <cut> >+ share->init_from_binary_frm_image(thd, false, buf, stats.st_size); >+ error_given= true; Add a comment why error_given is set. (I know it's old code, but it looks confusing) <cut> >+int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, <cut> >+ while (extra2 < e2end) >+ { >+ uchar type= *extra2++; >+ size_t length= *extra2++; >+ if (!length) >+ { >+ length= uint2korr(extra2); >+ extra2+=2; >+ if (length < 256) >+ goto err; >+ } Add a test: if (extra2 + length > e2end) goto err; Please also check in other places that we don't run outside of the image. >+ switch (type) { >+ case EXTRA2_TABLEDEF_VERSION: >+ if (tabledef_version.str) // see init_from_sql_statement_string() >+ { >+ if (length != tabledef_version.length || >+ memcmp(extra2, tabledef_version.str, length)) >+ goto err; >+ } >+ else >+ { >+ uchar *buf= (uchar*) alloc_root(&mem_root, length); >+ if (!buf) >+ goto err; You could have set tabledef_version.str directly and not use buf. >+ memcpy(buf, extra2, length); >+ tabledef_version.str= buf; >+ tabledef_version.length= length; >+ } >+ break; >+ case EXTRA2_ENGINE_TABLEOPTS: >+ if (options) >+ goto err; >+ /* remember but delay parsing until we have read fields and keys */ >+ options= extra2; >+ options_len= length; >+ break; >+ default: >+ /* abort frm parsing if it's an unknown but important extra2 value */ >+ if (type >= 128) 128 should probably be a define. >+ goto err; >+ } >+ extra2+= length; >+ } >+ if (extra2 > e2end) >+ goto err; If you have my earlier test, you don't need this one. Better to do the test early... >+ } > >- mysql_file_seek(file,pos,MY_SEEK_SET,MYF(0)); >- if (mysql_file_read(file, forminfo,288,MYF(MY_NABP))) >+ if (!(pos= uint4korr(frm_image + 64 + len))) > goto err; >- share->frm_version= head[2]; >+ >+ forminfo= frm_image + pos; Check that forminfo + FRM_FORM_LENGTH is inside of image <cut> > /* Read keyinformation */ >- key_info_length= (uint) uint2korr(head+28); >- mysql_file_seek(file, (ulong) uint2korr(head+6), MY_SEEK_SET, MYF(0)); >- if (read_string(file,(uchar**) &disk_buff,key_info_length)) >- goto err; /* purecov: inspected */ >+ disk_buff= frm_image + uint2korr(frm_image+6); Check that disk_buff + key_info_length is within image. >- if (!(extra_segment_buff= (uchar*) my_malloc(n_length + 1, MYF(MY_WME)))) >- goto err; >- next_chunk= extra_segment_buff; >- if (mysql_file_pread(file, extra_segment_buff, >- n_length, record_offset + share->reclength, >- MYF(MY_NABP))) >- { >- goto err; >- } >+ next_chunk= frm_image + record_offset + share->reclength; >+ buff_end= next_chunk + n_length; Check that buff_end is is within image. <cut> >- if (mysql_file_pread(file, record, (size_t) share->reclength, >- record_offset, MYF(MY_NABP))) >- goto err; /* purecov: inspected */ >+ memcpy(record, frm_image + record_offset, share->reclength); Check that disk_buff + share->reclength is withing image > >- mysql_file_seek(file, pos+288, MY_SEEK_SET, MYF(0)); >-#ifdef HAVE_CRYPTED_FRM >- if (crypted) >- { >- crypted->decode((char*) forminfo+256,288-256); >- if (sint2korr(forminfo+284) != 0) // Should be 0 >- goto err; // Wrong password >- } >-#endif >+ disk_buff= frm_image + pos + 288; Check that disk_buff is withing image <cut> >@@ -1420,7 +1360,6 @@ static int open_binary_frm(THD *thd, TAB > geom_type= (Field::geometry_type) strpos[14]; > charset= &my_charset_bin; > #else >- error= 4; // unsupported field type > goto err; > #endif Shouldn't we get a better error for this case than just BAD_FRM ? >@@ -1578,10 +1523,8 @@ static int open_binary_frm(THD *thd, TAB > (TYPELIB*) 0), > share->fieldnames.type_names[i]); > if (!reg_field) // Not supported field type >- { >- error= 4; >- goto err; /* purecov: inspected */ >- } >+ goto err; >+ Shouldn't we get a better error for this case than just BAD_FRM ? >@@ -1607,20 +1550,8 @@ static int open_binary_frm(THD *thd, TAB > if (reg_field->unireg_check == Field::NEXT_NUMBER) > share->found_next_number_field= field_ptr; > >- if (use_hash) >- { >- if (my_hash_insert(&share->name_hash, >- (uchar*) field_ptr)) >- { >- /* >- Set return code 8 here to indicate that an error has >- occurred but that the error message already has been >- sent (OOM). >- */ >- error= 8; >- goto err; >- } >- } >+ if (use_hash && my_hash_insert(&share->name_hash, (uchar*) field_ptr)) >+ goto err; Is this change because my_hash_insert() will give an error for OEM? <cut> >@@ -1950,11 +1877,7 @@ static int open_binary_frm(THD *thd, TAB > share->default_values, reg_field, > &share->next_number_key_offset, > &share->next_number_keypart)) < 0) >- { >- /* Wrong field definition */ >- error= 4; >- goto err; >- } >+ goto err; // Wrong field definition > else > reg_field->flags |= AUTO_INCREMENT_FLAG; As you are cleaning things up, remove else... <cut> >+ case OPEN_FRM_OK: >+ DBUG_ASSERT(0); // open_table_error() is never called for this one Add a break after the assert <cut> >- case 6: >- strxmov(buff, share->normalized_path.str, reg_ext, NullS); >- my_printf_error(ER_NOT_FORM_FILE, >- "Table '%-.64s' was created with a different version " >- "of MySQL and cannot be read", >- MYF(0), buff); >- break; It would be nice to still keep the above error message. We may need it sooner or later! For example, when we find a required table option type that we don't support! In this case we should also print out the MySQL version that was used to create the table! >- case 8: >+ case OPEN_FRM_NOT_A_TABLE: >+ my_error(ER_WRONG_OBJECT, MYF(0), share->db.str, >+ share->table_name.str, "TABLE"); > break; >- default: /* Better wrong error than none */ >- case 4: >+ case OPEN_FRM_DISCOVER: >+ DBUG_ASSERT(0); // open_table_error() is never called for this one Add a break! (Just in case) >+ case OPEN_FRM_CORRUPTED: > strxmov(buff, share->normalized_path.str, reg_ext, NullS); > my_error(ER_NOT_FORM_FILE, errortype, buff); > break; <cut> >+void prepare_fileinfo(THD *thd, uint reclength, uchar *fileinfo, >+ HA_CREATE_INFO *create_info, uint keys, KEY *key_info) >+{ Change name to prepare_frm_header >- DBUG_ENTER("create_frm"); >- >- if (create_info->options & HA_LEX_CREATE_TMP_TABLE) >- create_flags|= O_EXCL | O_NOFOLLOW; I couldn't find where you ensured in writefrm that the above flags was added for temporary tables. We really want to have these flags for temporary files to ensure that we fail if the file already exists! We also don't want anyone to create a symlink in /tmp and use that to overwrite another file! >@@ -3367,7 +3204,7 @@ rename_file_ext(const char * from,const > char from_b[FN_REFLEN],to_b[FN_REFLEN]; > (void) strxmov(from_b,from,ext,NullS); > (void) strxmov(to_b,to,ext,NullS); >- return (mysql_file_rename(key_file_frm, from_b, to_b, MYF(MY_WME))); >+ return (mysql_file_rename(key_file_frm, from_b, to_b, MYF(0))); Why not give a warning if rename fales? At least, use 'ME_JUST_WARNING' >=== modified file 'sql/table.h' >--- sql/table.h 2013-01-29 14:10:47 +0000 >+++ sql/table.h 2013-03-06 18:27:13 +0000 >+/* Adjust number to next larger disk buffer */ >+static inline ulong next_io_size(ulong pos) >+{ >+ return MY_ALIGN(pos, IO_SIZE); >+} >+ Remove above function. Instead store true max length in frominfo+2 >+++ sql/unireg.cc 2013-03-18 15:21:57 +0000 <cut> >+ frm.length= 64; // fileinfo; Change 64 to FRM_HEADER_LENGTH (and use this in other part of the source) >+ frm.length+= extra2_size + 4; // mariadb extra2 frm segment >+ >+ int2store(fileinfo+4, extra2_size); Add comment: // Size of table version and table options Note that you can't use position 4 for this. Position 4 & 5 is reserved for the number of different forms/screens inside the frm. Using this would make the created table unusable for any old version of MySQL / MariaDB. See get_form_pos() in table.cc in MySQL 5.5 Here is the relevant data in the old frm header Pos Information 4-5 Length of form names ; Always 3 in MySQL 8-9 Number of forms ; Always 1 in MySQL 10-13 Position for next form (if we would create one) 64 Name information (int2korr(head+4) bytes) . 4 byte offset/form from file start to where form starts How to fix this in a portable way (instead of using position 4): Position 10-13 are only set by MySQL but never used. This is ALWAYS aligned on IO_SIZE (Ie, byte 10 is always 0). We can use byte 10 to mark that this is a MariaDB .frm file and then we can use bytes 11-13 for whatever we want. >+ int2store(fileinfo+6, frm.length); Add comment: // Position to key information >+ frm.length+= key_buff_length; >+ frm.length+= reclength; // row with default values >+ frm.length+= create_info->extra_size; >+ >+ filepos= frm.length; >+ frm.length+= 288; // forminfo Replace 288 in the code with FRM_FORM_LENGTH >+ frm.length+= packed_fields_length(create_fields); >+ >+ frm_ptr= (uchar*) my_malloc(frm.length, MYF(MY_WME | MY_ZEROFILL | >+ MY_THREAD_SPECIFIC)); >+ if (!frm_ptr) >+ DBUG_RETURN(frm); >+ >+ /* write the extra2 segment */ >+ pos = frm_ptr + 64; 64 -> FRM_HEADER_LENGTH Please move the line: memcpy(frm_ptr, fileinfo, 64); Before the above line. (Makes it easier to see that header is copied) >+ *pos++ = EXTRA2_TABLEDEF_VERSION; We probably want to add a comment that MySQL stores '/' here and that EXTRA2_TABLEDEF_VERSION can't never be '/' <cut> >+ DBUG_ASSERT(options_len <= 65535); // FIXME if necessary >+ int2store(pos + 1, options_len); Why not just use (so that you can get rid of the comment) int3store(pos + 1, options_len); >+ pos+= 3; >+ } >+ pos= engine_table_options_frm_image(pos, create_info->option_list, >+ create_fields, keys, key_info); >+ } >+ >+ int4store(pos, filepos); // end of the extra2 segment >+ pos+= 4; >+ >+ DBUG_ASSERT(pos == frm_ptr + uint2korr(fileinfo+6)); >+ key_info_length= pack_keys(pos, keys, key_info, data_offset); > > maxlength=(uint) next_io_size((ulong) (uint2korr(forminfo)+1000)); > int2store(forminfo+2,maxlength); You can skip the above 2 rows and mark the bytes as free to use. > int4store(fileinfo+10,(ulong) (filepos+maxlength)); Same with the above 4 bytes <cut> > } > } > if (forminfo[46] == (uchar)255) > { Add comment /* New style MySQL 5.5 table comment */ By the way, this was a *stupid* solution for MySQL 5.5 from MySQL 6.0 What it means is that long comments from MySQL 5.5 are hidden in MySQL below 5.5 A better solution would be to always copy up to TABLE_COMMENT_INLINE_MAXLEN bytes into forminfo+47. (Better to have a cut comment than no comment). Can you please do that change? <cut> >+int rea_create_table(THD *thd, LEX_CUSTRING *frm, >+ const char *path, const char *db, const char *table_name, >+ HA_CREATE_INFO *create_info, handler *file) > { > DBUG_ENTER("rea_create_table"); > >- char frm_name[FN_REFLEN]; >- strxmov(frm_name, path, reg_ext, NullS); >- if (mysql_create_frm(thd, frm_name, db, table_name, create_info, >- create_fields, keys, key_info, file)) >+ if (file) >+ { >+ // TODO don't write frm for temp tables >+ if (create_info->tmp_table() && >+ writefrm(path, db, table_name, 0, frm->str, frm->length)) >+ goto err_handler; Can you add a test that if it's a memory table we don't write the frm? (Better to do it for other tmp tables, as we need to delete them from the engine during restart). As far as I can see, we only need one test here, one for the error condition and also when we drop the temporary table. Why not send the 'frm' forwards instead of frm->str and frm->length. These two arguments are passed around for a lot of functions. Would be easier if all functions would just take handler. <cut> >@@ -718,10 +535,8 @@ static bool pack_header(uchar *forminfo, > my_snprintf(warn_buff, sizeof(warn_buff), ER(ER_TOO_LONG_FIELD_COMMENT), > field->field_name, > static_cast<ulong>(COLUMN_COMMENT_MAXLEN)); >- /* do not push duplicate warnings */ >- if (!check_duplicate_warning(current_thd, warn_buff, strlen(warn_buff))) >- push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, >- ER_TOO_LONG_FIELD_COMMENT, warn_buff); >+ push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, >+ ER_TOO_LONG_FIELD_COMMENT, warn_buff); You could clean up the above code at the same time. Now we duplicate a lot of code above. The full code should changed as follows: if ((current_thd->variables.sql_mode & (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES))) { my_error(ER_TOO_LONG_FIELD_COMMENT, MYF(0), field->field_name, static_cast<ulong>(COLUMN_COMMENT_MAXLEN)); DBUG_RETURN(1); } char warn_buff[MYSQL_ERRMSG_SIZE]; my_snprintf(warn_buff, sizeof(warn_buff), ER(ER_TOO_LONG_FIELD_COMMENT), field->field_name, static_cast<ulong>(COLUMN_COMMENT_MAXLEN)); push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_TOO_LONG_FIELD_COMMENT, warn_buff); field->comment.length= tmp_len; -> bool strict= (current_thd->variables.sql_mode & (MODE_STRICT_TRANS_TABLES | MODE_STRICT_ALL_TABLES))); my_error(ER_TOO_LONG_FIELD_COMMENT, MYF(strict ? 0 : ME_JUST_WARNING), field->field_name, static_cast<ulong>(COLUMN_COMMENT_MAXLEN)); if (strict) DBUG_RETURN(1); field->comment.length= tmp_len; >@@ -833,7 +647,7 @@ static bool pack_header(uchar *forminfo, > } > /* Hack to avoid bugs with small static rows in MySQL */ > reclength=max(file->min_record_length(table_options),reclength); >- if (info_length+(ulong) create_fields.elements*FCOMP+288+ >+ if ((ulong) create_fields.elements*FCOMP+288+ 288 -> FRM_FORM_LENGTH <cut> >- /* Save fields, fieldnames and intervals */ >+static size_t packed_fields_length(List<Create_field> &create_fields) >+{ >+ Create_field *field; >+ size_t length= 0; >+ DBUG_ENTER("packed_fields_length"); > >-static bool pack_fields(File file, List<Create_field> &create_fields, >+ List_iterator<Create_field> it(create_fields); >+ uint int_count=0; >+ while ((field=it++)) >+ { >+ if (field->interval_id > int_count) >+ { >+ int_count= field->interval_id; >+ length++; >+ for (int i=0; field->interval->type_names[i]; i++) >+ { >+ length+= field->interval->type_lengths[i]; >+ length++; >+ } >+ length++; >+ } >+ if (field->vcol_info) >+ { >+ length+= field->vcol_info->expr_str.length + >+ FRM_VCOL_HEADER_SIZE(field->interval); Should be: length+= field->vcol_info->expr_str.length + FRM_VCOL_HEADER_SIZE(field->interval_id); Why? This is the code where the byte is written in pack_fields(). (The code you copied was also wrong, see below) if (field->interval_id) *buff++= (uchar) field->interval_id; <cut> >+static bool pack_fields(uchar *buff, List<Create_field> &create_fields, <cut> >@@ -950,40 +791,29 @@ static bool pack_fields(File file, List< > the additional data saved for the virtual field > */ > buff[12]= cur_vcol_expr_len= field->vcol_info->expr_str.length + >- FRM_VCOL_HEADER_SIZE(field->interval!=NULL); >- vcol_info_length+= cur_vcol_expr_len + >- FRM_VCOL_HEADER_SIZE(field->interval!=NULL); >+ FRM_VCOL_HEADER_SIZE(field->interval); >+ vcol_info_length+= cur_vcol_expr_len; Change field->interval to field->interval_id >=== modified file 'storage/archive/ha_archive.cc' >--- storage/archive/ha_archive.cc 2013-01-23 15:24:04 +0000 >+++ storage/archive/ha_archive.cc 2013-03-06 20:23:01 +0000 >+int archive_discover(handlerton *hton, THD* thd, TABLE_SHARE *share) > { > DBUG_ENTER("archive_discover"); >- DBUG_PRINT("archive_discover", ("db: %s, name: %s", db, name)); >+ DBUG_PRINT("archive_discover", ("db: %s, name: %s", share->db.str, >+ share->table_name.str)); When you change DBUG_PRINT, please also fix the syntax to be same as the rest of the code. The above should be: DBUG_PRINT("archive_discover", ("db: '%s' name: '%s'", share->db.str, share->table_name.str)); (No comma, double space, ' around string arguments) >@@ -738,56 +748,40 @@ int ha_archive::create(const char *name, <cut> >+ /* >+ Here is where we open up the frm and pass it to archive to store >+ */ >+ if (!table_arg->s->read_frm_image(&frm_ptr, &frm_len)) >+ { >+ azwrite_frm(&create_stream, frm_ptr, frm_len); >+ my_free(const_cast<uchar*>(frm_ptr)); >+ } Generally it would be better to have a function: table_arg->s->free_frm_image(&frm_ptr) Because the server could be compiled with another memory allocator than the storage engine (DBUG / NO_DBUG). >=== modified file 'storage/federatedx/ha_federatedx.cc' >--- storage/federatedx/ha_federatedx.cc 2013-01-23 15:24:04 +0000 >+++ storage/federatedx/ha_federatedx.cc 2013-03-10 10:49:49 +0000 >@@ -3588,6 +3574,71 @@ int ha_federatedx::rollback(handlerton * > DBUG_RETURN(return_val); > } > >+ >+/* >+ Federated supports assisted discovery, like >+ CREATE TABLE t1 CONNECTION="mysql://joe:pass@192.168.1.111/federated/t1"; >+ but not a fully automatic discovery where a table magically appear >+ on any use (like, on SELECT * from t1). >+*/ >+int ha_federatedx::discover_assisted(handlerton *hton, THD* thd, >+ TABLE_SHARE *table_s, HA_CREATE_INFO *info) <cut> >+ query.copy(rdata[1], rlen[1], cs); >+ query.append(STRING_WITH_LEN(" CONNECTION=\""), cs); >+ query.append(table_s->connect_string.str, table_s->connect_string.length, cs); >+ query.append('"'); Shouldn't we need to quote the string properly? (It may have " inside) Other things: - Please run sql_bench/test-create on your tree to verify that things are now faster (should be as we don't have to open a frm when a table is created). - Test it also for temporary memory tables (assuming you can get rid of the .frm for them) Regards, Monty

2 3

[Maria-developers] KB Question: Storage engine plugin that "proxies" another engine?
by Daniel Bartholomew 08 Apr '13

08 Apr '13

The following question has been posted to the AskMonty Knowledgebase: https://kb.askmonty.org/en/storage-engine-plugin-that-proxies-another-engin… - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Storage engine plugin that "proxies" another engine? I would like to write a plugin that adds transparent versioning support for table rows. The idea is one would create a table and specify something like "Engine=Versioned", which would create two regular tables in InnoDB/MyISAM. One table to hold the current data, and one to hold a couple of previous versions. Then, when running UPDATE/DELETE statements, the "versioned" engine would first copy the current data to the "history" table and then forward the statement to the underlying storage engine. Is this possible to do in a nice way using the plugin architecture? Thanks Thomas - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 Monty Program - http://montyprogram.com

1 0

[Maria-developers] mysql test question
by Rich Prohaska 06 Apr '13

06 Apr '13

Hello, I was wondering if there was a way to run a mysql-test on with a prebuilt data directory. If so, can you point me to some example? Thanks Rich Prohaska

3 4

[Maria-developers] Rev 3712: MDEV-4338 : Support atomic option on directFS/FusionIO
by Sergei Golubchik 05 Apr '13

05 Apr '13

Hi, Vladislav! On Mar 29, Vladislav Vaintroub wrote: > ------------------------------------------------------------ > revno: 3712 > revision-id: wlad(a)montyprogram.com-20130328203348-1qe9u9nlq6ol9b8l > parent: igor(a)askmonty.org-20130329021836-x6swah73a59im9tn > fixes bug: https://mariadb.atlassian.net/browse/MDEV-4338 > committer: Vladislav Vaintroub <wlad(a)montyprogram.com> > branch nick: 5.5 > timestamp: Thu 2013-03-28 21:33:48 +0100 > message: > MDEV-4338 : Support atomic option on directFS/FusionIO. > === modified file 'storage/xtradb/handler/ha_innodb.cc' > --- a/storage/xtradb/handler/ha_innodb.cc 2013-03-08 18:08:45 +0000 > +++ b/storage/xtradb/handler/ha_innodb.cc 2013-03-28 20:33:48 +0000 > @@ -185,6 +185,7 @@ static my_bool innobase_file_format_chec > static my_bool innobase_log_archive = FALSE; > static char* innobase_log_arch_dir = NULL; > #endif /* UNIV_LOG_ARCHIVE */ > +static my_bool innobase_use_atomic_writes = TRUE; > static my_bool innobase_use_doublewrite = TRUE; > static my_bool innobase_use_checksums = TRUE; > static my_bool innobase_fast_checksum = FALSE; > @@ -3057,6 +3058,35 @@ innobase_init( > srv_kill_idle_transaction = 0; > #endif > > + srv_use_atomic_writes = (ibool) innobase_use_atomic_writes; Is that the typical usage pattern in the innodb code? Because it looks a bit silly to me, why couldn't you create a sysvar directly on srv_use_atomic_writes, why an intermediate innobase_use_atomic_writes variable? > + if (innobase_use_atomic_writes) { > + fprintf(stderr, "InnoDB: using atomic writes.\n"); > + > + /* Force doublewrite buffer off, atomic writes replace it. */ > + if (srv_use_doublewrite_buf) { > + fprintf(stderr, "InnoDB: Switching off doublewrite buffer " > + "because of atomic writes.\n"); > + innobase_use_doublewrite = srv_use_doublewrite_buf = FALSE; > + } > + > + /* Force O_DIRECT on Unixes (on Windows writes are always unbuffered)*/ > +#ifndef _WIN32 > + if(!innobase_file_flush_method || > + !strstr(innobase_file_flush_method, "O_DIRECT")) { > + innobase_file_flush_method = > + srv_file_flush_method_str = (char*)"O_DIRECT"; > + fprintf(stderr, "InnoDB: using O_DIRECT due to atomic writes.\n"); > + } > +#endif > +#ifdef HAVE_POSIX_FALLOCATE > + /* Due to a bug in directFS, using atomics needs > + * posix_fallocate to extend the file > + * pwrite() past end of the file won't work > + */ > + srv_use_posix_fallocate = TRUE; > +#endif > + } it'd be nice if you could try os_file_set_atomic_writes() here to see if that works. This function creates and opens quite a few files, you could use one of them to mark it for atomic writes, and if that would fail, you'd disable atomic writes, and wouldn't change innobase_file_flush_method and innobase_use_doublewrite. Btw, why not to use posix_fallocate whenever it's available? Or, at least, with its own --innodb-use-fallocate option? Regards, Sergei

3 6

Re: [Maria-developers] MDEV-3917 multiple use locks (GET_LOCK) in one connection
by Sergei Golubchik 05 Apr '13

05 Apr '13

Hi, Holyfoot! (Kostja - there're a couple of questions at the end that you might want to reply to) On Apr 02, holyfoot(a)askmonty.org wrote: > At file:///home/hf/wmar/mdev-3917/ > > ------------------------------------------------------------ > revno: 3510 > revision-id: holyfoot(a)askmonty.org-20130402085219-1sxuzssq7segeig4 > parent: igor(a)askmonty.org-20130331221855-1n7hagklb3soplxq > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev-3917 > timestamp: Tue 2013-04-02 13:52:19 +0500 > message: > MDEV-3917 multiple use locks (GET_LOCK) in one connection. > The patch contributed by Konstantin Osipov applied. > Native comments: > Implement multiple user-level locks per connection. > > GET_LOCK() function in MySQL allows a connection to hold at most > one user level lock. Taking a new lock automatically releases the > old lock, if any. > > The limit of one lock per session existed since early versions > of MySQL didn't have a deadlock detector for SQL locks. > MDL patches in MySQL 5.5 added a deadlock detector, > so starting from 5.5 it became possible to take multiple locks > in any order -- a deadlock, should it occur, would be detected > and an error returned to the client which closed the wait chain. > > This is exactly what is done in this patch: ULLs are moved > to use MDL subsystem. > > also: > MDL_key::USER renamed to MDL::USER_LOCK What does that mean? > boundary checks for user lock name added. > === modified file 'sql/item_func.cc' > --- a/sql/item_func.cc 2013-03-27 22:41:02 +0000 > +++ b/sql/item_func.cc 2013-04-02 08:52:19 +0000 > @@ -4010,7 +3896,121 @@ int Interruptible_wait::wait(mysql_cond_ > > > /** > - Get a user level lock. If the thread has an old lock this is first released. > + For locks with EXPLICIT duration, MDL returns a new ticket > + every time a lock is granted. This allows to implement recursive > + locks without extra allocation or additional data structures, such > + as below. However, if there are too many tickets in the same > + MDL_context, MDL_context::find_ticket() is getting too slow, > + since it's using a linear search. > + This is why a separate structure is allocated for a user > + level lock, and before requesting a new lock from MDL, > + GET_LOCK() checks thd->ull_hash if such lock is already granted, > + and if so, simply increments a reference counter. > +*/ > + > +class User_level_lock > +{ > +public: > + MDL_ticket *lock; > + int refs; > +}; > + > + > +/** Extract a hash key from User_level_lock. */ > + > +uchar *ull_get_key(const uchar *ptr, size_t *length, > + my_bool not_used __attribute__((unused))) > +{ > + User_level_lock *ull = (User_level_lock*) ptr; > + MDL_key *key = ull->lock->get_key(); > + *length= key->length(); > + return (uchar*) key->ptr(); > +} > + > + > +/** > + Release all user level locks for this THD. > +*/ > + > +void mysql_ull_cleanup(THD *thd) > +{ > + User_level_lock *ull; > + DBUG_ENTER("mysql_ull_cleanup"); > + > + for (uint i= 0; i < thd->ull_hash.records; i++) > + { > + ull = (User_level_lock*) my_hash_element(&thd->ull_hash, i); > + thd->mdl_context.release_lock(ull->lock); > + free(ull); my_free > + } > + > + my_hash_free(&thd->ull_hash); > + > + DBUG_VOID_RETURN; > +} > + > + > +/** > + Set explicit duration for metadata locks corresponding to > + user level locks to protect them from being released at the end > + of transaction. > +*/ > + > +void mysql_ull_set_explicit_lock_duration(THD *thd) > +{ > + User_level_lock *ull; > + DBUG_ENTER("mysql_ull_set_explicit_lock_duration"); > + > + for (uint i= 0; i < thd->ull_hash.records; i++) > + { > + ull= (User_level_lock*) my_hash_element(&thd->ull_hash, i); > + thd->mdl_context.set_lock_duration(ull->lock, MDL_EXPLICIT); > + } > + DBUG_VOID_RETURN; > +} > + > + > +/** > + When MDL detects a lock wait timeout, it pushes > + an error into the statement diagnostics area. > + For GET_LOCK(), lock wait timeout is not an error, > + but a special return value (0). NULL is returned in > + case of error. > + Capture and suppress lock wait timeout. > +*/ > + > +class Lock_wait_timeout_handler: public Internal_error_handler > +{ > +public: > + Lock_wait_timeout_handler() :m_lock_wait_timeout(false) {} > + > + bool m_lock_wait_timeout; > + > + bool handle_condition(THD * /* thd */, uint sql_errno, > + const char * /* sqlstate */, > + MYSQL_ERROR::enum_warning_level /* level */, > + const char *message, > + MYSQL_ERROR ** /* cond_hdl */); > +}; > + > +bool > +Lock_wait_timeout_handler:: > +handle_condition(THD * /* thd */, uint sql_errno, > + const char * /* sqlstate */, > + MYSQL_ERROR::enum_warning_level /* level */, > + const char *message, > + MYSQL_ERROR ** /* cond_hdl */) > +{ > + if (sql_errno == ER_LOCK_WAIT_TIMEOUT) > + { > + m_lock_wait_timeout= true; > + return true; /* condition handled */ > + } > + return false; > +} > + > +/** > + Get a user level lock. > > @retval > 1 : Got lock > @@ -4039,104 +4038,75 @@ longlong Item_func_get_lock::val_int() > it's not guaranteed to be same as on master. > */ > if (thd->slave_thread) > + { > + null_value= 0; > DBUG_RETURN(1); > + } > > if (!res || !res->length()) > + DBUG_RETURN(0); > + > + if (res->length() > NAME_LEN) > { > + my_error(ER_TOO_LONG_IDENT, MYF(0), res->c_ptr_safe()); > DBUG_RETURN(0); > } > + > DBUG_PRINT("info", ("lock %.*s, thd=%ld", res->length(), res->ptr(), > (long) thd->real_id)); > + /* HASH entries are of type User_level_lock. */ > + if (! my_hash_inited(&thd->ull_hash) && > + my_hash_init(&thd->ull_hash, &my_charset_bin, > + 16 /* small hash */, 0, 0, ull_get_key, NULL, 0)) > { > + DBUG_RETURN(0); > } > > + MDL_request ull_request; > + ull_request.init(MDL_key::USER_LOCK, res->c_ptr_safe(), "", > + MDL_SHARED_NO_WRITE, MDL_EXPLICIT); > + MDL_key *ull_key = &ull_request.key; > > > + if ((ull= (User_level_lock*) > + my_hash_search(&thd->ull_hash, ull_key->ptr(), ull_key->length()))) > + { > + /* Recursive lock */ > + ull->refs++; > + null_value = 0; > + DBUG_RETURN(1); > + } > > + Lock_wait_timeout_handler lock_wait_timeout_handler; > + thd->push_internal_handler(&lock_wait_timeout_handler); > + bool error= thd->mdl_context.acquire_lock(&ull_request, timeout); > + (void) thd->pop_internal_handler(); > + if (error) > { > + if (lock_wait_timeout_handler.m_lock_wait_timeout) > + null_value= 0; > + DBUG_RETURN(0); > } > > + ull= (User_level_lock*) malloc(sizeof(User_level_lock)); my_malloc() with MYF(MY_WME|MY_THREAD_SPECIFIC) > + if (ull == NULL) > { > + thd->mdl_context.release_lock(ull_request.ticket); > + DBUG_RETURN(0); > } > + > + ull->lock= ull_request.ticket; > + ull->refs= 1; > + > + if (my_hash_insert(&thd->ull_hash, (uchar*) ull)) > { > + thd->mdl_context.release_lock(ull->lock); > + free(ull); my_free > + DBUG_RETURN(0); > } > + null_value= 0; > > + DBUG_RETURN(1); > } > > > @@ -4151,43 +4121,104 @@ longlong Item_func_get_lock::val_int() > longlong Item_func_release_lock::val_int() > { > DBUG_ASSERT(fixed == 1); > + String *res= args[0]->val_str(&value); > + THD *thd= current_thd; > DBUG_ENTER("Item_func_release_lock::val_int"); > + null_value= 1; > + > if (!res || !res->length()) > + DBUG_RETURN(0); > + > + if (res->length() > NAME_LEN) > { > + my_error(ER_TOO_LONG_IDENT, MYF(0), res->c_ptr_safe()); > DBUG_RETURN(0); > } > + > DBUG_PRINT("info", ("lock %.*s", res->length(), res->ptr())); > > + MDL_key ull_key; > + ull_key.mdl_key_init(MDL_key::USER_LOCK, res->c_ptr_safe(), ""); > + > + User_level_lock *ull; > + > + if (!(ull= > + (User_level_lock*) my_hash_search(&thd->ull_hash, > + ull_key.ptr(), ull_key.length()))) > { > + null_value= thd->mdl_context.get_lock_owner(&ull_key) == 0; > + DBUG_RETURN(0); > } > + null_value= 0; > + if (--ull->refs == 0) > { > + my_hash_delete(&thd->ull_hash, (uchar*) ull); > + thd->mdl_context.release_lock(ull->lock); > + free(ull); my_free > } > + DBUG_RETURN(1); > +} > + > + > +/** > + Check a user level lock. > + > + Sets null_value=TRUE on error. > + > + @retval > + 1 Available > + @retval > + 0 Already taken, or error > +*/ > + > +longlong Item_func_is_free_lock::val_int() > +{ > + DBUG_ASSERT(fixed == 1); > + String *res= args[0]->val_str(&value); > + THD *thd= current_thd; > + null_value= 1; > + this block ----- from here > + if (!res || !res->length()) > + return 0; > + > + if (res->length() > NAME_LEN) > + { > + my_error(ER_TOO_LONG_IDENT, MYF(0), res->c_ptr_safe()); > + return 0; > + } and up ---- to here is repeated four times. please move it to a separate function. Like if (!ull_name_ok(res)) return 0; > + > + MDL_key ull_key; > + ull_key.mdl_key_init(MDL_key::USER_LOCK, res->c_ptr_safe(), ""); > + > + null_value= 0; > + return thd->mdl_context.get_lock_owner(&ull_key) == 0; > +} > + > + > +longlong Item_func_is_used_lock::val_int() > +{ > + DBUG_ASSERT(fixed == 1); > + String *res= args[0]->val_str(&value); > + THD *thd= current_thd; > + null_value= 1; > + > + if (!res || !res->length()) > + return 0; > + > + if (res->length() > NAME_LEN) > + { > + my_error(ER_TOO_LONG_IDENT, MYF(0), res->c_ptr_safe()); > + return 0; > + } > + > + MDL_key ull_key; > + ull_key.mdl_key_init(MDL_key::USER_LOCK, res->c_ptr_safe(), ""); > + ulong thread_id = thd->mdl_context.get_lock_owner(&ull_key); > + if (thread_id == 0) > + return 0; > + > + null_value= 0; > + return thread_id; > } > > === modified file 'sql/mdl.cc' > --- a/sql/mdl.cc 2013-01-29 14:10:47 +0000 > +++ b/sql/mdl.cc 2013-04-02 08:52:19 +0000 > @@ -2094,8 +2151,6 @@ MDL_context::acquire_lock(MDL_request *m > > find_deadlock(); > > - if (lock->needs_notification(ticket)) > - { okay, so before the patch only locks that needs_notification were using the loop with short waits. Now all locks do. Presumably to check whether thd_is_connected still. Before the patch, how were client disconnects handled? Like, one could have started to wait on the mdl lock, and then disconnect. Was the wait aborted? > struct timespec abs_shortwait; > set_timespec(abs_shortwait, 1); > wait_status= MDL_wait::EMPTY; > @@ -2106,17 +2163,25 @@ MDL_context::acquire_lock(MDL_request *m > > if (wait_status != MDL_wait::EMPTY) > break; > + /* Check if the client is gone while we were waiting. */ > + if (! thd_is_connected(m_thd)) > + { > + /* > + * The client is disconnected. Don't wait forever: > + * assume it's the same as a wait timeout, this > + * ensures all error handling is correct. > + */ > + wait_status= MDL_wait::TIMEOUT; > + break; > + } > > mysql_prlock_wrlock(&lock->m_rwlock); > + if (lock->needs_notification(ticket)) why this if() is under the prlock, and not the other way around? > lock->notify_conflicting_locks(this); > mysql_prlock_unlock(&lock->m_rwlock); > set_timespec(abs_shortwait, 1); > } > if (wait_status == MDL_wait::EMPTY) > - wait_status= m_wait.timed_wait(m_thd, &abs_timeout, TRUE, > - mdl_request->key.get_wait_state_name()); > - } > - else > wait_status= m_wait.timed_wait(m_thd, &abs_timeout, TRUE, > mdl_request->key.get_wait_state_name()); Regards, Sergei

1 0

[Maria-developers] MDEV-4145/MWL#253 review feedback (unfinished)
by Sergei Petrunia 03 Apr '13

03 Apr '13

Hello Igor, Please find some review feedback below. ===== sql_statistics.cc has this line with comment: > If the value the variable 'use_stat_tables' is set to > "preferably" the optimizer uses a particular statistical data only if > it can't be found in the statistical data. the part > uses a particular statistical data > only if it can't be found > in the statistical data. doesn't seem to make any sense. Is this a typo? ===== sql_statistics.cc: collect_statistics_for_table() has this code: > table_field->collected_stats->cleanup(); > } > bitmap_clear_all(table->write_set); Why suddenly no indentation on the line with the bitmap_clear_all() call? This looks as if a merge has gone wrong, please fix. ===== sql_statistics.cc has this : > class Table_stat: public Stat_table > { > > private: > > Field *db_name_field; /* Field for the column table_stats.db_name */ Why do all class definitions start with 'private:'? It is active by default in C++. The code looks as if it was auto-translated from some other language. ===== I see that my progress reporting patch from November is not part of the tree yet. ===== I don't any code that would check if table DDLs of statistical tables are what the server expects them to be. I think the check should be made, just like it is made for mysql.proc and other tables. ==== Then I started to play with the code and have filed MDEV-4350, MDEV-4357, MDEV-4359, MDEV-4360, MDEV-4362, MDEV-4363, MDEV-4364. I find it difficult to proceed when there are so many simple counterexamples. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] read_buffer_size query
by Ian Gilfillan 02 Apr '13

02 Apr '13

Hi I'm working on adding complete descriptions to the knowledgebase for all the server variables right now, and have a query on the read_buffer_size variable. The default in my MariaDB 10.0.1 seems to be 2097152, but it's listed on the MySQL docs with a default of 131072. I can't find a mention in the changelogs of this having changed - can anyone tell me in which version the change in default happened? Also, in the MySQL documentation, this variable is described as applying to MyISAM tables, while in the only short description on the Knowledgebase I can find, at https://kb.askmonty.org/en/mysqld-options-full-list/, it's described more generally, not specifically mentioning MyISAM. Does this variable apply to other storage engines as well now (Aria?), or still only MyISAM? thanks, ian gilfillan

3 4

[Maria-developers] Cassandra disabled due to excessive memory usage causing test failures
by Kristian Nielsen 02 Apr '13

02 Apr '13

Hi, When I added my 10.0-mdev26 tree to buildbot, I got some strange errors on the kvm-fulltest2 builder. I finally tracked it down to be caused by the OOM killer killing random processes. The root issue is Cassandra. At some point it seems cassandra was enabled in the VM used by the fulltest2 builder. However, just starting up Cassandra creates a jsvc process that uses 3.4 _gigabyte_ of memory, 1.3 GB of which is resident. That is too much... I also noticed that cassandra tests are not even run, plugins.cassandra is skipped due to cassandra not running. Possibly this is because the OOM killer has killed the process ;-). In any case, for now I have disabled cassandra on the -fulltest VMs: sudo update-rc.d cassandra disable If someone wants to re-enable it, feel free, but please first make sure that it does not cause unrelated test failures due to excessive memory usage! I would suggest not to run cassandra by default, instead add a separate buildbot step that explicitly starts up cassandra when needed. ---- In general, I am disappointed about the state of our trees. This problem seems to have been there for more than a month without anyone doing anything, and there are tons of other test failures in 10.0 and 10.0-base. We need to tighten up our processes here. Remember, the rules are that anything major should be green in a feature tree before pushing to a main tree. Clearly this is not what is happening at the moment. It's ridiculous to constantly hear people pressing for release of 10.0.2-beta when our trees are not even alpha state ... - Kristian.

1 0

[Maria-developers] I have a friend. Her name is Maria
by Кукушкин Александр 01 Apr '13

01 Apr '13

Hello! excuse me for off topic. I have a friend, her name is Maria and she has a birthday today. I thought maybe someone of you could write a commit message mentioning her. Wish her good performance and persistence or something like that. Then I could just show her a page like that one http://bazaar.launchpad.net/~maria-captains/maria/10.0/revision/3505 What do you think about that? is it possible? (sorry if this message is buplicate, I tried to post it yesterday to your mailing list but it seems like I failed)

1 1

Re: [Maria-developers] Rev 3497: MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252)
by Sergei Golubchik 29 Mar '13

29 Mar '13

Hi, Holyfoot! Please push, with one little change: On Feb 19, holyfoot(a)askmonty.org wrote: > > message: > MDEV-318 IF (NOT) EXIST clauses for ALTER TABLE (MWL #252). > Syntax modified to allow statements: > ALTER TABLE ADD/DROP COLUMN > ALTER TABLE ADD/DROP INDEX > ALTER TABLE ADD/DROP FOREIGN KEY > ALTER TABLE ADD/DROP PARTITION > ALTER TABLE CHANGE COLUMN > ALTER TABLE MODIFY COLUMN > DROP INDEX > to have IF (NOT) EXISTS options. > Appropriate implementations added to mysql_alter_table(). ... > key_def: > - normal_key_type opt_ident key_alg '(' key_list ')' > + normal_key_type opt_if_not_exists_ident key_alg '(' key_list ')' > { Lex->option_list= NULL; } remove your new opt_if_not_exists_ident rule, write it like - normal_key_type opt_ident key_alg '(' key_list ')' + normal_key_type opt_if_not_exists opt_ident key_alg '(' key_list ')' Regards, Sergei

2 2

[Maria-developers] New problem with GTID patch
by Pavel Ivanov 29 Mar '13

29 Mar '13

Kristian, Unfortunately with your recent commit (revision 3546) test rpl.rpl_gtid_startpos doesn't work when GTID patch is applied on top of 10.0.1 tarball. It works okay in 10.0-mdev26 though, so I'm not sure if you'll want to look at the problem now. In particular the problematic addition is if (!is_relay_log && read_state_from_file()) DBUG_RETURN(1); to function MYSQL_BIN_LOG::open(). Without it test works. With it test breaks in the section "Test that master gives error when slave asks for empty gtid pos and binlog files have been purged". The problem is when get_gtid_list_event() is called from gtid_find_binlog_file() it returns event with count == 0. It causes contains_all_slave_gtid() to return true and master doesn't send error to slave as expected... I didn't look in any further details because I'm not familiar with everything that should happen here that much. If you want me to look at something else to better understand the problem let me know. Pavel

2 3

[Maria-developers] (no subject)
by Sergei Petrunia 28 Mar '13

28 Mar '13

Hello Igor, I was reviewing histogram code. Not much feedback so far, but I thought I would let you know: == Code questions == Is middle_point_pos() a good functio nname? It was not apparent to me what it meant. For me, "middle point" is a point in the middle of a range, that is, a point equidistant from both ends. Maybe, "position_in_range" will be better? == Histogram storage questions == * What does hist_size column mean? I suppose, it is number of columns in the histogram? * Do we want to support only one kind of histogram? If not, maybe we should provision space for histogram type? * The histogram column is VARBINARY(255). Why set a hard limit of 255 bytes? Maybe, use a BLOB from the start? == A possible bug == I have a column with lots of NULLs: MariaDB [test]> select nulls_ratio from mysql.column_stats where table_name='one_k' and column_name='tnulls'; +-------------+ | nulls_ratio | +-------------+ | 0.9000 | +-------------+ 1 row in set (0.00 sec) The following query crashes in maria-10.0-mwl253 tree. AFAIU, Timour has fixed the crash in 10.0-mdev83 tree. With that tree, I get: MariaDB [test]> explain extended select * from one_k where tnulls is not null; +------+-------------+-------+------+---------------+------+---------+------+------+----------+-------------+ | id | select_type | table | type | possible_keys | key | key_len | ref | rows | filtered | Extra | +------+-------------+-------+------+---------------+------+---------+------+------+----------+-------------+ | 1 | SIMPLE | one_k | ALL | NULL | NULL | NULL | NULL | 969 | 100.00 | Using where | +------+-------------+-------+------+---------------+------+---------+------+------+----------+-------------+ 1 row in set, 1 warning (0.00 sec) Note that filtered=100%. It should be 10%. On Mon, Mar 25, 2013 at 11:48:30PM -0700, Igor Babaev wrote: > At file:///home/igor/maria/maria-10.0-mwl253/ > > ------------------------------------------------------------ > revno: 3502 > revision-id: igor(a)askmonty.org-20130326064829-3x0g8p1g7nbptusd > parent: igor(a)askmonty.org-20130311144424-cwqe1m70in3bora0 > committer: Igor Babaev <igor(a)askmonty.org> > branch nick: maria-10.0-mwl253 > timestamp: Mon 2013-03-25 23:48:29 -0700 > message: > Added histogams for table columns. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] Bugs in GTID implementation
by Kristian Nielsen 27 Mar '13

27 Mar '13

Pavel Ivanov <pivanof(a)google.com> writes: > way to fix them. Also if you can please look at the attached patch > containing fixes to all tests after GTID addition. There are some > questionable changes in there, so I would appreciate if you could > evaluate its correctness and consider including it into MariaDB tree. Right, so now I finished going through the whole testsuite, making all necessary adjustments to .result files (and a bit to the test cases). This is a _huge_ patch, 70k lines :-( This is due to the new GTID events, every SHOW BINLOG EVENTS and mysqldump output needs updating. I did briefly consider instead trying to filter the output to make it identical to the old one, to avoid the huge .result file changes, but I'm not really sure that is any better in the long run... So, I did this in my 10.0-mdev26 tree, which is based on 10.0-base. I noticed at least two things from your patch that are not part of this: - The --let $keep_gtid_events= 1 statements. I am not sure how this $keep_gtid_events came into the 10.0 tree. It is part of the MySQL 5.6 GTID implementation, which we do not want to merge. I would suggest you instead just remove it from show_events.inc. - There were some new testcases in mysql-test/suite/perfschema in your patch that are not in my tree. They update some digests, I did not investigate what those are about, but I will handle when I merge to 10.0 of course. Thanks for your efforts on preparing the initial patch. It was quite a nice help as a starting point, though I did do some parts of it different due to style or correctness issues. I'm likely to have missed a couple cases of course, but at least this should be a starting point, just let me know if you experience more failures. I do see a non-repatable failure in main.plugin and a DBUG crash which is also in other maria trees, I'll look at those next. The fix is pushed to lp:~maria-captains/maria/10.0-mdev26 as usual. - Kristian.

2 3

[Maria-developers] MariaDB 10 galera?
by Jan Kirchhoff 26 Mar '13

26 Mar '13

Hi, we have been playing around with 5.5.28-galera and went into more serious testing with 5.5.29-galera. We are evaluating to move from a traditional mariadb 5.2 master-slave setup to a 5 or 7 node galera cluster for our production database. I do have a good feeling so far and good experiences in our tests, but as I won't be making any major upgrades any more once we really started testing all of our processes on the galera cluster, I'd like to ask if there is any timeline for a mariadb-10.0-galera release? I couldn't find any information on the mariadb-website regarding further plans for mariadb-galera. Is there any technical reason that no binaries of mariadb-10-galera are available? Thanks Jan

2 1

Re: [Maria-developers] Bugs in GTID implementation
by Kristian Nielsen 26 Mar '13

26 Mar '13

Pavel Ivanov <pivanof(a)google.com> writes: > fixes. Meanwhile I've found one more bug in your code. In > Gtid_log_event::do_apply_event() you assume that mysql_parse() always > succeeds, you don't check thd->is_error() and always return 0. I don't Ah, right, I see. Can you test the appended patch if it fixes the problem? I tried to copy the error handling to be identical to what Query_log_event::do_apply_event("BEGIN") does. - Kristian.

2 3

Re: [Maria-developers] [Commits] Rev 3642: MDEV-4292 fix
by Sergei Golubchik 26 Mar '13

26 Mar '13

Hi, Sanja! On Mar 26, sanja(a)askmonty.org wrote: > revno: 3642 > revision-id: sanja(a)askmonty.org-20130326110746-2y3duai4mpflbq3s > parent: holyfoot(a)askmonty.org-20130322133227-szqis3jzf5izvomq > committer: sanja(a)askmonty.org > branch nick: work-maria-5.3-MDEV-4292 > timestamp: Tue 2013-03-26 13:07:46 +0200 > message: > MDEV-4292 fix. > > Fixed printing column_get finction. Is that a complete new fix? Or it's on top of the old one? Looks like new, but your words "post-review patch" confused me. Anyway, if it's a new patch - ok to push! Regards, Sergei

1 0

[Maria-developers] I would like to run a buildbot
by Dan Demeter 26 Mar '13

26 Mar '13

Hi everyone, I have 2 hardware nodes and I would be really happy to run 2 build bots, on some VMs. :) Kind regards, Dan

2 1

Re: [Maria-developers] Rev 3701: Fixed bug mdev-4311
by Sergei Golubchik 25 Mar '13

25 Mar '13

Hi, Igor! On Mar 22, Igor Babaev wrote: > At file:///home/igor/maria/maria-5.5-bug4311/ > > ------------------------------------------------------------ > revno: 3701 > revision-id: igor(a)askmonty.org-20130322224651-r2tpn9in5i1ifv7a > parent: sergii(a)pisem.net-20130317104125-yyp99euwpir5ueho > committer: Igor Babaev <igor(a)askmonty.org> > branch nick: maria-5.5-bug4311 > timestamp: Fri 2013-03-22 15:46:51 -0700 > message: > Fixed bug mdev-4311 (bug #68749). > This bug was introduced by the patch for WL#3220. > If the memory allocated for the tree to store unique elements > to be counted is not big enough to include all of them then > an external file is used to store the elements. > The unique elements are guaranteed not to be nulls. So, when > reading them from the file we don't have to care about the null > flags of the read values. However, we should remove the flag > at the very beginning of the process. If we don't do it and > if the last value written into the record buffer for the field > whose distinct values needs to be counted happens to be null, > then all values read from the file are considered to be nulls > and are not counted in. > The fix does not remove a possible null flag for the read values. > Rather it just counts the values in the same way it was done > before WL #3220. > === modified file 'sql/item_sum.cc' > --- a/sql/item_sum.cc 2013-02-28 17:42:49 +0000 > +++ b/sql/item_sum.cc 2013-03-22 22:46:51 +0000 > @@ -1460,6 +1460,12 @@ > > bool Aggregator_distinct::unique_walk_function(void *element) > { > + if (item_sum->sum_func() == Item_sum::COUNT_DISTINCT_FUNC) > + { > + Item_sum_count *sum= (Item_sum_count *)item_sum; > + sum->count++; > + return 0; > + } > memcpy(table->field[0]->ptr, element, tree_key_length); > item_sum->add(); > return 0; I'm not sure I like it. You've added a special check for COUNT_DISTINCT_FUNC just before the call of item_sum->add() which is virtual, and Item_sum_count has its own implementation of it. Logically, if there's a virtual method, the check should be in there, not in the caller. And what about SUM(DISTINCT ...) ? Perhaps it's better to mark the item not null, as you've explained in the changeset comment? Regards, Sergei

3 4

Re: [Maria-developers] Rev 3639: MDEV-4292 fix
by Sergei Golubchik 25 Mar '13

25 Mar '13

Hi, Sanja! On Mar 19, sanja(a)askmonty.org wrote: > At file:///home/bell/maria/bzr/work-maria-5.3-MDEV-4292/ > > ------------------------------------------------------------ > revno: 3639 > revision-id: sanja(a)askmonty.org-20130319105139-bxfigoel9pdbgwsn > parent: sergii(a)pisem.net-20130318074424-frdzldas283cvx1w > committer: sanja(a)askmonty.org > branch nick: work-maria-5.3-MDEV-4292 > timestamp: Tue 2013-03-19 12:51:39 +0200 > message: > MDEV-4292 fix. > > Fixed printing column_get finction. > > === modified file 'sql/item_func.cc' > --- a/sql/item_func.cc 2013-03-18 07:44:24 +0000 > +++ b/sql/item_func.cc 2013-03-19 10:51:39 +0000 > @@ -965,7 +965,11 @@ my_decimal *Item_func_numhybrid::val_dec > > void Item_func_signed::print(String *str, enum_query_type query_type) > { > - str->append(STRING_WITH_LEN("cast(")); > + if (args[0]->type() == FUNC_ITEM && > + ((Item_func *) args[0])->functype() == DYNCOL_GET_FUNC) > + str->append(STRING_WITH_LEN("column_get(")); > + else > + str->append(STRING_WITH_LEN("cast(")); > args[0]->print(str, query_type); > str->append(STRING_WITH_LEN(" as signed)")); So, as I said on irc, I don't quite like it. An Item should be independent from its arguments are should not change its name depending on the arguments. I've considered other approaches, like storing item_cast in the Item_dyncol_get or inheriting Item_dyncol_get from cast. But they all complicate the code notably. So, an easy fix that wouldn't contaminate item_cast, could be void Item_dyncol_get::print(String *str, enum_query_type query_type) { DBUG_ASSERT(strncmp(str->ptr() - 5, "cast(", 5) == 0); // see create_func_dyncol_get str->length(str->length() - 5); // removing "cast(" str->append(STRING_WITH_LEN("column_get(")); args[0]->print(str, query_type); str->append(','); args[1]->print(str, query_type); // let the parent cast item add " as <type>)" } Regards, Sergei

1 0

[Maria-developers] Aria/MyISAM and MySQL 5.6.x Compressed Table Compatibility
by Gordan Bobic 22 Mar '13

22 Mar '13

I'm having an issue with MariaDB 10.0.0. I have a bunch of archived compressed MyISAM tables from MySQL 5.6. I can move these around on MySQL 5.6 machines, but when I put them on MariaDB 10.0.0 it fails to recognize them. Has this been fixed in 10.0.1? If not, will it be fixed in 10.0.2? Gordan

2 1

[Maria-developers] Benchmark of connect performance
by Axel Schwenke 22 Mar '13

22 Mar '13

Hi, in the light of http://yoshinorimatsunobu.blogspot.fi/2012/12/non-persistent-connection-per… I did a similar benchmark. I used sysbench-0.4.12 for this with this command line $SYSBENCH --test=oltp --oltp-table-size=1000 --oltp-dist-type=uniform --num-threads=$thread --oltp-read-only=on --oltp-test-mode=simple --oltp-skip-trx --oltp-reconnect-mode=query --oltp-connect-delay=0 --db-ps-mode=disable --mysql-table-engine=InnoDB --mysql-engine-trx=no --mysql-socket=$SOCKET --max-time=60 --max-requests=0 --mysql-user=sysbench --mysql-password=sysbench --percentile=95 run This generates a workload of connect select .. where pk=const disconnect I varied the following: - number of concurrent threads - malloc library: glibc vs. tcmalloc - privileges given to sysbench@localhost * none (--skip-grant-tables) * global = ALL on *.* * db = ALL on sbtest.* * table = ALL on sbtest.sbtest I used the new 64 core machine for this. Everything was compiled locally with the REL_WITH_DEBINFO options. There is a rather huge dependence on the memory allocator. The results don't match Yoshis otherwise. See yourself. XL

3 6

[Maria-developers] Query Stuck in "closing table" State
by Gordan Bobic 20 Mar '13

20 Mar '13

I have a situation with MariaDB 10.0.0 where an INSERT INTO ... SELECT query that takes 3 seconds to run ends up stuck in the closing tables state for 15+ minutes while burning 100% of CPU. I have seen bug reports dating back 5 years that sound very similar but none of them are listed as resolved. Is there a way to debug/troubleshoot this further? The problem is quite intermittent. My data is in a state of constant flux so finding an exact reproducible test case based on data lone isn't likely to be viable. Is there a reasonable way to capture more detailed debug information than what is available from "show full processlist"? Gordan

3 7

Re: [Maria-developers] how to use Select INTO OUTFILE
by Michael Widenius 19 Mar '13

19 Mar '13

Hi! >>>>> "Irwan" == Irwan <irwan_forum(a)yahoo.co.id> writes: First a quick question, which windows version and which MariaDB version are you using? Irwan> how to use into outfile using mariadb to output in specified folder, Irwan> in mysql i use like this Irwan> SELECT * from SSD010.mastergudang INTO OUTFILE Irwan> 'C:/DOCUME~1/USER/LOCALS~1/Temp/17947F77/mastergudang' Irwan> but ini mariadb Irwan> SELECT * from SSD010.mastergudang INTO OUTFILE Irwan> 'C://DOCUME~1//USER//LOCALS~1//Temp//17947F77//mastergudang' Both MariaDB and MYSQL should use the identical syntax here. I wonder if this could be a difference in the clients? What happens if you try to use the MySQL command on windows? Irwan> the output not correct folder like this Irwan> http://prntscr.com/wu0n4 The above screen shows that the output is a into a file, data/DOCUME~1USERLOCALS~1Temp17947F77mastergudang' MariaDB should be able to use both / and \ on windows. In fact, our test suite uses '/' for creating files, not '//', so '/' should work. Irwan> when i use like this failed, Irwan> i'm sure the folder exist Irwan> SELECT * from SSD010.mastergudang INTO OUTFILE Irwan> 'C:\\DOCUME~1\\USER\\LOCALS~1\\Temp\\17947F77\\mastergudang' Irwan> http://prntscr.com/wtypr Errode 13, means 'Access denied'. So this means probably that the directory exists, but the MariaDB service doesn't have right to create a file in it. Wlad, our windows expert says "I think the service is not allowed to write into users temp directory, that's it. But some more context need to be given..." Question from Wlad: "Is mysqld running as service, and if yes, under which account (typically for us it is NetworkService)" ? "As a self-service, first aid to analyze such errors, user can use https://kb.askmonty.org/en/how-to-use-procmon-to-trace-mysqldexe-filesystem…" Hope the above helps. Regards, Monty

1 0

Re: [Maria-developers] utf16le
by Michael Widenius 19 Mar '13

19 Mar '13

Hi! I cc: mariadb-developers to ensure that others can also comment on the patch. Because the patch was not originally submitted there, I am not cutting out ok code parts as I usually do. >>>>> "Alexander" == Alexander Barkov <bar(a)mariadb.org> writes: Alexander> Hi Monty, Alexander> Please review a merge from MySQL-5.6 for utf16le. Alexander> I also merged a few related bug fixes, Alexander> which affected the test "ctype_utf16le": Alexander> - Unreadable warnings in CAST(<ucs2, utf16, utf32 value> AS SIGNED) Alexander> - Errors about unknown collation and unknown charset in cases Alexander> when the SET queries should actually succeed: Alexander> SET collation_connection=<ucs2, utf16, utf32 value>; Alexander> SET character_set_connection=<ucs2, utf16, utf32 value>; Alexander> - MySQL Bug#59145 valgrind warnings for uninitialized values in Alexander> my_strtoll10_mb2 Alexander> - MySQL Bug#32859 Character sets: no warning with non-fitting chariot wheel >---------------------------------------------------------------------- >=== modified file 'cmake/character_sets.cmake' >--- cmake/character_sets.cmake 2011-12-15 21:08:42 +0000 >+++ cmake/character_sets.cmake 2013-03-15 04:14:25 +0000 >@@ -25,14 +25,14 @@ > SET(CHARSETS ${DEFAULT_CHARSET} latin1 utf8 utf8mb4) > SET(CHARSETS_COMPLEX > big5 cp1250 cp932 eucjpms euckr gb2312 gbk latin1 latin2 >- sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32) >+ sjis tis620 ucs2 ujis utf8 utf8mb4 utf16 utf16le utf32) > > SET(CHARSETS_AVAILABLE > binary armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257 > cp850 cp852 cp866 cp932 dec8 eucjpms euckr gb2312 gbk geostd8 > greek hebrew hp8 keybcs2 koi8r koi8u > latin1 latin2 latin5 latin7 macce macroman >-sjis swe7 tis620 ucs2 ujis utf8 utf8mb4 utf16 utf32) >+sjis swe7 tis620 ucs2 ujis utf8 utf8mb4 utf16 utf16le utf32) > > SET (EXTRA_CHARSETS "all") > >=== modified file 'include/m_ctype.h' >--- include/m_ctype.h 2012-04-07 13:58:46 +0000 >+++ include/m_ctype.h 2013-03-14 12:45:40 +0000 >@@ -362,6 +362,8 @@ > extern struct charset_info_st my_charset_utf16_bin; > extern struct charset_info_st my_charset_utf16_general_ci; > extern struct charset_info_st my_charset_utf16_unicode_ci; >+extern struct charset_info_st my_charset_utf16le_bin; >+extern struct charset_info_st my_charset_utf16le_general_ci; > extern struct charset_info_st my_charset_utf32_bin; > extern struct charset_info_st my_charset_utf32_general_ci; > extern struct charset_info_st my_charset_utf32_unicode_ci; > >=== added file 'mysql-test/include/ctype_heap.inc' >--- mysql-test/include/ctype_heap.inc 1970-01-01 00:00:00 +0000 >+++ mysql-test/include/ctype_heap.inc 2012-12-24 16:09:42 +0000 >@@ -0,0 +1,11 @@ >+SELECT @@collation_connection; >+CREATE TABLE t1 ENGINE=HEAP AS SELECT REPEAT (' ', 10) AS a LIMIT 0; >+ALTER TABLE t1 ADD KEY (a); >+CREATE TABLE t2 (a VARCHAR(10)); >+INSERT INTO t2 VALUES ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'); >+INSERT INTO t2 VALUES ('8'),('9'),('A'),('B'),('C'),('D'),('E'),('F'); >+INSERT INTO t1 SELECT CONCAT('a',t21.a,t22.a) FROM t2 t21, t2 t22 ORDER BY 1; >+DROP TABLE t2; >+INSERT INTO t1 VALUES ('a '); >+SELECT a, HEX(a) FROM t1 WHERE a='a'; >+DROP TABLE t1; Monty: What new code / issue does the above test? Please add a comment before the test. >=== modified file 'mysql-test/r/ctype_ucs.result' >--- mysql-test/r/ctype_ucs.result 2013-01-15 18:13:32 +0000 >+++ mysql-test/r/ctype_ucs.result 2013-03-15 04:38:24 +0000 >@@ -1274,7 +1274,7 @@ > CONVERT(QUOTE(CHAR(0xf5 using ucs2)), SIGNED) > 0 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: ''Ãµ'' > End of 5.0 tests > # > # Start of 5.1 tests >@@ -4200,3 +4200,22 @@ > # > # End of 5.5 tests > # >+# >+# Start of 5.6 tests >+# >+# >+# Bug#59145 valgrind warnings for uninitialized values in my_strtoll10_mb2 >+# >+SET NAMES latin1; >+SELECT CONVERT(CHAR(NULL USING ucs2), UNSIGNED); >+CONVERT(CHAR(NULL USING ucs2), UNSIGNED) >+0 >+Warnings: >+Warning 1292 Truncated incorrect INTEGER value: '' >+DO IFNULL(CHAR(NULL USING ucs2), ''); >+DO CAST(CONVERT('' USING ucs2) AS UNSIGNED); >+Warnings: >+Warning 1292 Truncated incorrect INTEGER value: '' >+# >+# End of 5.6 tests >+# > >=== added file 'mysql-test/r/ctype_utf16le.result' >--- mysql-test/r/ctype_utf16le.result 1970-01-01 00:00:00 +0000 >+++ mysql-test/r/ctype_utf16le.result 2013-03-14 15:04:17 +0000 >@@ -0,0 +1,1394 @@ >+SET TIME_ZONE='+03:00'; >+DROP TABLE IF EXISTS t1; >+# >+# Start of 5.6 tests >+# >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+SELECT HEX('a'), HEX('a '); >+HEX('a') HEX('a ') >+6100 61002000 >+select 'a' = 'a', 'a' = 'a ', 'a ' = 'a'; >+'a' = 'a' 'a' = 'a ' 'a ' = 'a' >+1 1 1 >+select 'a\0' = 'a', 'a\0' < 'a', 'a\0' > 'a'; >+'a\0' = 'a' 'a\0' < 'a' 'a\0' > 'a' >+0 1 0 >+select 'a' = 'a\0', 'a' < 'a\0', 'a' > 'a\0'; >+'a' = 'a\0' 'a' < 'a\0' 'a' > 'a\0' >+0 0 1 >+select 'a\0' = 'a ', 'a\0' < 'a ', 'a\0' > 'a '; >+'a\0' = 'a ' 'a\0' < 'a ' 'a\0' > 'a ' >+0 1 0 >+select 'a ' = 'a\0', 'a ' < 'a\0', 'a ' > 'a\0'; >+'a ' = 'a\0' 'a ' < 'a\0' 'a ' > 'a\0' >+0 0 1 >+select 'a a' > 'a', 'a \0' < 'a'; >+'a a' > 'a' 'a \0' < 'a' >+1 1 >+select binary 'a a' > 'a', binary 'a \0' > 'a', binary 'a\0' > 'a'; >+binary 'a a' > 'a' binary 'a \0' > 'a' binary 'a\0' > 'a' >+1 1 1 >+# >+# Check that incomplete utf16le characters in HEX notation >+# are left-padded with zeros >+# >+SELECT HEX(_utf16le 0x44); >+HEX(_utf16le 0x44) >+0044 >+SELECT HEX(_utf16le 0x3344); >+HEX(_utf16le 0x3344) >+3344 >+SELECT HEX(_utf16le 0x113344); >+HEX(_utf16le 0x113344) >+00113344 >+# >+# Check that 0x20 is only trimmed when it is >+# a part of real SPACE character, not just a part >+# of a multibyte sequence. >+# Note, CYRILLIC LETTER ER is used as an example, which >+# is stored as 0x0420 in utf16le, thus contains 0x20 in the >+# low byte. The second character is THREE-PER-M, U+2004, >+# which contains 0x20 in the high byte. >+# >+CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf16le; >+INSERT INTO t1 VALUES (_koi8r 0xF2, _koi8r 0xF2), (_ucs2 X'2004',_ucs2 X'2004'); >+SELECT HEX(word) FROM t1 ORDER BY word; >+HEX(word) >+2004 >+0420 >+SELECT HEX(word2) FROM t1 ORDER BY word2; >+HEX(word2) >+2004 >+0420 >+DELETE FROM t1; >+# >+# Check that real spaces are correctly trimmed. >+# >+INSERT INTO t1 VALUES (_ucs2 X'042000200020', _ucs2 X'042000200020'); >+INSERT INTO t1 VALUES (_ucs2 X'200400200020', _ucs2 X'200400200020'); >+SELECT HEX(word) FROM t1 ORDER BY word; >+HEX(word) >+200420002000 >+042020002000 >+SELECT HEX(word2) FROM t1 ORDER BY word2; >+HEX(word2) >+2004 >+0420 >+DROP TABLE t1; >+# >+# Check LPAD/RPAD >+# >+CREATE TABLE t1 (a VARCHAR(10), pad INT, b VARCHAR(10)) CHARACTER SET utf16le; >+INSERT INTO t1 VALUES (_ucs2 X'0420', 10, _ucs2 X'0421'); >+INSERT INTO t1 VALUES (_ucs2 X'0420', 10, _ucs2 X'04210422'); >+INSERT INTO t1 VALUES (_ucs2 X'0420', 10, _ucs2 X'042104220423'); >+INSERT INTO t1 VALUES (_ucs2 X'0420042104220423042404250426042704280429042A042B',10,_ucs2 X'042104220423'); >+Warnings: >+Warning 1265 Data truncated for column 'a' at row 1 >+INSERT INTO t1 VALUES (_utf32 X'010000', 10, _ucs2 X'0421'); >+INSERT INTO t1 VALUES (_ucs2 X'0421', 10, _utf32 X'010000'); >+SELECT a, pad, b, LPAD(a, pad, b), HEX(LPAD(a, pad, b)) FROM t1; >+a pad b LPAD(a, pad, b) HEX(LPAD(a, pad, b)) >+Ð 10 Ð¡ Ð¡Ð¡Ð¡Ð¡Ð¡Ð¡Ð¡Ð¡Ð¡Ð 2104210421042104210421042104210421042004 >+Ð 10 Ð¡Ð¢ Ð¡Ð¢Ð¡Ð¢Ð¡Ð¢Ð¡Ð¢Ð¡Ð 2104220421042204210422042104220421042004 >+Ð 10 Ð¡Ð¢Ð£ Ð¡Ð¢Ð£Ð¡Ð¢Ð£Ð¡Ð¢Ð£Ð 2104220423042104220423042104220423042004 >+Ð Ð¡Ð¢Ð£Ð¤Ð¥Ð¦Ð§Ð¨Ð© 10 Ð¡Ð¢Ð£ Ð Ð¡Ð¢Ð£Ð¤Ð¥Ð¦Ð§Ð¨Ð© 2004210422042304240425042604270428042904 >+? 10 Ð¡ Ð¡Ð¡Ð¡Ð¡Ð¡Ð¡Ð¡Ð¡Ð¡? 21042104210421042104210421042104210400D800DC >+Ð¡ 10 ? ?????????Ð¡ 00D800DC00D800DC00D800DC00D800DC00D800DC00D800DC00D800DC00D800DC00D800DC2104 Monty: Is the last line with '?' right Note that for test cases, it may sometimes be better to just output the HEX part. Result files with 'wrong' letters will sooner or later cause a problem when someone tries to edit the file for fixing a test result case as the editor may 'scramble some characters. >+DROP TABLE t1; >+CREATE TABLE t1 SELECT >+LPAD(_utf16le X'2004',10,_utf16le X'2104') l, >+RPAD(_utf16le X'2004',10,_utf16le X'2104') r; >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `l` varchar(10) CHARACTER SET utf16le NOT NULL DEFAULT '', >+ `r` varchar(10) CHARACTER SET utf16le NOT NULL DEFAULT '' >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+SELECT HEX(l), HEX(r) FROM t1; >+HEX(l) HEX(r) >+2104210421042104210421042104210421042004 2004210421042104210421042104210421042104 >+DROP TABLE t1; >+CREATE TABLE t1 (f1 CHAR(30)); >+INSERT INTO t1 VALUES ("103000"), ("22720000"), ("3401200"), ("78000"); >+SELECT LPAD(f1, 12, "-o-/") FROM t1; >+LPAD(f1, 12, "-o-/") >+-o-/-o103000 >+-o-/22720000 >+-o-/-3401200 >+-o-/-o-78000 >+DROP TABLE t1; >+# >+# Testing LIKE >+# >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+select @@collation_connection; >+@@collation_connection >+utf16le_general_ci >+create table t1 as select repeat(' ',10) as a union select null; >+alter table t1 add key(a); >+show create table t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `a` varchar(10) CHARACTER SET utf16le DEFAULT NULL, >+ KEY `a` (`a`) >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+insert into t1 values ("a"),("abc"),("abcd"),("hello"),("test"); >+explain select * from t1 where a like 'abc%'; >+id select_type table type possible_keys key key_len ref rows Extra >+1 SIMPLE t1 range a a 43 NULL 1 Using where; Using index >+explain select * from t1 where a like concat('abc','%'); >+id select_type table type possible_keys key key_len ref rows Extra >+1 SIMPLE t1 range a a 43 NULL 1 Using where; Using index >+select * from t1 where a like "abc%"; >+a >+abc >+abcd >+select * from t1 where a like concat("abc","%"); >+a >+abc >+abcd >+select * from t1 where a like "ABC%"; >+a >+abc >+abcd >+select * from t1 where a like "test%"; >+a >+test >+select * from t1 where a like "te_t"; >+a >+test >+select * from t1 where a like "%a%"; >+a >+a >+abc >+abcd >+select * from t1 where a like "%abcd%"; >+a >+abcd >+select * from t1 where a like "%abc\d%"; >+a >+abcd >+drop table t1; >+select 'AA' like 'AA'; >+'AA' like 'AA' >+1 >+select 'AA' like 'A%A'; >+'AA' like 'A%A' >+1 >+select 'AA' like 'A%%A'; >+'AA' like 'A%%A' >+1 >+select 'AA' like 'AA%'; >+'AA' like 'AA%' >+1 >+select 'AA' like '%AA%'; >+'AA' like '%AA%' >+1 >+select 'AA' like '%A'; >+'AA' like '%A' >+1 >+select 'AA' like '%AA'; >+'AA' like '%AA' >+1 >+select 'AA' like 'A%A%'; >+'AA' like 'A%A%' >+1 >+select 'AA' like '_%_%'; >+'AA' like '_%_%' >+1 >+select 'AA' like '%A%A'; >+'AA' like '%A%A' >+1 >+select 'AAA'like 'A%A%A'; >+'AAA'like 'A%A%A' >+1 >+select 'AZ' like 'AZ'; >+'AZ' like 'AZ' >+1 >+select 'AZ' like 'A%Z'; >+'AZ' like 'A%Z' >+1 >+select 'AZ' like 'A%%Z'; >+'AZ' like 'A%%Z' >+1 >+select 'AZ' like 'AZ%'; >+'AZ' like 'AZ%' >+1 >+select 'AZ' like '%AZ%'; >+'AZ' like '%AZ%' >+1 >+select 'AZ' like '%Z'; >+'AZ' like '%Z' >+1 >+select 'AZ' like '%AZ'; >+'AZ' like '%AZ' >+1 >+select 'AZ' like 'A%Z%'; >+'AZ' like 'A%Z%' >+1 >+select 'AZ' like '_%_%'; >+'AZ' like '_%_%' >+1 >+select 'AZ' like '%A%Z'; >+'AZ' like '%A%Z' >+1 >+select 'AZ' like 'A_'; >+'AZ' like 'A_' >+1 >+select 'AZ' like '_Z'; >+'AZ' like '_Z' >+1 >+select 'AMZ'like 'A%M%Z'; >+'AMZ'like 'A%M%Z' >+1 >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES ('ÑÑÐ²Ð°'),('Ð¤ÑÐ²Ð°'),('ÑÐ«Ð²Ð°'),('ÑÑÐÐ°'),('ÑÑÐ²Ð'),('Ð¤Ð«ÐÐ'); >+INSERT INTO t1 VALUES ('ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶'),('Ð¤ÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶'),('ÑÐ«Ð²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶'),('ÑÑÐÐ°Ð¿ÑÐ¾Ð»Ð´Ð¶'); >+INSERT INTO t1 VALUES ('ÑÑÐ²ÐÐ¿ÑÐ¾Ð»Ð´Ð¶'),('ÑÑÐ²Ð°ÐÑÐ¾Ð»Ð´Ð¶'),('ÑÑÐ²Ð°Ð¿Ð Ð¾Ð»Ð´Ð¶'),('ÑÑÐ²Ð°Ð¿ÑÐÐ»Ð´Ð¶'); >+INSERT INTO t1 VALUES ('ÑÑÐ²Ð°Ð¿ÑÐ¾ÐÐ´Ð¶'),('ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»ÐÐ¶'),('ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð'),('Ð¤Ð«ÐÐÐÐ ÐÐÐÐ'); >+SELECT * FROM t1 WHERE a LIKE '%ÑÐ«Ð²Ð°%' ORDER BY BINARY a; >+a >+Ð¤Ð«ÐÐ >+Ð¤Ð«ÐÐÐÐ ÐÐÐÐ >+Ð¤ÑÐ²Ð° >+Ð¤ÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÐ«Ð²Ð° >+ÑÐ«Ð²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐÐ° >+ÑÑÐÐ°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð >+ÑÑÐ²ÐÐ¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð° >+ÑÑÐ²Ð°ÐÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð°Ð¿Ð Ð¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð°Ð¿ÑÐÐ»Ð´Ð¶ >+ÑÑÐ²Ð°Ð¿ÑÐ¾ÐÐ´Ð¶ >+ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»ÐÐ¶ >+ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð >+ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+SELECT * FROM t1 WHERE a LIKE '%ÑÐ«Ð²%' ORDER BY BINARY a; >+a >+Ð¤Ð«ÐÐ >+Ð¤Ð«ÐÐÐÐ ÐÐÐÐ >+Ð¤ÑÐ²Ð° >+Ð¤ÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÐ«Ð²Ð° >+ÑÐ«Ð²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐÐ° >+ÑÑÐÐ°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð >+ÑÑÐ²ÐÐ¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð° >+ÑÑÐ²Ð°ÐÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð°Ð¿Ð Ð¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð°Ð¿ÑÐÐ»Ð´Ð¶ >+ÑÑÐ²Ð°Ð¿ÑÐ¾ÐÐ´Ð¶ >+ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»ÐÐ¶ >+ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð >+ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+SELECT * FROM t1 WHERE a LIKE 'ÑÐ«Ð²Ð°%' ORDER BY BINARY a; >+a >+Ð¤Ð«ÐÐ >+Ð¤Ð«ÐÐÐÐ ÐÐÐÐ >+Ð¤ÑÐ²Ð° >+Ð¤ÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÐ«Ð²Ð° >+ÑÐ«Ð²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐÐ° >+ÑÑÐÐ°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð >+ÑÑÐ²ÐÐ¿ÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð° >+ÑÑÐ²Ð°ÐÑÐ¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð°Ð¿Ð Ð¾Ð»Ð´Ð¶ >+ÑÑÐ²Ð°Ð¿ÑÐÐ»Ð´Ð¶ >+ÑÑÐ²Ð°Ð¿ÑÐ¾ÐÐ´Ð¶ >+ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»ÐÐ¶ >+ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð >+ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+SELECT * FROM t1 WHERE a LIKE 'ÑÐ«Ð²Ð°%' COLLATE utf16le_bin ORDER BY BINARY a; >+a >+ÑÐ«Ð²Ð° >+ÑÐ«Ð²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶ >+DROP TABLE t1; >+CREATE TABLE t1 (word VARCHAR(64) NOT NULL, PRIMARY KEY (word)) >+ENGINE=MyISAM CHARACTER SET utf16le; >+INSERT INTO t1 (word) VALUES ("cat"); >+SELECT * FROM t1 WHERE word LIKE "c%"; >+word >+cat >+SELECT * FROM t1 WHERE word LIKE "ca_"; >+word >+cat >+SELECT * FROM t1 WHERE word LIKE "cat"; >+word >+cat >+SELECT * FROM t1 WHERE word LIKE _ucs2 x'00630025'; >+word >+cat >+SELECT * FROM t1 WHERE word LIKE _ucs2 x'00630061005F'; >+word >+cat >+DROP TABLE t1; >+# >+# Check that INSERT() works fine. >+# This invokes charpos() function. >+# >+CREATE TABLE t1 ( >+a VARCHAR(10) CHARACTER SET utf16le, >+b VARCHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES ('abc', 'def'); >+SELECT INSERT(a, 10, 2, b) FROM t1; >+INSERT(a, 10, 2, b) >+abc >+SELECT INSERT(a, 1, 2, b) FROM t1; >+INSERT(a, 1, 2, b) >+defc >+DROP TABLE t1; >+# >+# Bug#1264 >+# >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+# >+# Two fields, index >+# >+CREATE TABLE t1 ( >+word VARCHAR(64), >+bar INT(11) DEFAULT 0, >+PRIMARY KEY (word)) >+ENGINE=MyISAM >+CHARSET utf16le >+COLLATE utf16le_general_ci ; >+INSERT INTO t1 (word) VALUES ("aar"); >+INSERT INTO t1 (word) VALUES ("a"); >+INSERT INTO t1 (word) VALUES ("aardvar"); >+INSERT INTO t1 (word) VALUES ("aardvark"); >+INSERT INTO t1 (word) VALUES ("aardvara"); >+INSERT INTO t1 (word) VALUES ("aardvarz"); >+EXPLAIN SELECT * FROM t1 ORDER BY word; >+id select_type table type possible_keys key key_len ref rows Extra >+1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using filesort >+SELECT * FROM t1 ORDER BY word; >+word bar >+a 0 >+aar 0 >+aardvar 0 >+aardvara 0 >+aardvark 0 >+aardvarz 0 >+EXPLAIN SELECT word FROM t1 ORDER BY word; >+id select_type table type possible_keys key key_len ref rows Extra >+1 SIMPLE t1 index NULL PRIMARY 258 NULL 6 Using index >+SELECT word FROM t1 ORDER by word; >+word >+a >+aar >+aardvar >+aardvara >+aardvark >+aardvarz >+DROP TABLE t1; >+# >+# One field, index >+# >+CREATE TABLE t1 ( >+word VARCHAR(64) , >+PRIMARY KEY (word)) >+ENGINE=MyISAM >+CHARSET utf16le >+COLLATE utf16le_general_ci; >+INSERT INTO t1 (word) VALUES ("aar"); >+INSERT INTO t1 (word) VALUES ("a"); >+INSERT INTO t1 (word) VALUES ("aardvar"); >+INSERT INTO t1 (word) VALUES ("aardvark"); >+INSERT INTO t1 (word) VALUES ("aardvara"); >+INSERT INTO t1 (word) VALUES ("aardvarz"); >+EXPLAIN SELECT * FROM t1 ORDER BY WORD; >+id select_type table type possible_keys key key_len ref rows Extra >+1 SIMPLE t1 index NULL PRIMARY 258 NULL 6 Using index >+SELECT * FROM t1 ORDER BY word; >+word >+a >+aar >+aardvar >+aardvara >+aardvark >+aardvarz >+DROP TABLE t1; >+# >+# Two fields, no index >+# >+CREATE TABLE t1 ( >+word TEXT, >+bar INT(11) AUTO_INCREMENT, >+PRIMARY KEY (bar)) >+ENGINE=MyISAM >+CHARSET utf16le >+COLLATE utf16le_general_ci ; >+INSERT INTO t1 (word) VALUES ("aar"); >+INSERT INTO t1 (word) VALUES ("a" ); >+INSERT INTO t1 (word) VALUES ("aardvar"); >+INSERT INTO t1 (word) VALUES ("aardvark"); >+INSERT INTO t1 (word) VALUES ("aardvara"); >+INSERT INTO t1 (word) VALUES ("aardvarz"); >+EXPLAIN SELECT * FROM t1 ORDER BY word; >+id select_type table type possible_keys key key_len ref rows Extra >+1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using filesort >+SELECT * FROM t1 ORDER BY word; >+word bar >+a 2 >+aar 1 >+aardvar 3 >+aardvara 5 >+aardvark 4 >+aardvarz 6 >+EXPLAIN SELECT word FROM t1 ORDER BY word; >+id select_type table type possible_keys key key_len ref rows Extra >+1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using filesort >+SELECT word FROM t1 ORDER BY word; >+word >+a >+aar >+aardvar >+aardvara >+aardvark >+aardvarz >+DROP TABLE t1; >+# >+# END OF Bug 1264 test >+# >+# >+# Check alignment for from-binary-conversion with CAST and CONVERT >+# >+SELECT HEX(CAST(0xAA as char CHARACTER SET utf16le)); >+HEX(CAST(0xAA as char CHARACTER SET utf16le)) >+00AA >+SELECT HEX(CONVERT(0xAA USING utf16le)); >+HEX(CONVERT(0xAA USING utf16le)) >+00AA >+# >+# Check alignment for string types >+# >+CREATE TABLE t1 (a CHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+HEX(a) >+0001 >+0011 >+0111 >+1111 >+00011111 >+DROP TABLE t1; >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+HEX(a) >+0001 >+0011 >+0111 >+1111 >+00011111 >+DROP TABLE t1; >+CREATE TABLE t1 (a TEXT CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+HEX(a) >+0001 >+0011 >+0111 >+1111 >+00011111 >+DROP TABLE t1; >+CREATE TABLE t1 (a MEDIUMTEXT CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+HEX(a) >+0001 >+0011 >+0111 >+1111 >+00011111 >+DROP TABLE t1; >+CREATE TABLE t1 (a LONGTEXT CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+HEX(a) >+0001 >+0011 >+0111 >+1111 >+00011111 >+DROP TABLE t1; >+# >+# Bug#5081 : UCS2 fields are filled with '0x2020' >+# after extending field length >+# >+CREATE TABLE t1(a CHAR(1)) DEFAULT CHARSET utf16le; >+INSERT INTO t1 VALUES ('a'),('b'),('c'); >+ALTER TABLE t1 MODIFY a CHAR(5); >+SELECT a, HEX(a) FROM t1; >+a HEX(a) >+a 6100 >+b 6200 >+c 6300 >+DROP TABLE t1; >+# >+# Check prepare statement from an UTF16 string >+# >+SET NAMES latin1; >+SET @ivar= 1234; >+SET @str1 = 'SELECT ?'; >+SET @str2 = CONVERT(@str1 USING utf16le); >+PREPARE stmt1 FROM @str2; >+EXECUTE stmt1 USING @ivar; >+? >+1234 >+# >+# Check that utf16le works with ENUM and SET type >+# >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+CREATE TABLE t1 (a ENUM('x','y','z') CHARACTER SET utf16le); >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `a` enum('x','y','z') CHARACTER SET utf16le DEFAULT NULL >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+INSERT INTO t1 VALUES ('x'); >+INSERT INTO t1 VALUES ('y'); >+INSERT INTO t1 VALUES ('z'); >+SELECT a, HEX(a) FROM t1 ORDER BY a; >+a HEX(a) >+x 7800 >+y 7900 >+z 7A00 >+ALTER TABLE t1 CHANGE a a ENUM('x','y','z','d','e','Ã¤','Ã¶','Ã¼') CHARACTER SET utf16le; >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `a` enum('x','y','z','d','e','Ã¤','Ã¶','Ã¼') CHARACTER SET utf16le DEFAULT NULL >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+INSERT INTO t1 VALUES ('D'); >+INSERT INTO t1 VALUES ('E '); >+INSERT INTO t1 VALUES ('Ã¤'); >+INSERT INTO t1 VALUES ('Ã¶'); >+INSERT INTO t1 VALUES ('Ã¼'); >+SELECT a, HEX(a) FROM t1 ORDER BY a; >+a HEX(a) >+x 7800 >+y 7900 >+z 7A00 >+d 6400 >+e 6500 >+Ã¤ E400 >+Ã¶ F600 >+Ã¼ FC00 >+DROP TABLE t1; >+CREATE TABLE t1 (a set ('x','y','z','Ã¤','Ã¶','Ã¼') CHARACTER SET utf16le); >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `a` set('x','y','z','Ã¤','Ã¶','Ã¼') CHARACTER SET utf16le DEFAULT NULL >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+INSERT INTO t1 VALUES ('x'); >+INSERT INTO t1 VALUES ('y'); >+INSERT INTO t1 VALUES ('z'); >+INSERT INTO t1 VALUES ('x,y'); >+INSERT INTO t1 VALUES ('x,y,z,Ã¤,Ã¶,Ã¼'); >+SELECT a, HEX(a) FROM t1 ORDER BY a; >+a HEX(a) >+x 7800 >+y 7900 >+x,y 78002C007900 >+z 7A00 >+x,y,z,Ã¤,Ã¶,Ã¼ 78002C0079002C007A002C00E4002C00F6002C00FC00 >+DROP TABLE t1; >+# >+# Bug#7302 UCS2 data in ENUM fields get truncated when new column is added >+# >+CREATE TABLE t1(a ENUM('a','b','c')) DEFAULT CHARACTER SET utf16le; >+INSERT INTO t1 VALUES('a'),('b'),('c'); >+ALTER TABLE t1 ADD b CHAR(1); >+SHOW WARNINGS; >+Level Code Message >+SELECT * FROM t1 ORDER BY a; >+a b >+a NULL >+b NULL >+c NULL >+DROP TABLE t1; >+SET NAMES utf8, collation_connection='utf16le_general_ci'; >+create table t1 select repeat('a',4000) a; >+delete from t1; >+insert into t1 values ('a'), ('a '), ('a\t'); >+select collation(a),hex(a) from t1 order by a; >+collation(a) hex(a) >+utf16le_general_ci 61000900 >+utf16le_general_ci 6100 >+utf16le_general_ci 61002000 >+drop table t1; >+select @@collation_connection; >+@@collation_connection >+utf16le_general_ci >+create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ; >+insert into t1 values('abcdef'); >+insert into t1 values('_bcdef'); >+insert into t1 values('a_cdef'); >+insert into t1 values('ab_def'); >+insert into t1 values('abc_ef'); >+insert into t1 values('abcd_f'); >+insert into t1 values('abcde_'); >+select c1 as c1u from t1 where c1 like 'ab\_def'; >+c1u >+ab_def >+select c1 as c2h from t1 where c1 like 'ab#_def' escape '#'; >+c2h >+ab_def >+drop table t1; >+SET NAMES utf8, collation_connection='utf16le_bin'; >+create table t1 select repeat('a',4000) a; >+delete from t1; >+insert into t1 values ('a'), ('a '), ('a\t'); >+select collation(a),hex(a) from t1 order by a; >+collation(a) hex(a) >+utf16le_bin 61000900 >+utf16le_bin 6100 >+utf16le_bin 61002000 >+drop table t1; >+# >+# Bug#55980 Character sets: supplementary character _bin ordering is wrong >+# >+CREATE TABLE t1 AS SELECT REPEAT('a',1) AS a LIMIT 0; >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `a` varchar(1) CHARACTER SET utf16le COLLATE utf16le_bin NOT NULL DEFAULT '' >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+INSERT INTO t1 VALUES (_utf8mb4 0xEFBE9D),(_utf8mb4 0xF0908E84); >+INSERT INTO t1 VALUES (_utf8mb4 0xCE85),(_utf8mb4 0xF4808080); >+SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a; >+HEX(a) HEX(CONVERT(a USING utf8mb4)) >+8503 CE85 >+9DFF EFBE9D >+00D884DF F0908E84 >+C0DB00DC F4808080 >+ALTER TABLE t1 ADD KEY(a); >+SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a; >+HEX(a) HEX(CONVERT(a USING utf8mb4)) >+8503 CE85 >+9DFF EFBE9D >+00D884DF F0908E84 >+C0DB00DC F4808080 >+DROP TABLE IF EXISTS t1; >+select @@collation_connection; >+@@collation_connection >+utf16le_bin >+create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ; >+insert into t1 values('abcdef'); >+insert into t1 values('_bcdef'); >+insert into t1 values('a_cdef'); >+insert into t1 values('ab_def'); >+insert into t1 values('abc_ef'); >+insert into t1 values('abcd_f'); >+insert into t1 values('abcde_'); >+select c1 as c1u from t1 where c1 like 'ab\_def'; >+c1u >+ab_def >+select c1 as c2h from t1 where c1 like 'ab#_def' escape '#'; >+c2h >+ab_def >+drop table t1; >+# >+# Bug#10344 Some string functions fail for UCS2 >+# >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le, pos INT); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,1); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,2); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,3); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,-1); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,-2); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,-3); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, 1); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, 2); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, 3); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, -1); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, -2); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, -3); >+SELECT HEX(SUBSTR(a, pos)), SUBSTR(a, pos) FROM t1; >+HEX(SUBSTR(a, pos)) SUBSTR(a, pos) >+E400E5006800 Ã¤Ã¥h >+E5006800 Ã¥h >+6800 h >+6800 h >+E5006800 Ã¥h >+E400E5006800 Ã¤Ã¥h >+E400E50000D800DC Ã¤Ã¥? >+E50000D800DC Ã¥? >+00D800DC ? >+00D800DC ? >+E50000D800DC Ã¥? >+E400E50000D800DC Ã¤Ã¥? >+DROP TABLE t1; >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+# >+# Bug#9442 Set parameter make query fail if column CHARACTER SET is UCS2 >+# >+CREATE TABLE t1 (utext VARCHAR(20) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES ("lily"); >+INSERT INTO t1 VALUES ("river"); >+PREPARE stmt FROM 'SELECT utext FROM t1 where utext like ?'; >+SET @param1='%%'; >+EXECUTE stmt USING @param1; >+utext >+lily >+river >+EXECUTE stmt USING @param1; >+utext >+lily >+river >+SELECT utext FROM t1 where utext like '%%'; >+utext >+lily >+river >+DROP TABLE t1; >+DEALLOCATE PREPARE stmt; >+# >+# Bug#22052 Trailing spaces are not removed FROM UNICODE fields in an index >+# >+CREATE TABLE t1 ( >+a CHAR(10) CHARACTER SET utf16le NOT NULL, >+INDEX a (a) >+) engine=myisam; >+INSERT INTO t1 VALUES (REPEAT(_ucs2 0x201f, 10)); >+INSERT INTO t1 VALUES (REPEAT(_ucs2 0x2020, 10)); >+INSERT INTO t1 VALUES (REPEAT(_ucs2 0x2021, 10)); >+# make sure "index read" is used >+explain SELECT HEX(a) FROM t1 ORDER BY a; >+id select_type table type possible_keys key key_len ref rows Extra >+1 SIMPLE t1 index NULL a 40 NULL 3 Using index >+SELECT HEX(a) FROM t1 ORDER BY a; >+HEX(a) >+1F201F201F201F201F201F201F201F201F201F20 >+2020202020202020202020202020202020202020 >+2120212021202120212021202120212021202120 >+ALTER TABLE t1 DROP INDEX a; >+SELECT HEX(a) FROM t1 ORDER BY a; >+HEX(a) >+1F201F201F201F201F201F201F201F201F201F20 >+2020202020202020202020202020202020202020 >+2120212021202120212021202120212021202120 >+DROP TABLE t1; >+# >+# Bug #20108: corrupted default enum value for a ucs2 field >+# >+CREATE TABLE t1 ( >+status ENUM('active','passive') CHARACTER SET utf16le COLLATE utf16le_general_ci >+NOT NULL DEFAULT 'passive' >+); >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `status` enum('active','passive') CHARACTER SET utf16le NOT NULL DEFAULT 'passive' >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+ALTER TABLE t1 ADD a int NOT NULL AFTER status; >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `status` enum('active','passive') CHARACTER SET utf16le NOT NULL DEFAULT 'passive', >+ `a` int(11) NOT NULL >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+DROP TABLE t1; >+# >+# Conversion FROM an UTF16LE string to a decimal column >+# >+CREATE TABLE t1 (a VARCHAR(64) CHARACTER SET utf16le, b DECIMAL(10,3)); >+INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0); >+UPDATE t1 set b=a; >+SELECT *, HEX(a) FROM t1; >+a b HEX(a) >+1.1 1.100 31002E003100 >+2.1 2.100 32002E003100 >+DROP TABLE t1; >+# >+# Bug#9442 Set parameter make query fail if column CHARACTER SET is UCS2 >+# >+CREATE TABLE t1 (utext VARCHAR(20) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES ("lily"); >+INSERT INTO t1 VALUES ("river"); >+PREPARE stmt FROM 'SELECT utext FROM t1 where utext like ?'; >+SET @param1='%%'; >+EXECUTE stmt USING @param1; >+utext >+lily >+river >+EXECUTE stmt USING @param1; >+utext >+lily >+river >+SELECT utext FROM t1 where utext like '%%'; >+utext >+lily >+river >+DROP TABLE t1; >+DEALLOCATE PREPARE stmt; >+# >+# Bug#22638 SOUNDEX broken for international characters >+# >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+SELECT SOUNDEX(''),SOUNDEX('he'),SOUNDEX('hello all folks'),SOUNDEX('#3556 in bugdb'); >+SOUNDEX('') SOUNDEX('he') SOUNDEX('hello all folks') SOUNDEX('#3556 in bugdb') >+ H000 H4142 I51231 >+SELECT HEX(SOUNDEX('')),HEX(SOUNDEX('he')),HEX(SOUNDEX('hello all folks')),HEX(SOUNDEX('#3556 in bugdb')); >+HEX(SOUNDEX('')) HEX(SOUNDEX('he')) HEX(SOUNDEX('hello all folks')) HEX(SOUNDEX('#3556 in bugdb')) >+ 4800300030003000 48003400310034003200 490035003100320033003100 >+SELECT 'mood' sounds like 'mud'; >+'mood' sounds like 'mud' >+1 >+# Cyrillic A, BE, VE >+SELECT HEX(SOUNDEX(_utf16le 0x041004110412)); >+HEX(SOUNDEX(_utf16le 0x041004110412)) >+0410300030003000 >+# Make sure that "U+00BF INVERTED QUESTION MARK" is not considered as letter >+SELECT HEX(SOUNDEX(_utf16le 0x00BF00C0)); >+HEX(SOUNDEX(_utf16le 0x00BF00C0)) >+00BF300030003000 >+# >+# Bug#14290: character_maximum_length for text fields >+# >+CREATE TABLE t1(a BLOB, b TEXT CHARSET utf16le); >+SELECT data_type, character_octet_length, character_maximum_length >+FROM information_schema.columns where table_name='t1'; >+data_type character_octet_length character_maximum_length >+blob 65535 65535 >+text 65535 32767 >+DROP TABLE t1; >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+# >+# Testing cs->coll->instr() >+# >+SELECT POSITION('bb' IN 'abba'); >+POSITION('bb' IN 'abba') >+2 >+# >+# Testing cs->coll->hash_sort() >+# >+SET NAMES utf8, collation_connection=utf16le_bin; >+SELECT @@collation_connection; >+@@collation_connection >+utf16le_bin >+CREATE TABLE t1 ENGINE=HEAP AS SELECT REPEAT (' ', 10) AS a LIMIT 0; >+ALTER TABLE t1 ADD KEY (a); >+CREATE TABLE t2 (a VARCHAR(10)); >+INSERT INTO t2 VALUES ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'); >+INSERT INTO t2 VALUES ('8'),('9'),('A'),('B'),('C'),('D'),('E'),('F'); >+INSERT INTO t1 SELECT CONCAT('a',t21.a,t22.a) FROM t2 t21, t2 t22 ORDER BY 1; >+DROP TABLE t2; >+INSERT INTO t1 VALUES ('a '); >+SELECT a, HEX(a) FROM t1 WHERE a='a'; >+a HEX(a) >+a 61002000 >+DROP TABLE t1; >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+SELECT @@collation_connection; >+@@collation_connection >+utf16le_general_ci >+CREATE TABLE t1 ENGINE=HEAP AS SELECT REPEAT (' ', 10) AS a LIMIT 0; >+ALTER TABLE t1 ADD KEY (a); >+CREATE TABLE t2 (a VARCHAR(10)); >+INSERT INTO t2 VALUES ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'); >+INSERT INTO t2 VALUES ('8'),('9'),('A'),('B'),('C'),('D'),('E'),('F'); >+INSERT INTO t1 SELECT CONCAT('a',t21.a,t22.a) FROM t2 t21, t2 t22 ORDER BY 1; >+DROP TABLE t2; >+INSERT INTO t1 VALUES ('a '); >+SELECT a, HEX(a) FROM t1 WHERE a='a'; >+a HEX(a) >+a 61002000 >+DROP TABLE t1; >+# >+# Testing cs->cset->numchars() >+# >+SELECT CHAR_LENGTH('abcd'), OCTET_LENGTH('abcd'); >+CHAR_LENGTH('abcd') OCTET_LENGTH('abcd') >+4 8 >+SELECT CHAR_LENGTH(_utf16le 0x00D800DC), OCTET_LENGTH(_utf16le 0x00D800DC); >+CHAR_LENGTH(_utf16le 0x00D800DC) OCTET_LENGTH(_utf16le 0x00D800DC) >+1 4 >+SELECT CHAR_LENGTH(_utf16le 0x7DD8FFDF), OCTET_LENGTH(_utf16le 0x7FD8DDDF); >+CHAR_LENGTH(_utf16le 0x7DD8FFDF) OCTET_LENGTH(_utf16le 0x7FD8DDDF) >+1 4 >+# >+# Testing cs->cset->charpos() >+# >+SELECT LEFT('abcd',2); >+LEFT('abcd',2) >+ab >+SELECT HEX(LEFT(_utf16le 0x00D800DC7FD8FFDF, 1)); >+HEX(LEFT(_utf16le 0x00D800DC7FD8FFDF, 1)) >+00D800DC >+SELECT HEX(RIGHT(_utf16le 0x00D800DC7FD8FFDF, 1)); >+HEX(RIGHT(_utf16le 0x00D800DC7FD8FFDF, 1)) >+7FD8FFDF >+# >+# Testing cs->cset->well_formed_length() >+# >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le); >+# Bad sequences >+INSERT INTO t1 VALUES (_utf16le 0x00D8); >+ERROR HY000: Invalid utf16le character string: '00D8' >+INSERT INTO t1 VALUES (_utf16le 0x00DC); >+ERROR HY000: Invalid utf16le character string: '00DC' >+INSERT INTO t1 VALUES (_utf16le 0x00D800D8); >+ERROR HY000: Invalid utf16le character string: '00D800' >+INSERT INTO t1 VALUES (_utf16le 0x00D800E8); >+ERROR HY000: Invalid utf16le character string: '00D800' >+INSERT INTO t1 VALUES (_utf16le 0x00D80008); >+ERROR HY000: Invalid utf16le character string: '00D800' >+# Good sequences >+INSERT INTO t1 VALUES (_utf16le 0x00D800DC); >+INSERT INTO t1 VALUES (_utf16le 0x00D8FFDC); >+INSERT INTO t1 VALUES (_utf16le 0xFFDB00DC); >+INSERT INTO t1 VALUES (_utf16le 0xFFDBFFDC); >+SELECT HEX(a) FROM t1; >+HEX(a) >+00D800DC >+00D8FFDC >+FFDB00DC >+FFDBFFDC >+DROP TABLE t1; >+# >+# Bug#32393 Character sets: illegal characters in utf16le columns >+# >+# Tests that cs->cset->wc_mb() doesn't accept surrogate parts >+# >+# via ALTER >+# >+CREATE TABLE t1 (s1 VARCHAR(50) CHARACTER SET ucs2); >+INSERT INTO t1 VALUES (0xDF84); >+ALTER TABLE t1 MODIFY column s1 VARCHAR(50) CHARACTER SET utf16le; >+Warnings: >+Warning 1366 Incorrect string value: '\xDF\x84' for column 's1' at row 1 >+SELECT HEX(s1) FROM t1; >+HEX(s1) >+3F00 >+DROP TABLE t1; >+# >+# via UPDATE >+# >+CREATE TABLE t1 (s1 VARCHAR(5) CHARACTER SET ucs2, s2 VARCHAR(5) CHARACTER SET utf16le); >+INSERT INTO t1 (s1) VALUES (0xdf84); >+UPDATE t1 set s2 = s1; >+Warnings: >+Warning 1366 Incorrect string value: '\xDF\x84' for column 's2' at row 1 >+SELECT HEX(s2) FROM t1; >+HEX(s2) >+3F00 >+DROP TABLE t1; >+# >+# Testing cs->cset->lengthsp() >+# >+CREATE TABLE t1 (a CHAR(10)) CHARACTER SET utf16le; >+INSERT INTO t1 VALUES ('a '); >+SELECT HEX(a) FROM t1; >+HEX(a) >+6100 >+DROP TABLE t1; >+# >+# Testing cs->cset->caseup() and cs->cset->casedn() >+# >+SELECT UPPER('abcd'), LOWER('ABCD'); >+UPPER('abcd') LOWER('ABCD') >+ABCD abcd >+# >+# Checking str_to_datetime() >+# >+select @@collation_connection; >+@@collation_connection >+utf16le_general_ci >+CREATE TABLE t1 (a date); >+INSERT INTO t1 VALUES ('2007-09-16'); >+SELECT * FROM t1; >+a >+2007-09-16 >+DROP TABLE t1; >+# >+# Testing cs->cset->ll10tostr >+# >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (123456); >+SELECT a, HEX(a) FROM t1; >+a HEX(a) >+123456 310032003300340035003600 >+DROP TABLE t1; >+# >+# Testing cs->cset->fill >+# SOUNDEX fills strings with DIGIT ZERO up to four characters >+# >+SELECT SOUNDEX('a'), HEX(SOUNDEX('a')); >+SOUNDEX('a') HEX(SOUNDEX('a')) >+A000 4100300030003000 >+# >+# Testing cs->cset->strntoul >+# >+CREATE TABLE t1 (a enum ('a','b','c')) CHARACTER SET utf16le; >+INSERT INTO t1 VALUES ('1'); >+SELECT * FROM t1; >+a >+a >+DROP TABLE t1; >+# >+# Testing cs->cset->strntoll and cs->cset->strntoull >+# >+SET NAMES latin1; >+SELECT HEX(CONV(CONVERT('123' USING utf16le), -10, 16)); >+HEX(CONV(CONVERT('123' USING utf16le), -10, 16)) >+3742 >+SELECT HEX(CONV(CONVERT('123' USING utf16le), 10, 16)); >+HEX(CONV(CONVERT('123' USING utf16le), 10, 16)) >+3742 >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+# >+# Testing cs->cset->strntod >+# >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+SELECT 1.1 + '1.2'; >+1.1 + '1.2' >+2.3 >+SELECT 1.1 + '1.2xxx'; >+1.1 + '1.2xxx' >+2.3 >+Warnings: >+Warning 1292 Truncated incorrect DOUBLE value: '1.2xxx' >+# >+# Testing cs->cset->strtoll10 >+# >+SELECT LEFT('aaa','1'); >+LEFT('aaa','1') >+a >+CREATE TABLE t1 AS SELECT REPEAT('abcd', 128) AS a; >+SELECT LEFT(a, '2') FROM t1; >+LEFT(a, '2') >+ab >+SELECT LEFT(a, ' \t \t 2') FROM t1; >+LEFT(a, ' \t \t 2') >+ab >+SELECT LEFT(a, ' \t \t +2') FROM t1; >+LEFT(a, ' \t \t +2') >+ab >+SELECT SUBSTR(a, '-2') FROM t1; >+SUBSTR(a, '-2') >+cd >+SELECT SUBSTR(a, ' \t \t -2') FROM t1; >+SUBSTR(a, ' \t \t -2') >+cd >+SELECT LEFT(a, '00002') FROM t1; >+LEFT(a, '00002') >+ab >+SELECT LEFT(a, ' \t \t 00002') FROM t1; >+LEFT(a, ' \t \t 00002') >+ab >+SELECT LEFT(a, ' \t \t +00002') FROM t1; >+LEFT(a, ' \t \t +00002') >+ab >+SELECT SUBSTR(a, '-00002') FROM t1; >+SUBSTR(a, '-00002') >+cd >+SELECT SUBSTR(a, ' \t \t -00002') FROM t1; >+SUBSTR(a, ' \t \t -00002') >+cd >+DROP TABLE t1; >+CREATE TABLE t1 AS SELECT REPEAT('abcd', 128) AS a LIMIT 0; >+INSERT INTO t1 VALUES ('255'), ('65535'),('16777215'),('4294967295'), >+('1099511627775'),('281474976710655'),('72057594037927935'), >+('1844674407370955161'),('18446744073709551614'), ('18446744073709551615'); >+SELECT a, CAST(a AS SIGNED), CAST(a AS UNSIGNED) FROM t1; >+a CAST(a AS SIGNED) CAST(a AS UNSIGNED) >+255 255 255 >+65535 65535 65535 >+16777215 16777215 16777215 >+4294967295 4294967295 4294967295 >+1099511627775 1099511627775 1099511627775 >+281474976710655 281474976710655 281474976710655 >+72057594037927935 72057594037927935 72057594037927935 >+1844674407370955161 1844674407370955161 1844674407370955161 >+18446744073709551614 -2 18446744073709551614 >+18446744073709551615 -1 18446744073709551615 >+Warnings: >+Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement >+Note 1105 Cast to signed converted positive out-of-range integer to it's negative complement >+UPDATE t1 SET a=CONCAT('-', a); >+SELECT a, CAST(a AS SIGNED) FROM t1; >+a CAST(a AS SIGNED) >+-255 -255 >+-65535 -65535 >+-16777215 -16777215 >+-4294967295 -4294967295 >+-1099511627775 -1099511627775 >+-281474976710655 -281474976710655 >+-72057594037927935 -72057594037927935 >+-1844674407370955161 -1844674407370955161 >+-18446744073709551614 -9223372036854775808 >+-18446744073709551615 -9223372036854775808 >+Warnings: >+Warning 1292 Truncated incorrect INTEGER value: '-18446744073709551614' >+Warning 1292 Truncated incorrect INTEGER value: '-18446744073709551615' >+DROP TABLE t1; >+# >+# Testing cs->cset->strntoull10rnd >+# >+CREATE TABLE t1 (a int); >+INSERT INTO t1 VALUES ('-1234.1e2'); >+INSERT INTO t1 VALUES ('-1234.1e2xxxx'); >+Warnings: >+Warning 1265 Data truncated for column 'a' at row 1 >+INSERT INTO t1 VALUES ('-1234.1e2 '); >+INSERT INTO t1 VALUES ('123'); >+INSERT INTO t1 VALUES ('-124'); >+INSERT INTO t1 VALUES ('+125'); >+INSERT INTO t1 VALUES (' \t \t 123'); >+INSERT INTO t1 VALUES (' \t \t -124'); >+INSERT INTO t1 VALUES (' \t \t +125'); >+INSERT INTO t1 VALUES (' \t \t 000123'); >+INSERT INTO t1 VALUES (' \t \t -000124'); >+INSERT INTO t1 VALUES (' \t \t +000125'); >+SELECT * FROM t1; >+a >+-123410 >+-123410 >+-123410 >+123 >+-124 >+125 >+123 >+-124 >+125 >+123 >+-124 >+125 >+DROP TABLE t1; >+CREATE TABLE t1 (a BIGINT UNSIGNED); >+INSERT INTO t1 VALUES ('255'), ('65535'),('16777215'),('4294967295'), >+('1099511627775'),('281474976710655'),('72057594037927935'), >+('1844674407370955161'),('18446744073709551614'), ('18446744073709551615'); >+SELECT * FROM t1; >+a >+255 >+65535 >+16777215 >+4294967295 >+1099511627775 >+281474976710655 >+72057594037927935 >+1844674407370955161 >+18446744073709551614 >+18446744073709551615 >+DROP TABLE t1; >+# >+# Testing cs->cset->scan >+# >+CREATE TABLE t1 (a int); >+INSERT INTO t1 VALUES ('1 '); >+INSERT INTO t1 VALUES ('1 x'); >+Warnings: >+Warning 1265 Data truncated for column 'a' at row 1 >+SELECT * FROM t1; >+a >+1 >+1 >+DROP TABLE t1; >+# >+# Testing auto-conversion to TEXT >+# >+CREATE TABLE t1 (a VARCHAR(17000) CHARACTER SET utf16le); >+Warnings: >+Note 1246 Converting column 'a' from VARCHAR to TEXT >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `a` mediumtext CHARACTER SET utf16le >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+DROP TABLE t1; >+# >+# Testing that maximim possible key length is 1000 bytes >+# >+CREATE TABLE t1 (a VARCHAR(250) CHARACTER SET utf16le PRIMARY KEY); >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `a` varchar(250) CHARACTER SET utf16le NOT NULL, >+ PRIMARY KEY (`a`) >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+DROP TABLE t1; >+CREATE TABLE t1 (a VARCHAR(334) CHARACTER SET utf16le PRIMARY KEY); >+ERROR 42000: Specified key was too long; max key length is 1000 bytes >+# >+# Conversion to utf8 >+# >+CREATE TABLE t1 (a CHAR(1) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x00D800DC),(0x00D8FFDC),(0x7FDB00DC),(0x7FDBFFDC); >+INSERT INTO t1 VALUES (0xC000), (0xFF00),(0x00E0), (0xFFFF); >+SELECT HEX(a), HEX(@a:=CONVERT(a USING utf8mb4)), HEX(CONVERT(@a USING utf16le)) FROM t1; >+HEX(a) HEX(@a:=CONVERT(a USING utf8mb4)) HEX(CONVERT(@a USING utf16le)) >+00D800DC F0908080 00D800DC >+00D8FFDC F09083BF 00D8FFDC >+7FDB00DC F3AFB080 7FDB00DC >+7FDBFFDC F3AFB3BF 7FDBFFDC >+C000 C380 C000 >+FF00 C3BF FF00 >+00E0 EE8080 00E0 >+FFFF EFBFBF FFFF >+DROP TABLE t1; >+# >+# Test basic regex functionality >+# >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+drop table if exists t1; >+create table t1 as >+select repeat(' ', 64) as s1, repeat(' ',64) as s2 >+union >+select null, null; >+show create table t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `s1` varchar(64) CHARACTER SET utf16le DEFAULT NULL, >+ `s2` varchar(64) CHARACTER SET utf16le DEFAULT NULL >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+delete from t1; >+insert into t1 values('aaa','aaa'); >+insert into t1 values('aaa|qqq','qqq'); >+insert into t1 values('gheis','^[^a-dXYZ]+$'); >+insert into t1 values('aab','^aa?b'); >+insert into t1 values('Baaan','^Ba*n'); >+insert into t1 values('aaa','qqq|aaa'); >+insert into t1 values('qqq','qqq|aaa'); >+insert into t1 values('bbb','qqq|aaa'); >+insert into t1 values('bbb','qqq'); >+insert into t1 values('aaa','aba'); >+insert into t1 values(null,'abc'); >+insert into t1 values('def',null); >+insert into t1 values(null,null); >+insert into t1 values('ghi','ghi['); >+select HIGH_PRIORITY s1 regexp s2 from t1; >+s1 regexp s2 >+0 >+0 >+0 >+1 >+1 >+1 >+1 >+1 >+1 >+1 >+NULL >+NULL >+NULL >+NULL >+drop table t1; >+# >+# Test how CHARACTER SET works with date/time >+# >+CREATE TABLE t1 AS SELECT repeat('a',20) AS s1 LIMIT 0; >+SET timestamp=1216359724; >+INSERT INTO t1 VALUES (current_date); >+INSERT INTO t1 VALUES (current_time); >+INSERT INTO t1 VALUES (current_timestamp); >+SELECT s1, hex(s1) FROM t1; >+s1 hex(s1) >+2008-07-18 32003000300038002D00300037002D0031003800 >+08:42:04 300038003A00340032003A0030003400 >+2008-07-18 08:42:04 32003000300038002D00300037002D00310038002000300038003A00340032003A0030003400 >+DROP TABLE t1; >+SET timestamp=0; >+# >+# Bug#33073 Character sets: ordering fails with utf32 >+# >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+CREATE TABLE t1 AS SELECT REPEAT('a',2) as s1 LIMIT 0; >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `s1` varchar(2) CHARACTER SET utf16le NOT NULL DEFAULT '' >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+INSERT INTO t1 VALUES ('ab'),('AE'),('ab'),('AE'); >+SELECT * FROM t1 ORDER BY s1; >+s1 >+ab >+ab >+AE >+AE >+SET max_sort_length=4; >+SELECT * FROM t1 ORDER BY s1; >+s1 >+ab >+ab >+AE >+AE >+DROP TABLE t1; >+SET max_sort_length=DEFAULT; >+# >+# Bug#52520 Difference in tinytext utf column metadata >+# >+CREATE TABLE t1 ( >+s1 TINYTEXT CHARACTER SET utf16le, >+s2 TEXT CHARACTER SET utf16le, >+s3 MEDIUMTEXT CHARACTER SET utf16le, >+s4 LONGTEXT CHARACTER SET utf16le >+); >+SET NAMES utf8, @@character_set_results=NULL; >+SELECT *, HEX(s1) FROM t1; >+Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr >+def test t1 t1 s1 s1 252 255 0 Y 16 0 56 >+def test t1 t1 s2 s2 252 65535 0 Y 16 0 56 >+def test t1 t1 s3 s3 252 16777215 0 Y 16 0 56 >+def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 56 >+def HEX(s1) 253 6120 0 Y 0 0 33 >+s1 s2 s3 s4 HEX(s1) >+SET NAMES latin1; >+SELECT *, HEX(s1) FROM t1; >+Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr >+def test t1 t1 s1 s1 252 127 0 Y 16 0 8 >+def test t1 t1 s2 s2 252 32767 0 Y 16 0 8 >+def test t1 t1 s3 s3 252 8388607 0 Y 16 0 8 >+def test t1 t1 s4 s4 252 2147483647 0 Y 16 0 8 >+def HEX(s1) 253 2040 0 Y 0 0 8 >+s1 s2 s3 s4 HEX(s1) >+SET NAMES utf8; >+SELECT *, HEX(s1) FROM t1; >+Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr >+def test t1 t1 s1 s1 252 381 0 Y 16 0 33 >+def test t1 t1 s2 s2 252 98301 0 Y 16 0 33 >+def test t1 t1 s3 s3 252 25165821 0 Y 16 0 33 >+def test t1 t1 s4 s4 252 4294967295 0 Y 16 0 33 >+def HEX(s1) 253 6120 0 Y 0 0 33 >+s1 s2 s3 s4 HEX(s1) >+CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1; >+SHOW CREATE TABLE t2; >+Table Create Table >+t2 CREATE TABLE `t2` ( >+ `CONCAT(s1)` varchar(255) CHARACTER SET utf16le DEFAULT NULL >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+DROP TABLE t1, t2; >+# >+# Problem found by Roy during review >+# MY_CS_BINSORT was not set for utf16le_bin, >+# so filesort did not work well >+# >+SET NAMES utf8, @@collation_connection=utf16le_bin; >+CREATE TABLE t1 AS SELECT REPEAT(' ', 10) as c LIMIT 0; >+ALTER TABLE t1 ADD PRIMARY KEY(c); >+SHOW CREATE TABLE t1; >+Table Create Table >+t1 CREATE TABLE `t1` ( >+ `c` varchar(10) CHARACTER SET utf16le COLLATE utf16le_bin NOT NULL DEFAULT '', >+ PRIMARY KEY (`c`) >+) ENGINE=MyISAM DEFAULT CHARSET=latin1 >+INSERT INTO t1 VALUES ('abc'),('zyx'),('acb'); >+SELECT UPPER(c) FROM t1 ORDER BY 1 DESC; >+UPPER(c) >+ZYX >+ACB >+ABC >+DROP TABLE t1; >+# >+# End of 5.6 tests >+# > >=== modified file 'mysql-test/r/ctype_utf32.result' >--- mysql-test/r/ctype_utf32.result 2012-08-09 16:25:47 +0000 >+++ mysql-test/r/ctype_utf32.result 2013-03-15 04:53:03 +0000 >@@ -1126,6 +1126,20 @@ > 00 > DROP TABLE t1; > # >+# Bug#32859 Character sets: no warning with non-fitting chariot wheel >+# >+CREATE TABLE t1 (utf32 CHAR(5) CHARACTER SET utf32, latin1 CHAR(5) CHARACTER SET latin1); >+INSERT INTO t1 (utf32) VALUES (0xc581); >+UPDATE t1 SET latin1 = utf32; >+Warnings: >+Warning 1366 Incorrect string value: '\x00\x00\xC5\x81' for column 'latin1' at row 1 >+DELETE FROM t1; >+INSERT INTO t1 (utf32) VALUES (0x100cc); >+UPDATE t1 SET latin1 = utf32; >+Warnings: >+Warning 1366 Incorrect string value: '\x00\x01\x00\xCC' for column 'latin1' at row 1 >+DROP TABLE t1; >+# > # Bug#55912 FORMAT with locale set fails for numbers < 1000 > # > SET collation_connection=utf32_general_ci; > >=== modified file 'mysql-test/suite/funcs_1/r/innodb_func_view.result' >--- mysql-test/suite/funcs_1/r/innodb_func_view.result 2012-09-08 10:15:55 +0000 >+++ mysql-test/suite/funcs_1/r/innodb_func_view.result 2013-03-15 05:14:48 +0000 >@@ -2675,7 +2675,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2692,7 +2692,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -2709,10 +2709,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > 18446744073709551615 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2727,10 +2727,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > 18446744073709551615 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -2749,7 +2749,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2766,7 +2766,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -2785,7 +2785,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2802,7 +2802,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -3041,7 +3041,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3057,7 +3057,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > DROP VIEW v1; > > >@@ -3073,10 +3073,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > -1 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3090,10 +3090,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > -1 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > DROP VIEW v1; > > >@@ -3111,7 +3111,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3127,7 +3127,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > DROP VIEW v1; > > >@@ -3145,7 +3145,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3161,7 +3161,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > DROP VIEW v1; > > > >=== modified file 'mysql-test/suite/funcs_1/r/memory_func_view.result' >--- mysql-test/suite/funcs_1/r/memory_func_view.result 2012-09-08 10:15:55 +0000 >+++ mysql-test/suite/funcs_1/r/memory_func_view.result 2013-03-15 05:15:06 +0000 >@@ -2676,7 +2676,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2693,7 +2693,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -2710,10 +2710,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > 18446744073709551615 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2728,10 +2728,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > 18446744073709551615 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -2750,7 +2750,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2767,7 +2767,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -2786,7 +2786,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2803,7 +2803,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -3042,7 +3042,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3058,7 +3058,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > DROP VIEW v1; > > >@@ -3074,10 +3074,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > -1 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3091,10 +3091,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > -1 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > DROP VIEW v1; > > >@@ -3112,7 +3112,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3128,7 +3128,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > DROP VIEW v1; > > >@@ -3146,7 +3146,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3162,7 +3162,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > DROP VIEW v1; > > > >=== modified file 'mysql-test/suite/funcs_1/r/myisam_func_view.result' >--- mysql-test/suite/funcs_1/r/myisam_func_view.result 2012-09-08 10:15:55 +0000 >+++ mysql-test/suite/funcs_1/r/myisam_func_view.result 2013-03-15 05:15:27 +0000 >@@ -2676,7 +2676,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2693,7 +2693,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -2710,10 +2710,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > 18446744073709551615 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2728,10 +2728,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > 18446744073709551615 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -2750,7 +2750,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2767,7 +2767,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -2786,7 +2786,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection >@@ -2803,7 +2803,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > Note 1105 Cast to unsigned converted negative integer to it's positive complement > DROP VIEW v1; > >@@ -3042,7 +3042,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varbinary_1000` as signed) AS `CAST(my_varbinary_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varbinary_1000` AS `my_varbinary_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3058,7 +3058,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- ' > DROP VIEW v1; > > >@@ -3074,10 +3074,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > -1 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_binary_30` as signed) AS `CAST(my_binary_30 AS SIGNED INTEGER)`,`t1_values`.`my_binary_30` AS `my_binary_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3091,10 +3091,10 @@ > 0 ---Ã¤ÃÃ¼Ã@Âµ*$-- 4 > -1 -1 5 > Warnings: >-Warning 1292 Truncated incorrect INTEGER value: '' >+Warning 1292 Truncated incorrect INTEGER value: '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >-Warning 1292 Truncated incorrect INTEGER value: '-1' >+Warning 1292 Truncated incorrect INTEGER value: ' ---\xC3\xA4\xC3\x96\xC3\xBC\xC3\x9F@\xC2\xB5*$-- \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' >+Warning 1292 Truncated incorrect INTEGER value: '-1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' > DROP VIEW v1; > > >@@ -3112,7 +3112,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_varchar_1000` as signed) AS `CAST(my_varchar_1000 AS SIGNED INTEGER)`,`t1_values`.`my_varchar_1000` AS `my_varchar_1000`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3128,7 +3128,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<---------1000 characters-------------------------------------------------------------------------------------------------------' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$-- ' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$-- ' > DROP VIEW v1; > > >@@ -3146,7 +3146,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > SHOW CREATE VIEW v1; > View Create View character_set_client collation_connection > v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_char_30` as signed) AS `CAST(my_char_30 AS SIGNED INTEGER)`,`t1_values`.`my_char_30` AS `my_char_30`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci >@@ -3162,7 +3162,7 @@ > Warnings: > Warning 1292 Truncated incorrect INTEGER value: '' > Warning 1292 Truncated incorrect INTEGER value: '<--------30 characters------->' >-Warning 1292 Truncated incorrect INTEGER value: ' ---äÖüß@µ*$--' >+Warning 1292 Truncated incorrect INTEGER value: ' ---Ã¤ÃÃ¼Ã@Âµ*$--' > DROP VIEW v1; > > > >=== modified file 'mysql-test/suite/sys_vars/r/character_set_client_basic.result' >--- mysql-test/suite/sys_vars/r/character_set_client_basic.result 2011-12-12 22:58:40 +0000 >+++ mysql-test/suite/sys_vars/r/character_set_client_basic.result 2013-03-15 05:18:54 +0000 >@@ -430,7 +430,7 @@ > SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS); > SELECT @total_charset; > @total_charset >-39 >+40 > '#--------------------FN_DYNVARS_010_10-------------------------#' > SET @@character_set_client = abc; > ERROR 42000: Unknown character set: 'abc' > >=== modified file 'mysql-test/suite/sys_vars/r/character_set_connection_basic.result' >--- mysql-test/suite/sys_vars/r/character_set_connection_basic.result 2011-12-12 22:58:40 +0000 >+++ mysql-test/suite/sys_vars/r/character_set_connection_basic.result 2013-03-15 05:19:08 +0000 >@@ -424,7 +424,7 @@ > SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS); > SELECT @total_charset; > @total_charset >-39 >+40 > '#--------------------FN_DYNVARS_011_10-------------------------#' > SET @@character_set_connection = abc; > ERROR 42000: Unknown character set: 'abc' > >=== modified file 'mysql-test/suite/sys_vars/r/character_set_database_basic.result' >--- mysql-test/suite/sys_vars/r/character_set_database_basic.result 2011-12-12 22:58:40 +0000 >+++ mysql-test/suite/sys_vars/r/character_set_database_basic.result 2013-03-15 05:19:20 +0000 >@@ -424,7 +424,7 @@ > SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS); > SELECT @total_charset; > @total_charset >-39 >+40 > '#--------------------FN_DYNVARS_012_10-------------------------#' > SET @@character_set_database = "grek"; > ERROR 42000: Unknown character set: 'grek' > >=== modified file 'mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result' >--- mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result 2011-12-12 22:58:40 +0000 >+++ mysql-test/suite/sys_vars/r/character_set_filesystem_basic.result 2013-03-15 05:19:32 +0000 >@@ -402,7 +402,7 @@ > SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS); > SELECT @total_charset; > @total_charset >-39 >+40 > '#--------------------FN_DYNVARS_008_10-------------------------#' > SET @@character_set_filesystem = abc; > ERROR 42000: Unknown character set: 'abc' > >=== modified file 'mysql-test/suite/sys_vars/r/character_set_results_basic.result' >--- mysql-test/suite/sys_vars/r/character_set_results_basic.result 2011-12-12 22:58:40 +0000 >+++ mysql-test/suite/sys_vars/r/character_set_results_basic.result 2013-03-15 05:19:46 +0000 >@@ -424,7 +424,7 @@ > SET @total_charset = (SELECT count(*) FROM INFORMATION_SCHEMA.CHARACTER_SETS); > SELECT @total_charset; > @total_charset >-39 >+40 > 'Bug # 34843: character sets are mapped in such a way that 100 and following'; > 'numbers gives error, and before 100 the 36 mapped wraps arround several times.'; > '#--------------------FN_DYNVARS_013_10-------------------------#' > >=== modified file 'mysql-test/t/ctype_ucs.test' >--- mysql-test/t/ctype_ucs.test 2013-01-15 18:13:32 +0000 >+++ mysql-test/t/ctype_ucs.test 2013-03-15 04:05:28 +0000 >@@ -839,3 +839,20 @@ > --echo # > --echo # End of 5.5 tests > --echo # >+ >+ >+--echo # >+--echo # Start of 5.6 tests >+--echo # >+ >+--echo # >+--echo # Bug#59145 valgrind warnings for uninitialized values in my_strtoll10_mb2 >+--echo # >+SET NAMES latin1; >+SELECT CONVERT(CHAR(NULL USING ucs2), UNSIGNED); >+DO IFNULL(CHAR(NULL USING ucs2), ''); >+DO CAST(CONVERT('' USING ucs2) AS UNSIGNED); >+ >+--echo # >+--echo # End of 5.6 tests >+--echo # > >=== added file 'mysql-test/t/ctype_utf16le.test' >--- mysql-test/t/ctype_utf16le.test 1970-01-01 00:00:00 +0000 >+++ mysql-test/t/ctype_utf16le.test 2013-03-14 15:03:57 +0000 >@@ -0,0 +1,729 @@ >+-- source include/have_ucs2.inc >+-- source include/have_utf16.inc >+-- source include/have_utf32.inc >+-- source include/have_utf8mb4.inc >+ >+ >+SET TIME_ZONE='+03:00'; >+ >+--disable_warnings >+DROP TABLE IF EXISTS t1; >+--enable_warnings >+ >+--echo # >+--echo # Start of 5.6 tests >+--echo # >+ >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+SELECT HEX('a'), HEX('a '); >+-- source include/endspace.inc >+ >+ >+--echo # >+--echo # Check that incomplete utf16le characters in HEX notation >+--echo # are left-padded with zeros >+--echo # >+SELECT HEX(_utf16le 0x44); >+SELECT HEX(_utf16le 0x3344); >+SELECT HEX(_utf16le 0x113344); >+ >+--echo # >+--echo # Check that 0x20 is only trimmed when it is >+--echo # a part of real SPACE character, not just a part >+--echo # of a multibyte sequence. >+--echo # Note, CYRILLIC LETTER ER is used as an example, which >+--echo # is stored as 0x0420 in utf16le, thus contains 0x20 in the >+--echo # low byte. The second character is THREE-PER-M, U+2004, >+--echo # which contains 0x20 in the high byte. >+--echo # >+ >+CREATE TABLE t1 (word VARCHAR(64), word2 CHAR(64)) CHARACTER SET utf16le; >+INSERT INTO t1 VALUES (_koi8r 0xF2, _koi8r 0xF2), (_ucs2 X'2004',_ucs2 X'2004'); >+SELECT HEX(word) FROM t1 ORDER BY word; >+SELECT HEX(word2) FROM t1 ORDER BY word2; >+DELETE FROM t1; >+ >+--echo # >+--echo # Check that real spaces are correctly trimmed. >+--echo # >+INSERT INTO t1 VALUES (_ucs2 X'042000200020', _ucs2 X'042000200020'); >+INSERT INTO t1 VALUES (_ucs2 X'200400200020', _ucs2 X'200400200020'); >+SELECT HEX(word) FROM t1 ORDER BY word; >+SELECT HEX(word2) FROM t1 ORDER BY word2; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Check LPAD/RPAD >+--echo # >+CREATE TABLE t1 (a VARCHAR(10), pad INT, b VARCHAR(10)) CHARACTER SET utf16le; >+INSERT INTO t1 VALUES (_ucs2 X'0420', 10, _ucs2 X'0421'); >+INSERT INTO t1 VALUES (_ucs2 X'0420', 10, _ucs2 X'04210422'); >+INSERT INTO t1 VALUES (_ucs2 X'0420', 10, _ucs2 X'042104220423'); >+INSERT INTO t1 VALUES (_ucs2 X'0420042104220423042404250426042704280429042A042B',10,_ucs2 X'042104220423'); >+INSERT INTO t1 VALUES (_utf32 X'010000', 10, _ucs2 X'0421'); >+INSERT INTO t1 VALUES (_ucs2 X'0421', 10, _utf32 X'010000'); >+SELECT a, pad, b, LPAD(a, pad, b), HEX(LPAD(a, pad, b)) FROM t1; >+DROP TABLE t1; >+ >+ >+CREATE TABLE t1 SELECT >+LPAD(_utf16le X'2004',10,_utf16le X'2104') l, >+RPAD(_utf16le X'2004',10,_utf16le X'2104') r; >+SHOW CREATE TABLE t1; >+SELECT HEX(l), HEX(r) FROM t1; >+DROP TABLE t1; >+ >+CREATE TABLE t1 (f1 CHAR(30)); >+INSERT INTO t1 VALUES ("103000"), ("22720000"), ("3401200"), ("78000"); >+SELECT LPAD(f1, 12, "-o-/") FROM t1; >+DROP TABLE t1; >+ >+--echo # >+--echo # Testing LIKE >+--echo # >+ >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+--source include/ctype_like.inc >+ >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES ('ÑÑÐ²Ð°'),('Ð¤ÑÐ²Ð°'),('ÑÐ«Ð²Ð°'),('ÑÑÐÐ°'),('ÑÑÐ²Ð'),('Ð¤Ð«ÐÐ'); >+INSERT INTO t1 VALUES ('ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶'),('Ð¤ÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶'),('ÑÐ«Ð²Ð°Ð¿ÑÐ¾Ð»Ð´Ð¶'),('ÑÑÐÐ°Ð¿ÑÐ¾Ð»Ð´Ð¶'); >+INSERT INTO t1 VALUES ('ÑÑÐ²ÐÐ¿ÑÐ¾Ð»Ð´Ð¶'),('ÑÑÐ²Ð°ÐÑÐ¾Ð»Ð´Ð¶'),('ÑÑÐ²Ð°Ð¿Ð Ð¾Ð»Ð´Ð¶'),('ÑÑÐ²Ð°Ð¿ÑÐÐ»Ð´Ð¶'); >+INSERT INTO t1 VALUES ('ÑÑÐ²Ð°Ð¿ÑÐ¾ÐÐ´Ð¶'),('ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»ÐÐ¶'),('ÑÑÐ²Ð°Ð¿ÑÐ¾Ð»Ð´Ð'),('Ð¤Ð«ÐÐÐÐ ÐÐÐÐ'); >+SELECT * FROM t1 WHERE a LIKE '%ÑÐ«Ð²Ð°%' ORDER BY BINARY a; >+SELECT * FROM t1 WHERE a LIKE '%ÑÐ«Ð²%' ORDER BY BINARY a; >+SELECT * FROM t1 WHERE a LIKE 'ÑÐ«Ð²Ð°%' ORDER BY BINARY a; >+SELECT * FROM t1 WHERE a LIKE 'ÑÐ«Ð²Ð°%' COLLATE utf16le_bin ORDER BY BINARY a; >+DROP TABLE t1; >+ >+CREATE TABLE t1 (word VARCHAR(64) NOT NULL, PRIMARY KEY (word)) >+ENGINE=MyISAM CHARACTER SET utf16le; >+INSERT INTO t1 (word) VALUES ("cat"); >+SELECT * FROM t1 WHERE word LIKE "c%"; >+SELECT * FROM t1 WHERE word LIKE "ca_"; >+SELECT * FROM t1 WHERE word LIKE "cat"; >+SELECT * FROM t1 WHERE word LIKE _ucs2 x'00630025'; # "c%" >+SELECT * FROM t1 WHERE word LIKE _ucs2 x'00630061005F'; # "ca_" >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Check that INSERT() works fine. >+--echo # This invokes charpos() function. >+--echo # >+CREATE TABLE t1 ( >+ a VARCHAR(10) CHARACTER SET utf16le, >+ b VARCHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES ('abc', 'def'); >+SELECT INSERT(a, 10, 2, b) FROM t1; >+SELECT INSERT(a, 1, 2, b) FROM t1; >+DROP TABLE t1; >+ >+--echo # >+--echo # Bug#1264 >+--echo # >+# Description: >+# >+# When USING a ucs2 TABLE in MySQL, >+# either with ucs2_general_ci or ucs2_bin collation, >+# words are returned in an incorrect order when USING ORDER BY >+# on an _indexed_ CHAR or VARCHAR column. They are sorted with >+# the longest word *first* instead of last. I.E. The word "aardvark" >+# is in the results before the word "a". >+# >+# If there is no index for the column, the problem does not occur. >+# >+# Interestingly, if there is no second column, the words are returned >+# in the correct order. >+# >+# According to EXPLAIN, it looks like when the output includes columns that >+# are not part of the index sorted on, it does a filesort, which fails. >+# Using a straight index yields correct results. >+ >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+ >+--echo # >+--echo # Two fields, index >+--echo # >+ >+CREATE TABLE t1 ( >+ word VARCHAR(64), >+ bar INT(11) DEFAULT 0, >+ PRIMARY KEY (word)) >+ ENGINE=MyISAM >+ CHARSET utf16le >+ COLLATE utf16le_general_ci ; >+ >+INSERT INTO t1 (word) VALUES ("aar"); >+INSERT INTO t1 (word) VALUES ("a"); >+INSERT INTO t1 (word) VALUES ("aardvar"); >+INSERT INTO t1 (word) VALUES ("aardvark"); >+INSERT INTO t1 (word) VALUES ("aardvara"); >+INSERT INTO t1 (word) VALUES ("aardvarz"); >+EXPLAIN SELECT * FROM t1 ORDER BY word; >+SELECT * FROM t1 ORDER BY word; >+EXPLAIN SELECT word FROM t1 ORDER BY word; >+SELECT word FROM t1 ORDER by word; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # One field, index >+--echo # >+ >+CREATE TABLE t1 ( >+ word VARCHAR(64) , >+ PRIMARY KEY (word)) >+ ENGINE=MyISAM >+ CHARSET utf16le >+ COLLATE utf16le_general_ci; >+ >+INSERT INTO t1 (word) VALUES ("aar"); >+INSERT INTO t1 (word) VALUES ("a"); >+INSERT INTO t1 (word) VALUES ("aardvar"); >+INSERT INTO t1 (word) VALUES ("aardvark"); >+INSERT INTO t1 (word) VALUES ("aardvara"); >+INSERT INTO t1 (word) VALUES ("aardvarz"); >+EXPLAIN SELECT * FROM t1 ORDER BY WORD; >+SELECT * FROM t1 ORDER BY word; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Two fields, no index >+--echo # >+ >+CREATE TABLE t1 ( >+ word TEXT, >+ bar INT(11) AUTO_INCREMENT, >+ PRIMARY KEY (bar)) >+ ENGINE=MyISAM >+ CHARSET utf16le >+ COLLATE utf16le_general_ci ; >+INSERT INTO t1 (word) VALUES ("aar"); >+INSERT INTO t1 (word) VALUES ("a" ); >+INSERT INTO t1 (word) VALUES ("aardvar"); >+INSERT INTO t1 (word) VALUES ("aardvark"); >+INSERT INTO t1 (word) VALUES ("aardvara"); >+INSERT INTO t1 (word) VALUES ("aardvarz"); >+EXPLAIN SELECT * FROM t1 ORDER BY word; >+SELECT * FROM t1 ORDER BY word; >+EXPLAIN SELECT word FROM t1 ORDER BY word; >+SELECT word FROM t1 ORDER BY word; >+DROP TABLE t1; >+ >+--echo # >+--echo # END OF Bug 1264 test >+--echo # >+ >+ >+--echo # >+--echo # Check alignment for from-binary-conversion with CAST and CONVERT >+--echo # >+SELECT HEX(CAST(0xAA as char CHARACTER SET utf16le)); >+SELECT HEX(CONVERT(0xAA USING utf16le)); >+ >+--echo # >+--echo # Check alignment for string types >+--echo # >+CREATE TABLE t1 (a CHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+DROP TABLE t1; >+ >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+DROP TABLE t1; >+ >+CREATE TABLE t1 (a TEXT CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+DROP TABLE t1; >+ >+CREATE TABLE t1 (a MEDIUMTEXT CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+DROP TABLE t1; >+ >+CREATE TABLE t1 (a LONGTEXT CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x1),(0x11),(0x111),(0x1111),(0x11111); >+SELECT HEX(a) FROM t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Bug#5081 : UCS2 fields are filled with '0x2020' >+--echo # after extending field length >+--echo # >+ >+CREATE TABLE t1(a CHAR(1)) DEFAULT CHARSET utf16le; >+INSERT INTO t1 VALUES ('a'),('b'),('c'); >+ALTER TABLE t1 MODIFY a CHAR(5); >+SELECT a, HEX(a) FROM t1; >+DROP TABLE t1; >+ >+--echo # >+--echo # Check prepare statement from an UTF16 string >+--echo # >+SET NAMES latin1; >+SET @ivar= 1234; >+SET @str1 = 'SELECT ?'; >+SET @str2 = CONVERT(@str1 USING utf16le); >+PREPARE stmt1 FROM @str2; >+EXECUTE stmt1 USING @ivar; >+ >+--echo # >+--echo # Check that utf16le works with ENUM and SET type >+--echo # >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+CREATE TABLE t1 (a ENUM('x','y','z') CHARACTER SET utf16le); >+SHOW CREATE TABLE t1; >+INSERT INTO t1 VALUES ('x'); >+INSERT INTO t1 VALUES ('y'); >+INSERT INTO t1 VALUES ('z'); >+SELECT a, HEX(a) FROM t1 ORDER BY a; >+ALTER TABLE t1 CHANGE a a ENUM('x','y','z','d','e','Ã¤','Ã¶','Ã¼') CHARACTER SET utf16le; >+SHOW CREATE TABLE t1; >+INSERT INTO t1 VALUES ('D'); >+INSERT INTO t1 VALUES ('E '); >+INSERT INTO t1 VALUES ('Ã¤'); >+INSERT INTO t1 VALUES ('Ã¶'); >+INSERT INTO t1 VALUES ('Ã¼'); >+SELECT a, HEX(a) FROM t1 ORDER BY a; >+DROP TABLE t1; >+ >+CREATE TABLE t1 (a set ('x','y','z','Ã¤','Ã¶','Ã¼') CHARACTER SET utf16le); >+SHOW CREATE TABLE t1; >+INSERT INTO t1 VALUES ('x'); >+INSERT INTO t1 VALUES ('y'); >+INSERT INTO t1 VALUES ('z'); >+INSERT INTO t1 VALUES ('x,y'); >+INSERT INTO t1 VALUES ('x,y,z,Ã¤,Ã¶,Ã¼'); >+SELECT a, HEX(a) FROM t1 ORDER BY a; >+DROP TABLE t1; >+ >+--echo # >+--echo # Bug#7302 UCS2 data in ENUM fields get truncated when new column is added >+--echo # >+CREATE TABLE t1(a ENUM('a','b','c')) DEFAULT CHARACTER SET utf16le; >+INSERT INTO t1 VALUES('a'),('b'),('c'); >+ALTER TABLE t1 ADD b CHAR(1); >+SHOW WARNINGS; >+SELECT * FROM t1 ORDER BY a; >+DROP TABLE t1; >+ >+SET NAMES utf8, collation_connection='utf16le_general_ci'; >+-- source include/ctype_filesort.inc >+-- source include/ctype_like_escape.inc >+SET NAMES utf8, collation_connection='utf16le_bin'; >+-- source include/ctype_filesort.inc >+-- source include/ctype_filesort2.inc >+-- source include/ctype_like_escape.inc >+ >+--echo # >+--echo # Bug#10344 Some string functions fail for UCS2 >+--echo # >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le, pos INT); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,1); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,2); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,3); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,-1); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,-2); >+INSERT INTO t1 VALUES (_ucs2 0x00e400e50068,-3); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, 1); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, 2); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, 3); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, -1); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, -2); >+INSERT INTO t1 VALUES (_utf32 0x000000e4000000e500010000, -3); >+SELECT HEX(SUBSTR(a, pos)), SUBSTR(a, pos) FROM t1; >+DROP TABLE t1; >+ >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+ >+--echo # >+--echo # Bug#9442 Set parameter make query fail if column CHARACTER SET is UCS2 >+--echo # >+CREATE TABLE t1 (utext VARCHAR(20) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES ("lily"); >+INSERT INTO t1 VALUES ("river"); >+PREPARE stmt FROM 'SELECT utext FROM t1 where utext like ?'; >+SET @param1='%%'; >+EXECUTE stmt USING @param1; >+EXECUTE stmt USING @param1; >+SELECT utext FROM t1 where utext like '%%'; >+DROP TABLE t1; >+DEALLOCATE PREPARE stmt; >+ >+--echo # >+--echo # Bug#22052 Trailing spaces are not removed FROM UNICODE fields in an index >+--echo # >+CREATE TABLE t1 ( >+ a CHAR(10) CHARACTER SET utf16le NOT NULL, >+ INDEX a (a) >+) engine=myisam; >+INSERT INTO t1 VALUES (REPEAT(_ucs2 0x201f, 10)); >+INSERT INTO t1 VALUES (REPEAT(_ucs2 0x2020, 10)); >+INSERT INTO t1 VALUES (REPEAT(_ucs2 0x2021, 10)); >+--echo # make sure "index read" is used >+explain SELECT HEX(a) FROM t1 ORDER BY a; >+SELECT HEX(a) FROM t1 ORDER BY a; >+ALTER TABLE t1 DROP INDEX a; >+SELECT HEX(a) FROM t1 ORDER BY a; >+DROP TABLE t1; >+ >+--echo # >+--echo # Bug #20108: corrupted default enum value for a ucs2 field >+--echo # >+CREATE TABLE t1 ( >+ status ENUM('active','passive') CHARACTER SET utf16le COLLATE utf16le_general_ci >+ NOT NULL DEFAULT 'passive' >+); >+SHOW CREATE TABLE t1; >+ALTER TABLE t1 ADD a int NOT NULL AFTER status; >+SHOW CREATE TABLE t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Conversion FROM an UTF16LE string to a decimal column >+--echo # >+CREATE TABLE t1 (a VARCHAR(64) CHARACTER SET utf16le, b DECIMAL(10,3)); >+INSERT INTO t1 VALUES ("1.1", 0), ("2.1", 0); >+UPDATE t1 set b=a; >+SELECT *, HEX(a) FROM t1; >+DROP TABLE t1; >+ >+--echo # >+--echo # Bug#9442 Set parameter make query fail if column CHARACTER SET is UCS2 >+--echo # >+CREATE TABLE t1 (utext VARCHAR(20) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES ("lily"); >+INSERT INTO t1 VALUES ("river"); >+PREPARE stmt FROM 'SELECT utext FROM t1 where utext like ?'; >+SET @param1='%%'; >+EXECUTE stmt USING @param1; >+EXECUTE stmt USING @param1; >+SELECT utext FROM t1 where utext like '%%'; >+DROP TABLE t1; >+DEALLOCATE PREPARE stmt; >+ >+--echo # >+--echo # Bug#22638 SOUNDEX broken for international characters >+--echo # >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+SELECT SOUNDEX(''),SOUNDEX('he'),SOUNDEX('hello all folks'),SOUNDEX('#3556 in bugdb'); >+SELECT HEX(SOUNDEX('')),HEX(SOUNDEX('he')),HEX(SOUNDEX('hello all folks')),HEX(SOUNDEX('#3556 in bugdb')); >+SELECT 'mood' sounds like 'mud'; >+--echo # Cyrillic A, BE, VE >+SELECT HEX(SOUNDEX(_utf16le 0x041004110412)); >+--echo # Make sure that "U+00BF INVERTED QUESTION MARK" is not considered as letter >+SELECT HEX(SOUNDEX(_utf16le 0x00BF00C0)); >+ >+--echo # >+--echo # Bug#14290: character_maximum_length for text fields >+--echo # >+CREATE TABLE t1(a BLOB, b TEXT CHARSET utf16le); >+SELECT data_type, character_octet_length, character_maximum_length >+ FROM information_schema.columns where table_name='t1'; >+DROP TABLE t1; >+ >+ >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+ >+--echo # >+--echo # Testing cs->coll->instr() >+--echo # >+SELECT POSITION('bb' IN 'abba'); >+ >+--echo # >+--echo # Testing cs->coll->hash_sort() >+--echo # >+SET NAMES utf8, collation_connection=utf16le_bin; >+--source include/ctype_heap.inc >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+--source include/ctype_heap.inc >+ >+--echo # >+--echo # Testing cs->cset->numchars() >+--echo # >+SELECT CHAR_LENGTH('abcd'), OCTET_LENGTH('abcd'); >+SELECT CHAR_LENGTH(_utf16le 0x00D800DC), OCTET_LENGTH(_utf16le 0x00D800DC); >+SELECT CHAR_LENGTH(_utf16le 0x7DD8FFDF), OCTET_LENGTH(_utf16le 0x7FD8DDDF); >+ >+--echo # >+--echo # Testing cs->cset->charpos() >+--echo # >+SELECT LEFT('abcd',2); >+SELECT HEX(LEFT(_utf16le 0x00D800DC7FD8FFDF, 1)); >+SELECT HEX(RIGHT(_utf16le 0x00D800DC7FD8FFDF, 1)); >+ >+--echo # >+--echo # Testing cs->cset->well_formed_length() >+--echo # >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le); >+--echo # Bad sequences >+--error ER_INVALID_CHARACTER_STRING >+INSERT INTO t1 VALUES (_utf16le 0x00D8); >+--error ER_INVALID_CHARACTER_STRING >+INSERT INTO t1 VALUES (_utf16le 0x00DC); >+--error ER_INVALID_CHARACTER_STRING >+INSERT INTO t1 VALUES (_utf16le 0x00D800D8); >+--error ER_INVALID_CHARACTER_STRING >+INSERT INTO t1 VALUES (_utf16le 0x00D800E8); >+--error ER_INVALID_CHARACTER_STRING >+INSERT INTO t1 VALUES (_utf16le 0x00D80008); >+--echo # Good sequences >+INSERT INTO t1 VALUES (_utf16le 0x00D800DC); >+INSERT INTO t1 VALUES (_utf16le 0x00D8FFDC); >+INSERT INTO t1 VALUES (_utf16le 0xFFDB00DC); >+INSERT INTO t1 VALUES (_utf16le 0xFFDBFFDC); >+SELECT HEX(a) FROM t1; >+DROP TABLE t1; >+ >+--echo # >+--echo # Bug#32393 Character sets: illegal characters in utf16le columns >+--echo # >+--echo # Tests that cs->cset->wc_mb() doesn't accept surrogate parts >+--echo # >+--echo # via ALTER >+--echo # >+CREATE TABLE t1 (s1 VARCHAR(50) CHARACTER SET ucs2); >+INSERT INTO t1 VALUES (0xDF84); >+ALTER TABLE t1 MODIFY column s1 VARCHAR(50) CHARACTER SET utf16le; >+SELECT HEX(s1) FROM t1; >+DROP TABLE t1; >+ >+--echo # >+--echo # via UPDATE >+--echo # >+CREATE TABLE t1 (s1 VARCHAR(5) CHARACTER SET ucs2, s2 VARCHAR(5) CHARACTER SET utf16le); >+INSERT INTO t1 (s1) VALUES (0xdf84); >+UPDATE t1 set s2 = s1; >+SELECT HEX(s2) FROM t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Testing cs->cset->lengthsp() >+--echo # >+CREATE TABLE t1 (a CHAR(10)) CHARACTER SET utf16le; >+INSERT INTO t1 VALUES ('a '); >+SELECT HEX(a) FROM t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Testing cs->cset->caseup() and cs->cset->casedn() >+--echo # >+SELECT UPPER('abcd'), LOWER('ABCD'); >+ >+--echo # >+--echo # Checking str_to_datetime() >+--echo # >+select @@collation_connection; >+CREATE TABLE t1 (a date); >+INSERT INTO t1 VALUES ('2007-09-16'); >+SELECT * FROM t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Testing cs->cset->ll10tostr >+--echo # >+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (123456); >+SELECT a, HEX(a) FROM t1; >+DROP TABLE t1; >+ >+--echo # >+--echo # Testing cs->cset->fill >+--echo # SOUNDEX fills strings with DIGIT ZERO up to four characters >+--echo # >+SELECT SOUNDEX('a'), HEX(SOUNDEX('a')); >+ >+ >+--echo # >+--echo # Testing cs->cset->strntoul >+--echo # >+CREATE TABLE t1 (a enum ('a','b','c')) CHARACTER SET utf16le; >+INSERT INTO t1 VALUES ('1'); >+SELECT * FROM t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Testing cs->cset->strntoll and cs->cset->strntoull >+--echo # >+SET NAMES latin1; >+SELECT HEX(CONV(CONVERT('123' USING utf16le), -10, 16)); >+SELECT HEX(CONV(CONVERT('123' USING utf16le), 10, 16)); >+SET NAMES utf8, collation_connection=utf16le_general_ci; Monty: You have here two idenitcal SET NAMES in a row. >+ >+ >+--echo # >+--echo # Testing cs->cset->strntod >+--echo # >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+SELECT 1.1 + '1.2'; >+SELECT 1.1 + '1.2xxx'; >+ >+ >+--echo # >+--echo # Testing cs->cset->strtoll10 >+--echo # >+SELECT LEFT('aaa','1'); >+CREATE TABLE t1 AS SELECT REPEAT('abcd', 128) AS a; >+SELECT LEFT(a, '2') FROM t1; >+SELECT LEFT(a, ' \t \t 2') FROM t1; >+SELECT LEFT(a, ' \t \t +2') FROM t1; >+SELECT SUBSTR(a, '-2') FROM t1; >+SELECT SUBSTR(a, ' \t \t -2') FROM t1; >+SELECT LEFT(a, '00002') FROM t1; >+SELECT LEFT(a, ' \t \t 00002') FROM t1; >+SELECT LEFT(a, ' \t \t +00002') FROM t1; >+SELECT SUBSTR(a, '-00002') FROM t1; >+SELECT SUBSTR(a, ' \t \t -00002') FROM t1; >+DROP TABLE t1; >+CREATE TABLE t1 AS SELECT REPEAT('abcd', 128) AS a LIMIT 0; >+INSERT INTO t1 VALUES ('255'), ('65535'),('16777215'),('4294967295'), >+('1099511627775'),('281474976710655'),('72057594037927935'), >+('1844674407370955161'),('18446744073709551614'), ('18446744073709551615'); >+SELECT a, CAST(a AS SIGNED), CAST(a AS UNSIGNED) FROM t1; >+UPDATE t1 SET a=CONCAT('-', a); >+SELECT a, CAST(a AS SIGNED) FROM t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Testing cs->cset->strntoull10rnd >+--echo # >+CREATE TABLE t1 (a int); >+INSERT INTO t1 VALUES ('-1234.1e2'); >+INSERT INTO t1 VALUES ('-1234.1e2xxxx'); >+INSERT INTO t1 VALUES ('-1234.1e2 '); >+INSERT INTO t1 VALUES ('123'); >+INSERT INTO t1 VALUES ('-124'); >+INSERT INTO t1 VALUES ('+125'); >+INSERT INTO t1 VALUES (' \t \t 123'); >+INSERT INTO t1 VALUES (' \t \t -124'); >+INSERT INTO t1 VALUES (' \t \t +125'); >+INSERT INTO t1 VALUES (' \t \t 000123'); >+INSERT INTO t1 VALUES (' \t \t -000124'); >+INSERT INTO t1 VALUES (' \t \t +000125'); >+SELECT * FROM t1; >+DROP TABLE t1; >+CREATE TABLE t1 (a BIGINT UNSIGNED); >+INSERT INTO t1 VALUES ('255'), ('65535'),('16777215'),('4294967295'), >+('1099511627775'),('281474976710655'),('72057594037927935'), >+('1844674407370955161'),('18446744073709551614'), ('18446744073709551615'); >+SELECT * FROM t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Testing cs->cset->scan >+--echo # >+CREATE TABLE t1 (a int); >+INSERT INTO t1 VALUES ('1 '); >+INSERT INTO t1 VALUES ('1 x'); >+SELECT * FROM t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Testing auto-conversion to TEXT >+--echo # >+CREATE TABLE t1 (a VARCHAR(17000) CHARACTER SET utf16le); >+SHOW CREATE TABLE t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Testing that maximim possible key length is 1000 bytes >+--echo # >+CREATE TABLE t1 (a VARCHAR(250) CHARACTER SET utf16le PRIMARY KEY); >+SHOW CREATE TABLE t1; >+DROP TABLE t1; >+--error ER_TOO_LONG_KEY >+CREATE TABLE t1 (a VARCHAR(334) CHARACTER SET utf16le PRIMARY KEY); >+ >+ >+--echo # >+--echo # Conversion to utf8 >+--echo # >+CREATE TABLE t1 (a CHAR(1) CHARACTER SET utf16le); >+INSERT INTO t1 VALUES (0x00D800DC),(0x00D8FFDC),(0x7FDB00DC),(0x7FDBFFDC); >+INSERT INTO t1 VALUES (0xC000), (0xFF00),(0x00E0), (0xFFFF); >+SELECT HEX(a), HEX(@a:=CONVERT(a USING utf8mb4)), HEX(CONVERT(@a USING utf16le)) FROM t1; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # Test basic regex functionality >+--echo # >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+--source include/ctype_regex.inc >+ >+ >+--echo # >+--echo # Test how CHARACTER SET works with date/time >+--echo # >+--source include/ctype_datetime.inc >+ >+ >+--echo # >+--echo # Bug#33073 Character sets: ordering fails with utf32 >+--echo # >+SET NAMES utf8, collation_connection=utf16le_general_ci; >+CREATE TABLE t1 AS SELECT REPEAT('a',2) as s1 LIMIT 0; >+SHOW CREATE TABLE t1; >+INSERT INTO t1 VALUES ('ab'),('AE'),('ab'),('AE'); >+SELECT * FROM t1 ORDER BY s1; >+SET max_sort_length=4; >+SELECT * FROM t1 ORDER BY s1; >+DROP TABLE t1; >+SET max_sort_length=DEFAULT; >+ >+ >+--echo # >+--echo # Bug#52520 Difference in tinytext utf column metadata >+--echo # >+CREATE TABLE t1 ( >+ s1 TINYTEXT CHARACTER SET utf16le, >+ s2 TEXT CHARACTER SET utf16le, >+ s3 MEDIUMTEXT CHARACTER SET utf16le, >+ s4 LONGTEXT CHARACTER SET utf16le >+); >+--enable_metadata >+SET NAMES utf8, @@character_set_results=NULL; >+SELECT *, HEX(s1) FROM t1; >+SET NAMES latin1; >+SELECT *, HEX(s1) FROM t1; >+SET NAMES utf8; >+SELECT *, HEX(s1) FROM t1; >+--disable_metadata >+CREATE TABLE t2 AS SELECT CONCAT(s1) FROM t1; >+SHOW CREATE TABLE t2; >+DROP TABLE t1, t2; >+ >+--echo # >+--echo # Problem found by Roy during review >+--echo # MY_CS_BINSORT was not set for utf16le_bin, >+--echo # so filesort did not work well >+--echo # >+SET NAMES utf8, @@collation_connection=utf16le_bin; >+CREATE TABLE t1 AS SELECT REPEAT(' ', 10) as c LIMIT 0; >+# the problem in fact reproduced even without the primary key: >+ALTER TABLE t1 ADD PRIMARY KEY(c); >+SHOW CREATE TABLE t1; >+INSERT INTO t1 VALUES ('abc'),('zyx'),('acb'); >+SELECT UPPER(c) FROM t1 ORDER BY 1 DESC; >+DROP TABLE t1; >+ >+ >+--echo # >+--echo # End of 5.6 tests >+--echo # > >=== modified file 'mysql-test/t/ctype_utf32.test' >--- mysql-test/t/ctype_utf32.test 2012-08-09 16:25:47 +0000 >+++ mysql-test/t/ctype_utf32.test 2013-03-15 04:52:28 +0000 >@@ -813,6 +813,17 @@ > DROP TABLE t1; > > --echo # >+--echo # Bug#32859 Character sets: no warning with non-fitting chariot wheel >+--echo # >+CREATE TABLE t1 (utf32 CHAR(5) CHARACTER SET utf32, latin1 CHAR(5) CHARACTER SET latin1); >+INSERT INTO t1 (utf32) VALUES (0xc581); >+UPDATE t1 SET latin1 = utf32; >+DELETE FROM t1; >+INSERT INTO t1 (utf32) VALUES (0x100cc); >+UPDATE t1 SET latin1 = utf32; >+DROP TABLE t1; >+ >+--echo # > --echo # Bug#55912 FORMAT with locale set fails for numbers < 1000 > --echo # > SET collation_connection=utf32_general_ci; > >=== modified file 'mysys/charset-def.c' >--- mysys/charset-def.c 2012-07-31 17:29:07 +0000 >+++ mysys/charset-def.c 2013-03-14 12:43:39 +0000 >@@ -304,6 +304,8 @@ > #ifdef HAVE_CHARSET_utf16 > add_compiled_collation(&my_charset_utf16_general_ci); > add_compiled_collation(&my_charset_utf16_bin); >+ add_compiled_collation(&my_charset_utf16le_general_ci); >+ add_compiled_collation(&my_charset_utf16le_bin); > #ifdef HAVE_UCA_COLLATIONS > add_compiled_collation(&my_charset_utf16_unicode_ci); > add_compiled_collation(&my_charset_utf16_icelandic_uca_ci); > >=== modified file 'sql/item_func.cc' >--- sql/item_func.cc 2013-01-29 14:10:47 +0000 >+++ sql/item_func.cc 2013-03-14 14:52:45 +0000 >@@ -1027,13 +1027,11 @@ > value= cs->cset->strtoll10(cs, start, &end, error); > if (*error > 0 || end != start+ length) > { >- char err_buff[128]; >- String err_tmp(err_buff,(uint32) sizeof(err_buff), system_charset_info); >- err_tmp.copy(start, length, system_charset_info); >+ ErrConvString err(res); > push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, > ER_TRUNCATED_WRONG_VALUE, > ER(ER_TRUNCATED_WRONG_VALUE), "INTEGER", >- err_tmp.c_ptr()); >+ err.ptr()); > } > return value; > } > >=== modified file 'sql/sys_vars.cc' >--- sql/sys_vars.cc 2013-02-25 23:20:17 +0000 >+++ sql/sys_vars.cc 2013-03-15 04:23:14 +0000 >@@ -385,16 +385,19 @@ > if (var->value->result_type() == STRING_RESULT) > { > String str(buff, sizeof(buff), system_charset_info), *res; >- if (!(res=var->value->val_str(&str))) >+ if (!(res= var->value->val_str(&str))) > var->save_result.ptr= NULL; >- else if (!(var->save_result.ptr= get_charset_by_csname(res->c_ptr(), >- MY_CS_PRIMARY, >- MYF(0))) && >- !(var->save_result.ptr=get_old_charset_by_name(res->c_ptr()))) >+ else > { >- ErrConvString err(res); >- my_error(ER_UNKNOWN_CHARACTER_SET, MYF(0), err.ptr()); >- return true; >+ ErrConvString err(res); /* Get utf8 '\0' terminated string */ >+ if (!(var->save_result.ptr= get_charset_by_csname(err.ptr(), >+ MY_CS_PRIMARY, >+ MYF(0))) && >+ !(var->save_result.ptr= get_old_charset_by_name(err.ptr()))) >+ { >+ my_error(ER_UNKNOWN_CHARACTER_SET, MYF(0), err.ptr()); >+ return true; >+ } > } Monty: Please add a comment why we need to use ErrConvString instead of the original string. (As ErrConvString should normally only be used for errors). I assume this is because of: SET collation_connection=<ucs2, utf16, utf32 value>; SET character_set_connection=<ucs2, utf16, utf32 value>; Wouldn't it be better to have a function String change_character_set(CHARSET_INFO *cs) for cases like this? (I am mostly worried someone will try to copy the above code for things where ErrConvString is not suitable) After all, instead of using ErrConvString() I assume one could simple have: char buff[256]; String utf8(buff, sizeof(buff), system_charset_info); utf8.copy(res); Which I think is probably faster and more clear than using ErrConvString(). > } > else // INT_RESULT >@@ -505,11 +508,14 @@ > String str(buff, sizeof(buff), system_charset_info), *res; > if (!(res= var->value->val_str(&str))) > var->save_result.ptr= NULL; >- else if (!(var->save_result.ptr= get_charset_by_name(res->c_ptr(), MYF(0)))) >+ else > { >- ErrConvString err(res); >- my_error(ER_UNKNOWN_COLLATION, MYF(0), err.ptr()); >- return true; >+ ErrConvString err(res); /* Get utf8 '\0'-terminated string */ >+ if (!(var->save_result.ptr= get_charset_by_name(err.ptr(), MYF(0)))) >+ { >+ my_error(ER_UNKNOWN_COLLATION, MYF(0), err.ptr()); >+ return true; >+ } > } > } Monty: same argument as above. > else // INT_RESULT > >=== modified file 'strings/ctype-latin1.c' >--- strings/ctype-latin1.c 2013-03-12 14:33:19 +0000 >+++ strings/ctype-latin1.c 2013-03-15 04:51:34 +0000 >@@ -385,7 +385,10 @@ > if (str >= end) > return MY_CS_TOOSMALL; > >- pl= uni_to_cs[(wc>>8) & 0xFF]; >+ if (wc > 0xFFFF) >+ return MY_CS_ILUNI; >+ >+ pl= uni_to_cs[wc >> 8]; > str[0]= pl ? pl[wc & 0xFF] : '\0'; > return (!str[0] && wc) ? MY_CS_ILUNI : 1; > } > >=== modified file 'strings/ctype-ucs2.c' >--- strings/ctype-ucs2.c 2013-01-29 14:10:47 +0000 >+++ strings/ctype-ucs2.c 2013-03-15 04:27:10 +0000 >@@ -718,17 +718,30 @@ > ulonglong li; > int negative; > ulong cutoff, cutoff2, cutoff3; >+ my_wc_t wc; >+ int res; > > s= nptr; > /* If fixed length string */ > if (endptr) > { >- /* Make sure string length is even */ >+ /* >+ Make sure string length is even. >+ Odd length indicates a bug in the caller. >+ Assert in debug, round in production. >+ */ >+ DBUG_ASSERT((*endptr - s) % 2 == 0); > end= s + ((*endptr - s) / 2) * 2; >- while (s < end && !s[0] && (s[1] == ' ' || s[1] == '\t')) >- s+= 2; >- if (s == end) >- goto no_conv; >+ >+ for ( ; ; ) /* Skip leading spaces and tabs */ >+ { >+ res= cs->cset->mb_wc(cs, &wc, (const uchar *) s, (const uchar *) end); >+ if (res <= 0) >+ goto no_conv; >+ s+= res; >+ if (wc != ' ' && wc != '\t') >+ break; >+ } > } > else > { >@@ -738,13 +751,14 @@ > > /* Check for a sign. */ > negative= 0; >- if (!s[0] && s[1] == '-') >+ if (wc == '-') > { > *error= -1; /* Mark as negative number */ > negative= 1; >- s+= 2; >- if (s == end) >+ res= cs->cset->mb_wc(cs, &wc, (const uchar *) s, (const uchar *) end); >+ if (res < 0) > goto no_conv; >+ s+= res; Monty: Add a comment: /* wc should contain the first number in the code below */ It would also be nice to have a comment why we can't assume for this code that each character is 2 bytes (like the old code assumed). I assume it's to detect wrong characters ? > cutoff= MAX_NEGATIVE_NUMBER / LFACTOR2; > cutoff2= (MAX_NEGATIVE_NUMBER % LFACTOR2) / 100; > cutoff3= MAX_NEGATIVE_NUMBER % 100; >@@ -752,46 +766,55 @@ > else > { > *error= 0; >- if (!s[0] && s[1] == '+') >+ if (wc == '+') > { >- s+= 2; >- if (s == end) >+ res= cs->cset->mb_wc(cs, &wc, (const uchar *) s, (const uchar *) end); >+ if (res < 0) > goto no_conv; >+ s+= res; Monty: Add same comment as for the earlier comment > } > cutoff= ULONGLONG_MAX / LFACTOR2; > cutoff2= ULONGLONG_MAX % LFACTOR2 / 100; > cutoff3= ULONGLONG_MAX % 100; > } > >+ > /* Handle case where we have a lot of pre-zero */ >- if (!s[0] && s[1] == '0') >+ if (wc == '0') > { > i= 0; >- do >+ for ( ; ; s+= res) > { >- s+= 2; > if (s == end) > goto end_i; /* Return 0 */ >+ res= cs->cset->mb_wc(cs, &wc, (const uchar *) s, (const uchar *) end); >+ if (res < 0) >+ goto no_conv; >+ if (wc != '0') >+ break; > } >- while (!s[0] && s[1] == '0'); >+ while (wc == '0'); Monty: The above line is a bug (even if condition is impossible). Remove it! (The above code is probably wrongly left there when you converted the do-while to a for()). > n_end= s + 2 * INIT_CNT; > } > else > { > /* Read first digit to check that it's a valid number */ >- if (s[0] || (c= (s[1]-'0')) > 9) >+ if ((c= (wc - '0')) > 9) > goto no_conv; > i= c; >- s+= 2; > n_end= s + 2 * (INIT_CNT-1); > } Monty: Above you can set 'i' directly. No reason to use 'c' > /* Handle first 9 digits and store them in i */ > if (n_end > end) > n_end= end; >- for (; s != n_end ; s+= 2) >+ for ( ; ; ) > { >- if (s[0] || (c= (s[1]-'0')) > 9) >+ res= cs->cset->mb_wc(cs, &wc, (const uchar *) s, (const uchar *) n_end); >+ if (res < 0) >+ break; Monty: In general I prefer the code: if ((res= cs->cset->mb_wc(cs, &wc, (const uchar *) s, (const uchar *) n_end) < 0) By the way, wouldn't the code be simpler if you would change the type of 's' and 'end' and 'n_end' to const uchar * ? >+ s+= res; >+ if ((c= (wc - '0')) > 9) > goto end_i; > i= i*10+c; > } >@@ -806,10 +829,13 @@ > n_end= end; > do > { >- if (s[0] || (c= (s[1]-'0')) > 9) >+ res= cs->cset->mb_wc(cs, &wc, (const uchar *) s, (const uchar *) end); >+ if (res < 0) >+ goto no_conv; >+ s+= res; >+ if ((c= (wc - '0')) > 9) > goto end_i_and_j; > j= j*10+c; >- s+= 2; > } while (s != n_end); > if (s == end) > { >@@ -817,20 +843,28 @@ > goto end_i_and_j; > goto end3; > } >- if (s[0] || (c= (s[1]-'0')) > 9) >+ res= cs->cset->mb_wc(cs, &wc, (const uchar *) s, (const uchar *) end); >+ if (res < 0) >+ goto no_conv; >+ s+= res; >+ if ((c= (wc - '0')) > 9) > goto end3; Monty: Here you could store directly in 'k' and remove next line Isn't it wrong to increment 's' before going to to end3? 's' should point to the first not-number character. Now it will point one character past it. Why wasn't this shown in the test cases? Maybe because you didn't test with big numbers? > /* Handle the next 1 or 2 digits and store them in k */ > k=c; >- s+= 2; >- if (s == end || s[0] || (c= (s[1]-'0')) > 9) >+ if (s == end) >+ goto end4; >+ res= cs->cset->mb_wc(cs, &wc, (const uchar *) s, (const uchar *) end); >+ if (res < 0) >+ goto no_conv; >+ s+= res; >+ if ((c= (wc - '0')) > 9) > goto end4; Monty: Isn't it wrong to increment 's' before going to to end4? 's' should point to the first not-number character. Now it will point one character past it. Why wasn't this shown in the test cases? Please check the same issue with all the other calls to end_i, end_i_and_j, end3 and end4. Even some of the earlier code looks not safe. > k= k*10+c; >- s+= 2; > *endptr= (char*) s; > > /* number string should have ended here */ >- if (s != end && !s[0] && (c= (s[1]-'0')) <= 9) >+ if (s != end && (c= (wc - '0')) <= 9) > goto overflow; > > /* Check that we didn't get an overflow with the last digit */ >@@ -882,15 +916,19 @@ > const char *str, const char *end, int sequence_type) > { > const char *str0= str; >- end--; /* for easier loop condition, because of two bytes per character */ >- >+ my_wc_t wc; >+ int res; >+ > switch (sequence_type) > { > case MY_SEQ_SPACES: >- for ( ; str < end; str+= 2) >+ for (res= cs->cset->mb_wc(cs, &wc, >+ (const uchar *) str, (const uchar *) end); >+ res > 0 && wc == ' '; >+ str+= res, >+ res= cs->cset->mb_wc(cs, &wc, >+ (const uchar *) str, (const uchar *) end)) > { >- if (str[0] != '\0' || str[1] != ' ') >- break; > } > return (size_t) (str - str0); > default: >@@ -900,11 +938,34 @@ > > > static void >-my_fill_mb2(CHARSET_INFO *cs __attribute__((unused)), >- char *s, size_t l, int fill) >+my_fill_mb2(CHARSET_INFO *cs, char *s, size_t slen, int fill) > { >- DBUG_ASSERT(fill <= 0xFFFF); >- for ( ; l >= 2; s[0]= (fill >> 8), s[1]= (fill & 0xFF), s+= 2, l-= 2); >+ char buf[10]; >+ int buflen; >+ >+ DBUG_ASSERT((slen % 2) == 0); >+ >+ buflen= cs->cset->wc_mb(cs, (my_wc_t) fill, (uchar*) buf, >+ (uchar*) buf + sizeof(buf)); >+ >+ DBUG_ASSERT(buflen > 0); >+ >+ while (slen >= (size_t) buflen) >+ { >+ /* Enough space for the characer */ >+ memcpy(s, buf, (size_t) buflen); >+ s+= buflen; >+ slen-= buflen; >+ } Monty: I generally prefer loops like: end= s + slen; for ( ; s < end; s+=buflen) memcpy(s, buf, (size_t) buflen); Better to only have to decrement one variable instead of two. >+ >+ /* >+ If there are some more space which is not enough >+ for the whole multibyte character, then add trailing zeros. >+ */ >+ for ( ; slen; slen--) >+ { >+ *s++= 0x00; >+ } Monty: Use instead: if (slen) bzero(s, slen); > } > > >@@ -1018,11 +1079,26 @@ > DB80..DBFF - Private surrogate high (128 pages) > DC00..DFFF - Surrogate low (1024 codes in a page) > */ >+#define MY_UTF16_SURROGATE_HIGH_FIRST 0xD800 >+#define MY_UTF16_SURROGATE_HIGH_LAST 0xDBFF >+#define MY_UTF16_SURROGATE_LOW_FIRST 0xDC00 >+#define MY_UTF16_SURROGATE_LOW_LAST 0xDFFF > > #define MY_UTF16_HIGH_HEAD(x) ((((uchar) (x)) & 0xFC) == 0xD8) > #define MY_UTF16_LOW_HEAD(x) ((((uchar) (x)) & 0xFC) == 0xDC) > #define MY_UTF16_SURROGATE(x) (((x) & 0xF800) == 0xD800) > >+#define MY_UTF16_WC2(a, b) ((a << 8) + b) >+ >+/* >+ a= 110110?? (<< 18) >+ b= ???????? (<< 10) >+ c= 110111?? (<< 8) >+ d= ???????? (<< 0) >+*/ >+#define MY_UTF16_WC4(a, b, c, d) (((a & 3) << 18) + (b << 10) + \ >+ ((c & 3) << 8) + d + 0x10000) >+ > static int > my_utf16_uni(CHARSET_INFO *cs __attribute__((unused)), > my_wc_t *pwc, const uchar *s, const uchar *e) >@@ -1044,23 +1120,14 @@ > if (!MY_UTF16_LOW_HEAD(s[2])) /* Broken surrigate pair */ > return MY_CS_ILSEQ; > >- /* >- s[0]= 110110?? (<< 18) >- s[1]= ???????? (<< 10) >- s[2]= 110111?? (<< 8) >- s[3]= ???????? (<< 0) >- */ >- >- *pwc= ((s[0] & 3) << 18) + (s[1] << 10) + >- ((s[2] & 3) << 8) + s[3] + 0x10000; >- >+ *pwc= MY_UTF16_WC4(s[0], s[1], s[2], s[3]); > return 4; > } > > if (MY_UTF16_LOW_HEAD(*s)) /* Low surrogate part without high part */ > return MY_CS_ILSEQ; >- >- *pwc= (s[0] << 8) + s[1]; >+ >+ *pwc= MY_UTF16_WC2(s[0], s[1]); > return 2; > } > >@@ -1141,10 +1208,10 @@ > DBUG_ASSERT(src == dst && srclen == dstlen); > > while ((src < srcend) && >- (res= my_utf16_uni(cs, &wc, (uchar *)src, (uchar*) srcend)) > 0) >+ (res= cs->cset->mb_wc(cs, &wc, (uchar *) src, (uchar *) srcend)) > 0) > { > my_toupper_utf16(uni_plane, &wc); >- if (res != my_uni_utf16(cs, wc, (uchar*) src, (uchar*) srcend)) >+ if (res != cs->cset->wc_mb(cs, wc, (uchar *) src, (uchar *) srcend)) > break; > src+= res; > } Monty: Check the assembler if it would make sence to store cs->cset->mb_wc in a register. (It probably would as the assembler can't assume that the pointer is unchanged over calls). This applies to all cases where you use 'cs->cset->mb_wc' in a loop. >@@ -1158,13 +1225,11 @@ > { > my_wc_t wc; > int res; >- const uchar *e= s+slen; >+ const uchar *e= s + cs->cset->lengthsp(cs, (const char *) s, slen); > MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; > >- while (e > s + 1 && e[-1] == ' ' && e[-2] == '\0') >- e-= 2; >- >- while ((s < e) && (res= my_utf16_uni(cs, &wc, (uchar *)s, (uchar*)e)) > 0) >+ while ((s < e) && (res= cs->cset->mb_wc(cs, &wc, >+ (uchar *) s, (uchar *) e)) > 0) > { > my_tosort_utf16(uni_plane, &wc); > n1[0]^= (((n1[0] & 63) + n2[0]) * (wc & 0xFF)) + (n1[0] << 8); >@@ -1188,10 +1253,10 @@ > DBUG_ASSERT(src == dst && srclen == dstlen); > > while ((src < srcend) && >- (res= my_utf16_uni(cs, &wc, (uchar*) src, (uchar*) srcend)) > 0) >+ (res= cs->cset->mb_wc(cs, &wc, (uchar *) src, (uchar *) srcend)) > 0) > { > my_tolower_utf16(uni_plane, &wc); >- if (res != my_uni_utf16(cs, wc, (uchar*) src, (uchar*) srcend)) >+ if (res != cs->cset->wc_mb(cs, wc, (uchar *) src, (uchar *) srcend)) > break; > src+= res; > } >@@ -1213,8 +1278,8 @@ > > while (s < se && t < te) > { >- s_res= my_utf16_uni(cs, &s_wc, s, se); >- t_res= my_utf16_uni(cs, &t_wc, t, te); >+ s_res= cs->cset->mb_wc(cs, &s_wc, s, se); >+ t_res= cs->cset->mb_wc(cs, &t_wc, t, te); > > if (s_res <= 0 || t_res <= 0) > { >@@ -1283,8 +1348,8 @@ > > while (s < se && t < te) > { >- int s_res= my_utf16_uni(cs, &s_wc, s, se); >- int t_res= my_utf16_uni(cs, &t_wc, t, te); >+ int s_res= cs->cset->mb_wc(cs, &s_wc, s, se); >+ int t_res= cs->cset->mb_wc(cs, &t_wc, t, te); > > if (s_res <= 0 || t_res <= 0) > { >@@ -1324,7 +1389,7 @@ > > for ( ; s < se; s+= s_res) > { >- if ((s_res= my_utf16_uni(cs, &s_wc, s, se)) < 0) >+ if ((s_res= cs->cset->mb_wc(cs, &s_wc, s, se)) < 0) > { > DBUG_ASSERT(0); > return 0; >@@ -1338,22 +1403,11 @@ > > > static uint >-my_ismbchar_utf16(CHARSET_INFO *cs __attribute__((unused)), >- const char *b __attribute__((unused)), >- const char *e __attribute__((unused))) >+my_ismbchar_utf16(CHARSET_INFO *cs, const char *b, const char *e) > { >- if (b + 2 > e) >- return 0; >- >- if (MY_UTF16_HIGH_HEAD(*b)) >- { >- return (b + 4 <= e) && MY_UTF16_LOW_HEAD(b[2]) ? 4 : 0; >- } >- >- if (MY_UTF16_LOW_HEAD(*b)) >- return 0; >- >- return 2; >+ my_wc_t wc; >+ int res= cs->cset->mb_wc(cs, &wc, (const uchar *) b, (const uchar *) e); >+ return (uint) (res > 0 ? res : 0); > } > > >@@ -1361,6 +1415,7 @@ > my_mbcharlen_utf16(CHARSET_INFO *cs __attribute__((unused)), > uint c __attribute__((unused))) > { >+ DBUG_ASSERT(0); > return MY_UTF16_HIGH_HEAD(c) ? 4 : 2; > } > >@@ -1454,8 +1509,8 @@ > > while ( s < se && t < te ) > { >- s_res= my_utf16_uni(cs,&s_wc, s, se); >- t_res= my_utf16_uni(cs,&t_wc, t, te); >+ s_res= cs->cset->mb_wc(cs, &s_wc, s, se); >+ t_res= cs->cset->mb_wc(cs, &t_wc, t, te); > > if (s_res <= 0 || t_res <= 0) > { >@@ -1493,8 +1548,8 @@ > > while (s < se && t < te) > { >- int s_res= my_utf16_uni(cs, &s_wc, s, se); >- int t_res= my_utf16_uni(cs, &t_wc, t, te); >+ int s_res= cs->cset->mb_wc(cs, &s_wc, s, se); >+ int t_res= cs->cset->mb_wc(cs, &t_wc, t, te); > > if (s_res <= 0 || t_res <= 0) > { >@@ -1531,7 +1586,7 @@ > > for ( ; s < se; s+= s_res) > { >- if ((s_res= my_utf16_uni(cs, &s_wc, s, se)) < 0) >+ if ((s_res= cs->cset->mb_wc(cs, &s_wc, s, se)) < 0) > { > DBUG_ASSERT(0); > return 0; >@@ -1545,17 +1600,11 @@ > > > static void >-my_hash_sort_utf16_bin(CHARSET_INFO *cs __attribute__((unused)), >- const uchar *key, size_t len,ulong *nr1, ulong *nr2) >+my_hash_sort_utf16_bin(CHARSET_INFO *cs, >+ const uchar *pos, size_t len, ulong *nr1, ulong *nr2) > { >- const uchar *pos = key; >- >- key+= len; >- >- while (key > pos + 1 && key[-1] == ' ' && key[-2] == '\0') >- key-= 2; >- >- for (; pos < (uchar*) key ; pos++) >+ const uchar *end= pos + cs->cset->lengthsp(cs, (const char *) pos, len); >+ for ( ; pos < end ; pos++) > { > nr1[0]^= (ulong) ((((uint) nr1[0] & 63) + nr2[0]) * > ((uint)*pos)) + (nr1[0] << 8); >@@ -1664,7 +1713,7 @@ > struct charset_info_st my_charset_utf16_bin= > { > 55,0,0, /* number */ >- MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_UNICODE|MY_CS_NONASCII, >+ MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, > "utf16", /* cs name */ > "utf16_bin", /* name */ > "UTF-16 Unicode", /* comment */ >@@ -1693,6 +1742,173 @@ > &my_collation_utf16_bin_handler > }; > >+ >+static int >+my_utf16le_uni(const CHARSET_INFO *cs __attribute__((unused)), >+ my_wc_t *pwc, const uchar *s, const uchar *e) >+{ >+ my_wc_t lo; >+ >+ if (s + 2 > e) >+ return MY_CS_TOOSMALL2; >+ >+ if ((*pwc= uint2korr(s)) < MY_UTF16_SURROGATE_HIGH_FIRST || >+ (*pwc > MY_UTF16_SURROGATE_LOW_LAST)) >+ return 2; /* [0000-D7FF,E000-FFFF] */ >+ >+ if (*pwc >= MY_UTF16_SURROGATE_LOW_FIRST) >+ return MY_CS_ILSEQ; /* [DC00-DFFF] Low surrogate part without high part */ >+ >+ if (s + 4 > e) >+ return MY_CS_TOOSMALL4; >+ >+ s+= 2; >+ >+ if ((lo= uint2korr(s)) < MY_UTF16_SURROGATE_LOW_FIRST || >+ lo > MY_UTF16_SURROGATE_LOW_LAST) >+ return MY_CS_ILSEQ; /* Expected low surrogate part, got something else */ >+ >+ *pwc= 0x10000 + (((*pwc & 0x3FF) << 10) | (lo & 0x3FF)); >+ return 4; >+} >+ >+ >+static int >+my_uni_utf16le(const CHARSET_INFO *cs __attribute__((unused)), >+ my_wc_t wc, uchar *s, uchar *e) >+{ >+ if (wc < MY_UTF16_SURROGATE_HIGH_FIRST || >+ (wc > MY_UTF16_SURROGATE_LOW_LAST && >+ wc <= 0xFFFF)) >+ { >+ if (s + 2 > e) >+ return MY_CS_TOOSMALL2; >+ int2store(s, wc); >+ return 2; /* [0000-D7FF,E000-FFFF] */ >+ } >+ >+ if (wc < 0xFFFF || wc > 0x10FFFF) >+ return MY_CS_ILUNI; /* [D800-DFFF,10FFFF+] */ >+ >+ if (s + 4 > e) >+ return MY_CS_TOOSMALL4; >+ >+ wc-= 0x10000; >+ int2store(s, (0xD800 | ((wc >> 10) & 0x3FF))); s+= 2; >+ int2store(s, (0xDC00 | (wc & 0x3FF))); Monty: Use int2store(s+2... for the second row and remove s+2. Makes the line easier to read... Note that as int2store is a macro, doing it this is maybe faster: uint16 first_part, second_part; uint32 total; first_part= (0xD800 | ((wc >> 10) & 0x3FF))); second_part= (0xDC00 | (wc & 0x3FF))); total= first_part + (second_part << 16) int4store(s, total); >+ return 4; /* [010000-10FFFF] */ >+} >+ >+ >+static size_t >+my_lengthsp_utf16le(const CHARSET_INFO *cs __attribute__((unused)), >+ const char *ptr, size_t length) >+{ >+ const char *end= ptr + length; >+ while (end > ptr + 1 && uint2korr(end - 2) == 0x20) Monty Using ' ' instead of 0x20 is maybe more clear? >+ end-= 2; >+ return (size_t) (end - ptr); >+} >+ >+ >+static MY_CHARSET_HANDLER my_charset_utf16le_handler= >+{ >+ NULL, /* init */ >+ my_ismbchar_utf16, >+ my_mbcharlen_utf16, >+ my_numchars_utf16, >+ my_charpos_utf16, >+ my_well_formed_len_utf16, >+ my_lengthsp_utf16le, >+ my_numcells_mb, >+ my_utf16le_uni, /* mb_wc */ >+ my_uni_utf16le, /* wc_mb */ >+ my_mb_ctype_mb, >+ my_caseup_str_mb2_or_mb4, >+ my_casedn_str_mb2_or_mb4, >+ my_caseup_utf16, >+ my_casedn_utf16, >+ my_snprintf_mb2, >+ my_l10tostr_mb2_or_mb4, >+ my_ll10tostr_mb2_or_mb4, >+ my_fill_mb2, >+ my_strntol_mb2_or_mb4, >+ my_strntoul_mb2_or_mb4, >+ my_strntoll_mb2_or_mb4, >+ my_strntoull_mb2_or_mb4, >+ my_strntod_mb2_or_mb4, >+ my_strtoll10_mb2, >+ my_strntoull10rnd_mb2_or_mb4, >+ my_scan_mb2 >+}; >+ >+ >+struct charset_info_st my_charset_utf16le_general_ci= >+{ >+ 56,0,0, /* number */ >+ MY_CS_COMPILED|MY_CS_PRIMARY|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, >+ "utf16le", /* cs name */ >+ "utf16le_general_ci",/* name */ >+ "UTF-16LE Unicode", /* comment */ >+ NULL, /* tailoring */ >+ NULL, /* ctype */ >+ NULL, /* to_lower */ >+ NULL, /* to_upper */ >+ NULL, /* sort_order */ >+ NULL, /* contractions */ >+ NULL, /* sort_order_big*/ >+ NULL, /* tab_to_uni */ >+ NULL, /* tab_from_uni */ >+ my_unicase_default, /* caseinfo */ >+ NULL, /* state_map */ >+ NULL, /* ident_map */ >+ 1, /* strxfrm_multiply */ >+ 1, /* caseup_multiply */ >+ 1, /* casedn_multiply */ >+ 2, /* mbminlen */ >+ 4, /* mbmaxlen */ >+ 0, /* min_sort_char */ >+ 0xFFFF, /* max_sort_char */ >+ ' ', /* pad char */ >+ 0, /* escape_with_backslash_is_dangerous */ >+ &my_charset_utf16le_handler, >+ &my_collation_utf16_general_ci_handler >+}; >+ >+ >+struct charset_info_st my_charset_utf16le_bin= >+{ >+ 62,0,0, /* number */ >+ MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, >+ "utf16le", /* cs name */ >+ "utf16le_bin", /* name */ >+ "UTF-16LE Unicode", /* comment */ >+ NULL, /* tailoring */ >+ NULL, /* ctype */ >+ NULL, /* to_lower */ >+ NULL, /* to_upper */ >+ NULL, /* sort_order */ >+ NULL, /* contractions */ >+ NULL, /* sort_order_big*/ >+ NULL, /* tab_to_uni */ >+ NULL, /* tab_from_uni */ >+ my_unicase_default, /* caseinfo */ >+ NULL, /* state_map */ >+ NULL, /* ident_map */ >+ 1, /* strxfrm_multiply */ >+ 1, /* caseup_multiply */ >+ 1, /* casedn_multiply */ >+ 2, /* mbminlen */ >+ 4, /* mbmaxlen */ >+ 0, /* min_sort_char */ >+ 0xFFFF, /* max_sort_char */ >+ ' ', /* pad char */ >+ 0, /* escape_with_backslash_is_dangerous */ >+ &my_charset_utf16le_handler, >+ &my_collation_utf16_bin_handler >+}; >+ >+ > #endif /* HAVE_CHARSET_utf16 */ > > >@@ -2589,7 +2805,7 @@ > struct charset_info_st my_charset_utf32_bin= > { > 61,0,0, /* number */ >- MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_UNICODE|MY_CS_NONASCII, >+ MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII, > "utf32", /* cs name */ > "utf32_bin", /* name */ > "UTF-32 Unicode", /* comment */ >@@ -2708,6 +2924,35 @@ > } > > >+static inline void >+my_tolower_ucs2(MY_UNICASE_INFO *const *uni_plane, my_wc_t *wc) >+{ >+ int page= *wc >> 8; >+ DBUG_ASSERT(page < 256); monty: make page uint both here and in other places. >+ if (uni_plane[page]) >+ *wc= uni_plane[page][*wc & 0xFF].tolower; >+} >+ >+ >+static inline void >+my_toupper_ucs2(MY_UNICASE_INFO *const *uni_plane, my_wc_t *wc) >+{ >+ int page= *wc >> 8; >+ DBUG_ASSERT(page < 256); >+ if (uni_plane[page]) >+ *wc= uni_plane[page][*wc & 0xFF].toupper; >+} >+ >+ >+static inline void >+my_tosort_ucs2(MY_UNICASE_INFO *const *uni_plane, my_wc_t *wc) >+{ >+ int page= *wc >> 8; >+ DBUG_ASSERT(page < 256); >+ if (uni_plane[page]) >+ *wc= uni_plane[page][*wc & 0xFF].sort; >+} >+ > static size_t my_caseup_ucs2(CHARSET_INFO *cs, char *src, size_t srclen, > char *dst __attribute__((unused)), > size_t dstlen __attribute__((unused))) >@@ -2721,8 +2966,7 @@ > while ((src < srcend) && > (res= my_ucs2_uni(cs, &wc, (uchar *)src, (uchar*) srcend)) > 0) > { >- int plane= (wc>>8) & 0xFF; >- wc= uni_plane[plane] ? uni_plane[plane][wc & 0xFF].toupper : wc; >+ my_toupper_ucs2(uni_plane, &wc); > if (res != my_uni_ucs2(cs, wc, (uchar*) src, (uchar*) srcend)) > break; > src+= res; >@@ -2744,8 +2988,7 @@ > > while ((s < e) && (res=my_ucs2_uni(cs,&wc, (uchar *)s, (uchar*)e)) >0) > { >- int plane = (wc>>8) & 0xFF; >- wc = uni_plane[plane] ? uni_plane[plane][wc & 0xFF].sort : wc; >+ my_tosort_ucs2(uni_plane, &wc); > n1[0]^= (((n1[0] & 63)+n2[0])*(wc & 0xFF))+ (n1[0] << 8); > n2[0]+=3; > n1[0]^= (((n1[0] & 63)+n2[0])*(wc >> 8))+ (n1[0] << 8); >@@ -2768,8 +3011,7 @@ > while ((src < srcend) && > (res= my_ucs2_uni(cs, &wc, (uchar*) src, (uchar*) srcend)) > 0) > { >- int plane= (wc>>8) & 0xFF; >- wc= uni_plane[plane] ? uni_plane[plane][wc & 0xFF].tolower : wc; >+ my_tolower_ucs2(uni_plane, &wc); > if (res != my_uni_ucs2(cs, wc, (uchar*) src, (uchar*) srcend)) > break; > src+= res; >@@ -2778,6 +3020,14 @@ > } > > >+static void >+my_fill_ucs2(CHARSET_INFO *cs __attribute__((unused)), >+ char *s, size_t l, int fill) monty: Is it time to make 'fill' an unsigned int? >+{ >+ DBUG_ASSERT(fill <= 0xFFFF); >+ for ( ; l >= 2; s[0]= (fill >> 8), s[1]= (fill & 0xFF), s+= 2, l-= 2); >+} Monty: You can make the above faster if you store fill >>8 and fill & 0xff in registers. >+ > static int my_strnncoll_ucs2(CHARSET_INFO *cs, > const uchar *s, size_t slen, > const uchar *t, size_t tlen, >@@ -2791,7 +3041,6 @@ > > while ( s < se && t < te ) > { >- int plane; > s_res=my_ucs2_uni(cs,&s_wc, s, se); > t_res=my_ucs2_uni(cs,&t_wc, t, te); > >@@ -2801,10 +3050,9 @@ > return ((int)s[0]-(int)t[0]); > } > >- plane=(s_wc>>8) & 0xFF; >- s_wc = uni_plane[plane] ? uni_plane[plane][s_wc & 0xFF].sort : s_wc; >- plane=(t_wc>>8) & 0xFF; >- t_wc = uni_plane[plane] ? uni_plane[plane][t_wc & 0xFF].sort : t_wc; >+ my_tosort_ucs2(uni_plane, &s_wc); >+ my_tosort_ucs2(uni_plane, &t_wc); >+ > if ( s_wc != t_wc ) > { > return s_wc > t_wc ? 1 : -1; >@@ -3115,7 +3363,7 @@ > my_snprintf_mb2, > my_l10tostr_mb2_or_mb4, > my_ll10tostr_mb2_or_mb4, >- my_fill_mb2, >+ my_fill_ucs2, > my_strntol_mb2_or_mb4, > my_strntoul_mb2_or_mb4, > my_strntoll_mb2_or_mb4, > Regards, Monty

2 1

Re: [Maria-developers] Aria vs MyISAM key_buffer_size
by Michael Widenius 19 Mar '13

19 Mar '13

Hi! I am cc:ing Maria-developers list, as this is a typical question that can be asked and answered here. >>>>> "Ian" == Ian Gilfillan <ian(a)greenman.co.za> writes: Ian> Hi Monty Ian> I have a question on key-buffer-size that wasn't answered definitively Ian> by others on IRC. Ian> As I understand it, by default, Aria doesn't use the key_buffer_size Ian> setting at all, it makes use of aria-pagecache-buffer-size. Yes, both are basicly doing the same thing, but for different storage engines. The main difference is that for Aria we can also store rows in it if you user ROW_FORMAT=PAGE Ian> However, if Ian> Aria tables are created with ROW_FORMAT=FIXED or ROW_FORMAT=DYNAMIC to Ian> emulate MyISAM, are they then emulating MyISAM's use of key-buffer-size Ian> as well, and not making use of Aria cache settings? It's not really emulation, but more that Aria has, for these cases, identical code for handling row data.. For the above ROW_FORMAT's we store *ONLY* the key pages in the aria page cache. The rows are not cashed (like we do with MyISAM). Regards, Monty

1 0

[Maria-developers] impact of segmented table_open_cache on sysbench results
by Axel Schwenke 16 Mar '13

16 Mar '13

Hi, I have been running a sysbench on recent 5.5, 5.6 and 10.0 releases with tuning a'la Dimitri K. There is one feature that is only in MySQL-5.6.10: table_open_cache_instances = 16 and I wondered how it would affect the sysbench result. It makes a *huge* difference. For the curious I also add the result from a previous run that shows the impact of tcmalloc vs. glibc malloc. Disclaimer: hardware is 64 cores (32 w/o HT) XL

2 3

[Maria-developers] mariadb++
by Sylvain Rochette 14 Mar '13

14 Mar '13

I just want to inform that the last few weeks I worked on a new open source project called mariadb++. It's use mariadb-native-client lib, it an alternative over MySQL++/MySQL connector. It's available here: https://launchpad.net/mariadb++ Regards, Sylvain Rochette

2 1

Re: [Maria-developers] [Commits] Rev 3697: MDEV-4272 fix. in file:///home/bell/maria/bzr/work-maria-5.5-MDEV-4272/
by Sergei Golubchik 14 Mar '13

14 Mar '13

Hi, Sanja! The idea of the fix is correct. See a couple of comments below. On Mar 14, sanja(a)askmonty.org wrote: > message: > MDEV-4272 fix. > > Incorrect NULL value handling in Item_func_conv_charset fixed. > === modified file 'sql/item_strfunc.cc' > --- a/sql/item_strfunc.cc 2013-01-28 12:36:05 +0000 > +++ b/sql/item_strfunc.cc 2013-03-14 13:22:32 +0000 > @@ -2987,7 +2987,7 @@ String *Item_func_conv_charset::val_str( > return null_value ? 0 : &str_value; > String *arg= args[0]->val_str(str); > uint dummy_errors; > - if (!arg) > + if (!arg || args[0]->null_value) it's redundant. One of these conditions is enough, no need to check both. > { > null_value=1; > return 0; > > === modified file 'sql/item_strfunc.h' > --- a/sql/item_strfunc.h 2013-01-15 18:07:46 +0000 > +++ b/sql/item_strfunc.h 2013-03-14 13:22:32 +0000 > @@ -859,25 +859,45 @@ public: > { > if (args[0]->result_type() == STRING_RESULT) > return Item_str_func::val_int(); > - return args[0]->val_int(); > + { > + longlong res= args[0]->val_int(); > + if ((null_value= args[0]->null_value)) > + return 0; > + return res; > + } Why did you add an extra pair of curly brackets? it's also redundant. Regards, Sergei

1 0

[Maria-developers] accelerating CREATE TABLE
by Toshikuni Fukaya 13 Mar '13

13 Mar '13

Hi, I made a patch to accelerate CREATE TABLE on the innodb plugin. To zero table spaces, I used fallocate instead of normal writes and sync. I compared MariaDB 5.5 trunk and the patched one by our own application, which creates > 1000 tables in series, with ext4 filesystem on Ubuntu 12.04. Results are shown below. Original MariaDB 5.5 trunk: 64.9 seconds (5 times avg.) Patched MariaDB 5.5 trunk: 36.0 seconds (5 times avg.) Any comments or suggestions? Thanks, Toshikuni Fukaya

3 8

[Maria-developers] MariaDB 5.5.30 Release Prep
by Daniel Bartholomew 12 Mar '13

12 Mar '13

All, I've prepped changelog and release notes pages for MariaDB 5.5.30. https://kb.askmonty.org/en/mariadb-5530-release-notes/ https://kb.askmonty.org/en/mariadb-5530-changelog/ If there is anything I should be sure to mention in the release notes, please let me know ASAP. Unless something comes up, I plan on activating and announcing the release tomorrow (12 Mar 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 Monty Program - http://montyprogram.com

1 0

[Maria-developers] issue with Index Condition Pushdown in MariaDB 5.5.28a
by Zardosht Kasheff 11 Mar '13

11 Mar '13

Hello, I have found an interesting issue with index condition pushdown. I do not know if it is a bug, or if I am misusing the feature. I have found that in one scenario, when performing a join, an index condition is pushed down, but because handler->end_range is not set, handler_index_cond_check never returns ICP_OUT_OF_RANGE, even though we are out of range. Here is the relevant stack trace, I cannot yet send the entire trace as it may include customer information, and I need to double check it is ok to send: #15 0x00002aaac4f33593 in ha_tokudb::index_next_same (this=0x2fb33d8, buf=0x2fb53b8 "\302\177\254\353/\036", key=0x31b36d0 "Y\001", keylen=395) ---Type <return> to continue, or q <return> to quit--- at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/storage/tokudb/ha_tokudb.cc:4768 #16 0x00000000005e782c in handler::ha_index_next_same (this=0x2fb33d8, buf=0x2fb53b8 "\302\177\254\353/\036", key=0x31b36d0 "Y\001", keylen=395) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_class.h:4246 #17 0x000000000065d103 in join_read_next_same (info=0x31b2f68) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:16929 #18 0x000000000065b54a in sub_select (join=0x319f588, join_tab=0x31b2eb8, end_of_records=false) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:16142 #19 0x000000000065bb5f in evaluate_join_record (join=0x319f588, join_tab=0x31b2b98, error=0) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:16342 #20 0x000000000065b628 in sub_select (join=0x319f588, join_tab=0x31b2b98, end_of_records=false) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:16162 #21 0x000000000065bb5f in evaluate_join_record (join=0x319f588, join_tab=0x31b2878, error=0) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:16342 #22 0x000000000065b498 in sub_select (join=0x319f588, join_tab=0x31b2878, end_of_records=false) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:16123 #23 0x000000000065bb5f in evaluate_join_record (join=0x319f588, join_tab=0x31b2558, error=0) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:16342 #24 0x000000000065b628 in sub_select (join=0x319f588, join_tab=0x31b2558, end_of_records=false) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:16162 #25 0x000000000065ad52 in do_select (join=0x319f588, fields=0x0, table=0x31bf368, procedure=0x0) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:15793 #26 0x0000000000639c5d in JOIN::exec (this=0x319f588) at /home/zardosht/maria/mysql-build/mariadb-5.5.28a/sql/sql_select.cc:2396 In this stack, we are performing an index_next_same, and a condition has been pushed down. When we call handler_index_cond_check. we always get ICP_NO_MATCH and never get ICP_OUT_OF_RANGE, even though we go past the key that we should be retrieving. Is this by design? Is this a bug? Thanks -Zardosht

2 2

[Maria-developers] Spam in KB?
by Sergei Petrunia 07 Mar '13

07 Mar '13

Hi Daniel, I am looking at https://kb.askmonty.org/en/mariadb-5529-release-notes/ and I see at the top in the breadcrumbs: [Home] [ Why Shared Web Hosting Service Is Ideal For Small Businesses] [Development] and when I click on the shared hosting I get to: https://kb.askmonty.org/en/why-shared-web-hosting-service-is-ideal-for-smal… In my understanding this text has nothing to do with MariaDB? Is it link spam? BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] Rev 3633: MDEV-4241 fix
by Sergei Golubchik 06 Mar '13

06 Mar '13

Hi, Sanja! On Mar 06, sanja(a)askmonty.org wrote: > revno: 3633 > revision-id: sanja(a)askmonty.org-20130306191058-d293nik3l66vn4tp > parent: psergey(a)askmonty.org-20130301042335-x16j7uo1dwxxgqs9 > committer: sanja(a)askmonty.org > branch nick: work-maria-5.3-MDEV-4241 > timestamp: Wed 2013-03-06 21:10:58 +0200 > message: > MDEV-4241 fix. > > Field_enum incorrectly inherited decimals() from Field_string. > Field_enum should be always integer in numeric context. Ok to push! Regards, Sergei

1 0

[Maria-developers] WL#253 New (by Igor): Take into account the selectivity of single-table range predicates on non-indexed columns
by worklog-noreply＠askmonty.org 06 Mar '13

06 Mar '13

----------------------------------------------------------------------- WORKLOG TASK -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- TASK...........: Take into account the selectivity of single-table range predicates on non-indexed columns CREATION DATE..: Wed, 06 Mar 2013, 17:25 SUPERVISOR.....: IMPLEMENTOR....: Igor COPIES TO......: Psergey CATEGORY.......: Server-BackLog TASK ID........: 253 (http://askmonty.org/worklog/?tid=253) VERSION........: Server-9.x STATUS.........: Assigned PRIORITY.......: 60 WORKED HOURS...: 0 ESTIMATE.......: 0 (hours remain) ORIG. ESTIMATE.: 0 PROGRESS NOTES: DESCRIPTION: Description of the problem ========================== Currently the optimizer completely ignores any conditions on non-indexed columns when searching for the best execution plan. As a result in many cases it chooses a suboptimal plan. Let's consider the query: SELECT * FROM t1,t2 WHERE t1.a=t2.a and t2.b BETWEEN (1,3) assuming that: -table t1 contains 100 records -table t2 contains 1000 records -there is a primary index on t1(a) -there is a secondary index on t2(a) -there is no index defined on column t2.b -the selectivity of the condition t2.b BETWEEN (1,3) is high (~ 1%) Under these conditions currently the optimizer will choose the plan that accesses t1 using a table scan accesses t2 using index t2(a) checks the condition t2.b BETWEEN (1,3) This plan examines all rows of both tables and it performs 100 index look-ups. The alternative plan that: accesses table t2 in a table scan checks the condition t2.b BETWEEN (1,3) accesses t1 using index t1(a) also would examine all rows of t2, but it performs only ~10 look-ups to access ~10 rows of table t1. The second plan is expected to be more efficient and it is so. The plan to resolve the problem =============================== 1. Build single-table range conditions over different columns of all tables of the join query. 2. Calculate the selectivity of each such condition using persistent statistics on table columns. 3. Take this statistics into account when calculated the cardinality of each partial join that are evaluated by the optimizer. ESTIMATED WORK TIME ESTIMATED COMPLETION DATE ----------------------------------------------------------------------- WorkLog (v4.0.0)

1 0

[Maria-developers] deadlock, rotate and prepared xids
by MARK CALLAGHAN 05 Mar '13

05 Mar '13

Kristian, Did you do anything special to avoid deadlock with ::new_file_impl and prepared XIDs? My memory is vague but I thought you handled it. I added code to the FB patch group commit implementation to handle it. Both Yoshi and I hit deadlocks with that code in official MySQL 5.6: http://bugs.mysql.com/bug.php?id=68569 http://bugs.mysql.com/bug.php?id=68251 -- Mark Callaghan mdcallag(a)gmail.com

2 3

[Maria-developers] C API for dynamic columns - in which versions?
by Honza Horak 01 Mar '13

01 Mar '13

Hi guys, I failed to find the info in which versions of MariaDB "C API for dynamic columns" is available as described here: https://kb.askmonty.org/en/dynamic-columns-api/ I think the information should be the best included directly on the page itself. Regards, Honza

2 2

[Maria-developers] How to copy IO_CACHE into a string?
by Lixun Peng 28 Feb '13

28 Feb '13

Hi Guys, I want to copy the contents of the IO_CACHE into a string. But I'm not found a function can do it, but I found "my_b_copy_to_file" can do the similar thing, so I implement a function "my_b_copy_to_string" by imitating "my_b_copy_to_file", to do this thing. Could you please review my code? char *my_b_copy_to_string(IO_CACHE *cache, size_t *bytes_in_cache) { char *buff; char *tmp_buff; size_t now_size; size_t inc_size; /* Reinit the cache to read from the beginning of the cache */ if (reinit_io_cache(cache, READ_CACHE, 0L, FALSE, FALSE)) return NULL; now_size= my_b_bytes_in_cache(cache); inc_size= 0; buff= (char *) my_malloc(now_size + 1, MYF(0)); tmp_buff= buff; do { now_size+= inc_size; if(inc_size > 0) { buff= (char *) my_realloc(buff, now_size + 1, MYF(0)); tmp_buff= buff + (now_size - inc_size); memcpy(tmp_buff, cache->read_pos, inc_size); } else { memcpy(tmp_buff, cache->read_pos, now_size); } cache->read_pos= cache->read_end; } while ((inc_size= my_b_fill(cache))); buff[now_size]= '\0'; reinit_io_cache(cache, WRITE_CACHE, 0, FALSE, TRUE); *bytes_in_cache= now_size; return buff; } 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 2

Re: [Maria-developers] GTID: clueless user experience, day 1
by Kristian Nielsen 27 Feb '13

27 Feb '13

[Cc: maria-developers@, in case others are interested or have comments] Elena Stepanova <elenst(a)montyprogram.com> writes: >> So if you agree, I will put on my ToDo to remove that omitted domain_id >> defaults to 0. > > It's fine with me. Pushed to lp:~maria-captains/maria/10.0-mdev26/ >> Clearly I need to give a better error message, this is highly >> confusing. Thanks for bringing this to attention! What do you think of: >> >> ERROR XXXX: Duplicate domain_id 0 for GTID 0-2-1 I made it like this: MariaDB [test]> change master to master_gtid_pos="0-1-2,1-1000-1000,2-3-1,0-2-100,4-4-4"; ERROR 1941 (HY000): GTID 0-2-100 and 0-1-2 conflict (duplicate domain id 0) > Sounds good. Only, if I understand correctly, it's nowadays not > domain_id, but gtid_domain_id ? Then it's better be named as such in > the error message (/me tried in vain to set domain_id, first on the > server command line, and then in a session). Well, these are different but related concepts. @@gtid_domain_id is a system variable. A "domain id" is a conceptual thing when taking about global transaction ID. It is like the InnoDB buffer pool. The system variable is "innodb_buffer_pool_size". The concept is "buffer pool size". But I agree the concept should be "domain ID", not domain_id (with an underscore). The reason I spell this out is not to nitpick, but rather that I would welcome suggestions for naming, I am terrible with naming. Do you think I should rename @@gtid_domain_id and @@gtid_seq_no to just @@domain_id and @@seq_no? I thought that was perhaps a bit too generic names, though I did keep plain @@server_id for backwards compatibility. Another option is @@binlog_domain_id and @@binlog_seq_no, this is perhaps better than the random "gtid" prefix? The variables are for controlling what goes into the binlog, after all. > But on the other hand, why should it be several rows? If > binlog_gtid_pos() returns a *single* comma-separated list of GTIDs for > the given position, as it does now, we can just as well add this list > to SHOW MASTER STATUS as a *column*, no? Sorry, it was me who was confused. I meant adding extra columns, not rows. I am still not sure if it is safe to add extra columns. It would seem useful, unless it breaks too many existing applications. >> Start after. GTID is the last event executed. > Hm... I must admit I don't quite understand the reasoning. I'll ask Let me give an example. Suppose server 1 is master. It binlogs an event with GTID 0-1-10. This event is currently the last in the binlog. Server 2 is a slave of server 1. When it catches up, GTID 0-1-10 is the last event applied on the slave. So now, what should be the replication state of slave server 2? If we want to use "start from" we could try GTID 0-1-11? But then suppose we now switch master to a new server 3. Then the event following 0-1-10 is 0-2-11, not 0-1-11. So if server 2 would try to connect as a slave to server 3 and start from 0-1-11, it will not work, this event does not exist anywhere. That is why it has to be "start after", as when we save the state on the slave, we know only the GTID of the last event applied, not the one to apply next. > There might be more in there for me to look into.. Indeed. This is a critical part of the design, I spent a _lot_ of thought to get this working, and I think I got it right, but I will feel a lot better knowing you spent your best efforts to break it :-). But please wait with this for a later stage, I have some planned development around this that is not ready yet. >> Gtid_Pos_Auto=1 means the new method, whether AUTO or explicit 'xxx' gtid, >> So what should we call it? How about just "Using_Gtid" ? > > Yep, Using_Gtid sounds fine. This is fixed in the tree now. > This brings a more conceptual question for me... Does Using_Gtid > indicate how the slave *replicates*, or just how it determines the > starting position while connecting to master? In other words, is there There is a difference. There are two ways a slave can connect. The old way using binlog file and position. And the new way using GTID. I think we need to have both. The Using_Gtid records which of the two is used. I made it this way so that users do not need to set some specific option in my.cnf, and so that with multi-source, one slave connection can use the old style (eg. master not supporting GTID?), while another can use new style. The main difference is finding the starting position. But this also implies difference for how the slave replicates. Because with GTID there can be *multiple* starting positions (one for each domain id). So after connecting, some events can be skipped during replication if one domain_id is ahead of another in the master binlog. > If not (and I couldn't yet figure the difference, since, as you said, > the slave reads the GTID state anyway when it connects with file > name/offset), then I start having doubts that we need the Using_Gtid > flag at all. I mean, if it only indicates what I provided last time in > CHANGE MASTER, how is this information useful? It is used when the slave connects (which happens at every START SLAVE, and every server restart, including mysqld_safe autostart). If Using_Gtid is false, then slave connects at the last file/offset found in relay-log.info. It also obtains the corresponding GTID position from the master, so that it is ready in case the user wants to switch to CHANGE MASTER TO ... MASTER_GTID_POS=AUTO. If Using_Gtid is true, slave connects at the GTID position read from the mysql.rpl_slave_state table, which is crash safe. And multiple start positions are used if there is more than one domain id in the GTID position. So you see, the information is needed, otherwise the slave and the master would not know how to handle slave connect. >> But frankly, I am not sure if the right place is in SHOW ALL SLAVES STATUS or >> in plain SHOW SLAVE STATUS. Can you help me understand what the difference is >> between putting the column in one or the other of these? > > I guess the only real reason was that Monty didn't want to change the > output format of existing SHOW SLAVE STATUS, not to break anything. Yes, this is an important issue. I will discuss it with Monty when I visit him next week. > Ideally, I'd expect the global values be shown both in SHOW SLAVE > STATUS, e.g. at the end of it, and once for all slaves in SHOW ALL > SLAVES STATUS, again at the end. But I don't know if it's doable, and > if it is, we need to think what it might break. Yes. The code actually seems to have been written for something like SHOW FULL SLAVE STATUS, which would include the extra data. I will need to ask Monty to know more. > Then I assumed you decided not to print current GTIDs in SHOW SLAVE > STATUS on purpose, to avoid the mess like MySQL has -- which was also > surprising since we wouldn't have that insanity anyway. > I didn't ask how I could obtain them on slave, as I figured it was > supposed to be done via mysql.rpl_slave_state. But it didn't occur to > me that it was printed in SHOW ALL SLAVES STATUS... Yes. In any case, the user interface is very much not finalised yet. Sorry for the rough experience, but hopefully we can use your experience to come up with a good interface for the final release. >> Maybe the problem is that if I add a column in SHOW SLAVE STATUS, and MySQL >> adds another column in the same position, then scripts will break because the >> column count for one or the other will change? > > eh.. MySQL's show slave status currently has like +13 columns > comparing to ours, I really don't think that scripts relying on such > level of detail stand any chance to survive. My main worry is not if one has more than the other. The worry is if some column is in position 25 (say) in MySQL but 28 (say) in MariaDB. Is there even any easy way to pick out a column by name, rather than numerical position? > Good thing you mentioned it, I actually totally forgot to tell the > tale of my *very* first experience. Well, I started when I mentioned > Then I followed the instruction again, and... it didn't work. It > didn't crash, replication didn't fail, but when I switched master and > slave, the new slave (old master) just wouldn't replicate the last > line, (6,3). > > I couldn't understand it until I compared the flow and configuration > with the MTR test that you have (it does basically the same, and it > works), and only then I figured that I have to have > log-slave-updates=on. It wasn't clear to me why, I mean, I had the > transaction in quesiton in the binlog, and GTID was there too, > so?.. That's when I switched from AUTO to explicit values and started > experimenting with them. Well, in my example, first server 1 is the master, then I switch around so that server 2 is the master. For a slave to also be able to serve as master, it needs --log-slave-updates=1, right? On the other hand, the design specifically allows for --log-slave-updates=0. I did fix one or two possibly related bugs lately, so please try again and if you can reproduce the problem I will look into it. (I was a bit confused how you could have the transaction in question in the binlog on the server that was changed from slave to master, if it did not have --log-slave-updates=1 ...) > > But nothing happens... No errors in the slave, but it isn't moving, either: > This looks like a bug, your commands look correct. I could reproduce, I will > investigate and fix ASAP and let you know. This should be fixed now and pushed to the tree. > > Getting the wrong mutex usage warnings. I saw a discussion on IRC the other day, but don't know the current status -- whether it's supposed to be fixed, or not fixed yet, or is considered innocent... This also should be fixed in the tree now. - Kristian. (who now has to run from the computer and hopes the above makes sense...)

1 0

Re: [Maria-developers] Fwd: some question on bundled libedit in mysql
by Sergei Golubchik 25 Feb '13

25 Feb '13

Hi, AL13N! On Feb 25, AL13N wrote: > > > > In MariaDB we prefer to link with readline. We never link with bundled > > libedit at all. Either with system readline, if it's usable, or with > > system libedit, or with bundled readline. > > iinm, MariaDB is GPLv2 and libreadline (version 6) is GPLv3, so they don't > mix. but bundled libreadline (version 5) is GPLv2 and that one is > possible. That's why I said "with system readline, if it's usable". We only link with system readline if it's V5 or earlier. Regards, Sergei

1 0

[Maria-developers] Fwd: some question on bundled libedit in mysql
by xiaobing jiang 25 Feb '13

25 Feb '13

hi all: No reply from jonathan.perkin, so post to the maillist. can some one explain to me? Thanks! ---------- Forwarded message ---------- From: xiaobing jiang <s7v7nislands(a)gmail.com> Date: Fri, Feb 22, 2013 at 3:52 PM Subject: some question on bundled libedit in mysql To: jonathan.perkin(a)oracle.com hi jonathan: after read the README in source, I have some question about libedit. in recently, we find a bug. when using bundled libedit, we can't input the chinese using GBK. after debug, I find this code may be cause the bug. protected int terminal__putc(EditLine *el, Int c) { char buf[MB_LEN_MAX +1]; ssize_t i; mbstate_t state; memset(&state, 0, sizeof(mbstate_t)); if (c == (Int)MB_FILL_CHAR) return 0; i = ct_encode_char(buf, (size_t)MB_CUR_MAX, c, &state); // this should be: ct_encode_char(buf, (size_t)MB_LEN_MAX, c, &state); if (i <= 0) return (int)i; buf[i] = '\0'; return fputs(buf, el->el_outfile); } after change the code, I can fix the bug. and I find upstream also using MB_LEN_MAX. http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/terminal.c protected int terminal__putc(EditLine *el, Int c) { char buf[MB_LEN_MAX +1]; ssize_t i; if (c == (Int)MB_FILL_CHAR) return 0; i = ct_encode_char(buf, (size_t)MB_LEN_MAX, c); if (i <= 0) return (int)i; buf[i] = '\0'; return fputs(buf, el->el_outfile); } so the merge from upstream may be wrong. And this bug may be the same http://bugs.mysql.com/bug.php?id=23097 and why mysql5.6 remove the bundled readline? I think readline is used more than libedit. and when using system readline, why perfer libedit to readline ? look at cmake/readline.cmake. FIND_SYSTEM_LIBEDIT(edit) -> FIND_SYSTEM_LIBEDIT(readline) thanks! xiaobing jiang

2 1

[Maria-developers] understanding commit and prepare APIs in MariaDB 5.5
by Zardosht Kasheff 21 Feb '13

21 Feb '13

Hello all, I am investigating what our storage engine, TokuDB, needs to do to achieve its best performance in MariaDB 5.5 with respect to preparing and committing transactions, and with respect to binary logging. As I understand, group commit has been added to the binary log in Maria 5.3, and is also in MariaDB 5.5. Additionally, new APIs prepare_ordered and commit_ordered are added. I am trying to understand how these fit together. >From reading http://kristiannielsen.livejournal.com/12408.html and comments in handler.h, here is what I THINK I know: - In MariaDB 5.5, we must fsync our recovery log on handlerton->prepare and handlerton->commit - If we want to ensure that the order we commit transactions is the same order that they appear committed in the binary log, then we should perform our commit in two phases, commit_ordered and commit, where commit_ordered is serialized under a global mutex that ensures the correct order - InnoDB must do this for hot backup to work Here is my big question: given TokuDB is not designed to work with InnoDB's hot backup solution, is there ANY reason why we should care about the commit order of our transactions? Are there any performance reasons related to group commit? >From everything I read, I think the answer is no, but I would appreciate confirmation. I think there are no performance gains to be made by implementing commit_ordered, and given we fsync on commit, there should be no issues with syncing our engine up with the binary log after a crash. Also, I assume the fsync after commit is necessary. Only in 10.0 will some new functionality be available that allows us to not fsync on commit. Is my understanding correct? Thanks -Zardosht

2 7

Re: [Maria-developers] Rev 3663: MDEV-3819 missing constraints for spatial column types
by Sergei Golubchik 20 Feb '13

20 Feb '13

Hi, Holyfoot! On Feb 20, holyfoot(a)askmonty.org wrote: > revno: 3663 > revision-id: holyfoot(a)askmonty.org-20130220195237-99gp9p29xemltqcm > parent: vvaintroub@pcbsd-20130219224652-t84v8wepdqvhxfwb > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev-3819 > timestamp: Wed 2013-02-20 23:52:37 +0400 > message: > MDEV-3819 missing constraints for spatial column types. > Checks added to return and error when inappropriate > geometry type is stored in a field. > === modified file 'mysql-test/r/gis.result' > --- a/mysql-test/r/gis.result 2012-09-05 21:14:33 +0000 > +++ b/mysql-test/r/gis.result 2013-02-20 19:52:37 +0000 > @@ -1491,4 +1491,11 @@ SELECT 1 FROM g1 WHERE a >= ANY > (SELECT 1 FROM g1 WHERE a = geomfromtext('') OR a) ; > 1 > DROP TABLE g1; > +# > +# MDEV-3819 missing constraints for spatial column types > +# > +create table t1 (pt point); > +insert into t1 values(Geomfromtext('POLYGON((1 1, 2 2, 2 1, 1 1))')); > +ERROR HY000: Incorrect POLYGON value: 'POINT' I'm sorry, but you got it backwards :) The value above is POLYGON. The type is POINT. The error message should be ERROR HY000: Incorrect POINT value: 'POLYGON' Regards, Sergei

2 1

Re: [Maria-developers] Rev 3663: MDEV-3819 missing constraints for spatial column types
by Sergei Golubchik 20 Feb '13

20 Feb '13

Hi, Holyfoot! On Feb 20, holyfoot(a)askmonty.org wrote: > revno: 3663 > revision-id: holyfoot(a)askmonty.org-20130220172419-j5sad8p7t3191kii > parent: vvaintroub@pcbsd-20130219224652-t84v8wepdqvhxfwb > committer: Alexey Botchkov <holyfoot(a)askmonty.org> > branch nick: mdev-3819 > timestamp: Wed 2013-02-20 21:24:19 +0400 > message: > MDEV-3819 missing constraints for spatial column types. > Checks added to return and error when inappropriate > geometry type is stored in a field. > > === modified file 'sql/field.cc' > --- a/sql/field.cc 2013-01-28 12:36:05 +0000 > +++ b/sql/field.cc 2013-02-20 17:24:19 +0000 > @@ -7580,6 +7580,12 @@ int Field_geom::store(const char *from, > if (wkb_type < (uint32) Geometry::wkb_point || > wkb_type > (uint32) Geometry::wkb_last) > goto err; > + > + if (geom_type != Field::GEOM_GEOMETRY && > + geom_type != Field::GEOM_GEOMETRYCOLLECTION && > + (uint32) geom_type != wkb_type) > + goto err_wrong_type; why goto err_wrong_type? there's no common cleanup or any common code at all at the end, you can put it right here in the if(). > + > Field_blob::store_length(length); > if (table->copy_blobs || length <= MAX_FIELD_WIDTH) > { // Must make a copy > @@ -7595,6 +7601,12 @@ int Field_geom::store(const char *from, > my_message(ER_CANT_CREATE_GEOMETRY_OBJECT, > ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0)); > return -1; > + > +err_wrong_type: > + bzero(ptr, Field_blob::pack_length()); > + my_message(ER_WRONG_GEOMETRY_TYPE, > + ER(ER_WRONG_GEOMETRY_TYPE), MYF(0)); > + return -1; > } > > #endif /*HAVE_SPATIAL*/ > > === modified file 'sql/share/errmsg-utf8.txt' > --- a/sql/share/errmsg-utf8.txt 2013-02-08 21:24:06 +0000 > +++ b/sql/share/errmsg-utf8.txt 2013-02-20 17:24:19 +0000 > @@ -6588,3 +6588,5 @@ ER_QUERY_EXCEEDED_ROWS_EXAMINED_LIMIT > ER_NO_SUCH_TABLE_IN_ENGINE 42S02 > eng "Table '%-.192s.%-.192s' doesn't exist in engine" > swe "Det finns ingen tabell som heter '%-.192s.%-.192s' i handlern" > +ER_WRONG_GEOMETRY_TYPE > + eng "Unsuitable geometry type for the field" Ouch, is that really needed? Can you use ER_WRONG_VALUE instead? Like Incorrect POINT value: 'POLYGON((1 1, 2 2, 2 1, 1 1))' Regards, Sergei

1 0

[Maria-developers] Determining to which project a patch should be sent.
by Christian Convey 20 Feb '13

20 Feb '13

Hi guys, As I work through the Coverity Scan results of MariaDB's trunk, I find myself having to research what some functions do, and the meanings of their parameters and return values. Rather than just recording what I learn on a piece of paper, I thought it might be nice to write Doxygen comments for some of those functions / structs / etc. That way, perhaps other persons trying to learn the code base could benefit. Here's the problem. Based on Monty's blog posting about MariaDB 10 vs. MySQL 5.6 ( http://blog.mariadb.org/mariadb-10-0-and-mysql-5-6/ ), it's not obvious to me which files / functions / etc. in MariaDB have been forked from MariaDB, vs. which ones will be replaced with the corresponding MySQL code when the next MySQL release comes out. This means that when I write Doxygen comments for a given file / function /struct / etc., I don't know whether to submit that comment patch to the MariaDB project or to the MySQL project. Does anyone know I I can figure that out? Thanks, Christian

3 5

[Maria-developers] binlog event of COMMIT statement
by nanyi607rao 20 Feb '13

20 Feb '13

I am little confused about binlog event of COMMIT statement, In most of time, a COMMIT statement corresponds a XID_event in the binlog, but sometimes is a Query_event. how that happened ? or can I do any operations to make a COMMIT statement correspond a Query_event certainly in the binlog. Thankes, Longhui 2013-02-20 nanyi607rao

2 1

[Maria-developers] my_hash_sort_bin
by MARK CALLAGHAN 20 Feb '13

20 Feb '13

Hello MariaDB, While working with Dmitry Lenev to understand why MySQL 5.6 was slower than 5.1 on one benchmark ( https://www.facebook.com/notes/mysql-at-facebook/my-mysql-is-faster-than-yo…) we realized that the hash function used in my_hash_sort_bin is lousy for this input: test.sbest1, test.sbtest2, ..., test.sbtest10. The problem is made worse when a small number of hash buckets is used because the hash function output doesn't do the right thing for the least significant bits so that all 10 inputs map to the same hash bucket. More details are at http://bugs.mysql.com/bug.php?id=66473 The InnoDB hash function is much better. Details for that and a test program are in the bug report. Does anyone remember why this hash function was chosen? strings/ctype-bin.c doesn't have any comments explaining why this hash function was selected. This is another peeve for me. Critical code like this should be explained if we expect anyone new to begin working on this code. I haven't done a formal test of the hash function, and http://burtleburtle.net/bob/hash/hashfaq.html would be a good reference for that. But I think it is very likely that my assertion that this hash function is lousy holds in general, rather than is limited to this input. And given the large number of machines that run MySQL, MariaDB and Percona Server (and the FB patch) around the world I suspect that we should figure this out. -- Mark Callaghan mdcallag(a)gmail.com

2 1

[Maria-developers] implementing multi range read at the storage engine in MariaDB 5.5
by Zardosht Kasheff 19 Feb '13

19 Feb '13

Hello all, Is there anything to implementing multi range read for storage engines? Or is there a default implementation that is likely good enough. Also, is there anything one can read to understand how the feature works and its benefits? Thanks -Zardosht

3 3

[Maria-developers] Using C++ features in MariaDB
by Christian Convey 19 Feb '13

19 Feb '13

I just read in Pachev's "MySQL Internals" book that C++ STL and exceptions aren't allowed in the MySQL code. Are those restrictions also in effect for MariaDB? If so, can anyone explain the reason for them? Thanks, Christian

2 8

Re: [Maria-developers] [Commits] Rev 3497: MDEV-537 Make multi-column non-top level subqueries to be executed via index (index/unique subquery) in file:///home/tsk/mprog/src/10.0-md537-merge/
by Sergei Petrunia 18 Feb '13

18 Feb '13

Hi Timour, With the below patch, conditions are unnecessarily wraped into two Item_func_trigcond objects. See EXPLAIN EXTENDED ouput in .result files below - one object is wrapping the other. Debugging shows that they are triggered by the same flag get_cond_guard(i). Two wrappings are just a few code lines away, so it should be totally feasible to get rid of double wrapping. On Thu, Feb 07, 2013 at 01:33:35PM +0000, timour(a)askmonty.org wrote: > At file:///home/tsk/mprog/src/10.0-md537-merge/ > > ------------------------------------------------------------ > revno: 3497 > revision-id: timour(a)askmonty.org-20130207133324-qrcjga4z9heaezb9 > parent: sergii(a)pisem.net-20130205094326-4yeuozh5iemlqley > fixes bug(s): https://mariadb.atlassian.net/browse/MDEV-537 > committer: timour(a)askmonty.org > branch nick: 10.0-md537-merge > timestamp: Thu 2013-02-07 15:33:24 +0200 > message: > MDEV-537 Make multi-column non-top level subqueries to be executed via index (index/unique subquery) > instead of single_select_engine > > This task changes the IN-EXISTS rewrite for multi-column subqueries > "(a, b) IN (select b, c ...)" to work in the same way as for > single-column subqueries "a IN (select b ...) with respect to the > injection of NULL-rejecting predicates. > > More specifically, the method > Item_in_subselect::create_row_in_to_exists_cond() > adds Item_is_not_null_test and Item_func_trig_cond only if the left > IN operand can be NULL. Not having these predicates when not necessary, > makes it possible to rewrite the subquery into a "unique_subquery" or > "index_subquery" when there is a suitable index on the only > subquery table. > === modified file 'mysql-test/r/derived_view.result' > --- a/mysql-test/r/derived_view.result 2013-01-15 18:07:46 +0000 > +++ b/mysql-test/r/derived_view.result 2013-02-07 13:33:24 +0000 > @@ -1468,14 +1468,14 @@ WHERE (t2.a ,t1.b) NOT IN (SELECT DISTIN > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > 1 PRIMARY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > -2 DEPENDENT SUBQUERY t eq_ref PRIMARY,c PRIMARY 4 func 1 Using where > +2 DEPENDENT SUBQUERY t unique_subquery PRIMARY,c PRIMARY 4 func 1 Using where > EXPLAIN > SELECT * FROM t1 , t2 > WHERE (t2.a ,t1.b) NOT IN (SELECT DISTINCT c,a FROM (SELECT * FROM t3) t); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 2 > 1 PRIMARY t2 ALL NULL NULL NULL NULL 2 Using where; Using join buffer (flat, BNL join) > -2 DEPENDENT SUBQUERY t3 eq_ref PRIMARY,c PRIMARY 4 func 1 Using where > +2 DEPENDENT SUBQUERY t3 unique_subquery PRIMARY,c PRIMARY 4 func 1 Using where > SELECT * FROM t1 , t2 > WHERE (t2.a ,t1.b) NOT IN (SELECT DISTINCT c,a FROM (SELECT * FROM t3) t); > b a > > === modified file 'mysql-test/r/subselect.result' > --- a/mysql-test/r/subselect.result 2012-12-17 00:49:19 +0000 > +++ b/mysql-test/r/subselect.result 2013-02-07 13:33:24 +0000 > @@ -2966,7 +2966,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 9 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<expr_cache><`test`.`t1`.`one`,`test`.`t1`.`two`>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1` > +Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<expr_cache><`test`.`t1`.`one`,`test`.`t1`.`two`>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)))) and trigcond(trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1` > explain extended SELECT one,two from t1 where ROW(one,two) IN (SELECT one,two FROM t2 WHERE flag = 'N'); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > @@ -2979,7 +2979,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 9 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<expr_cache><`test`.`t1`.`one`,`test`.`t1`.`two`>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1` > +Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<expr_cache><`test`.`t1`.`one`,`test`.`t1`.`two`>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)))) and trigcond(trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1` > DROP TABLE t1,t2; > set optimizer_switch=@tmp11867_optimizer_switch; > CREATE TABLE t1 (a char(5), b char(5)); > > === modified file 'mysql-test/r/subselect3.result' > --- a/mysql-test/r/subselect3.result 2012-10-25 12:50:10 +0000 > +++ b/mysql-test/r/subselect3.result 2013-02-07 13:33:24 +0000 > @@ -252,7 +252,7 @@ id select_type table type possible_keys > 2 DEPENDENT SUBQUERY t1 index_subquery a a 5 func 2 100.00 Using where; Full scan on NULL key > Warnings: > Note 1276 Field or reference 'test.t2.oref' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`oref` AS `oref`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on a checking NULL where ((`test`.`t1`.`c` = `test`.`t2`.`oref`) and trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`) or isnull(`test`.`t1`.`a`))) and trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`b`) or isnull(`test`.`t1`.`b`)))) having (trigcond(<is_not_null_test>(`test`.`t1`.`a`)) and trigcond(<is_not_null_test>(`test`.`t1`.`b`))))))) AS `Z` from `test`.`t2` > +Note 1003 select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`oref` AS `oref`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on a checking NULL where ((`test`.`t1`.`c` = `test`.`t2`.`oref`) and trigcond(trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`) or isnull(`test`.`t1`.`a`)))) and trigcond(trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`b`) or isnull(`test`.`t1`.`b`))))) having (trigcond(<is_not_null_test>(`test`.`t1`.`a`)) and trigcond(<is_not_null_test>(`test`.`t1`.`b`))))))) AS `Z` from `test`.`t2` > select a,b, oref, (a,b) in (select a,b from t1 where c=t2.oref) Z from t2; > a b oref Z > NULL 1 100 0 > @@ -269,7 +269,7 @@ id select_type table type possible_keys > 2 DEPENDENT SUBQUERY t4 ALL NULL NULL NULL NULL 100 100.00 Using where; Using join buffer (flat, BNL join) > Warnings: > Note 1276 Field or reference 'test.t2.oref' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`oref` AS `oref`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(select `test`.`t1`.`a`,`test`.`t1`.`b` from `test`.`t1` join `test`.`t4` where ((`test`.`t1`.`c` = `test`.`t2`.`oref`) and trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`) or isnull(`test`.`t1`.`a`))) and trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`b`) or isnull(`test`.`t1`.`b`)))) having (trigcond(<is_not_null_test>(`test`.`t1`.`a`)) and trigcond(<is_not_null_test>(`test`.`t1`.`b`)))))) AS `Z` from `test`.`t2` > +Note 1003 select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`oref` AS `oref`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(select `test`.`t1`.`a`,`test`.`t1`.`b` from `test`.`t1` join `test`.`t4` where ((`test`.`t1`.`c` = `test`.`t2`.`oref`) and trigcond(trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`) or isnull(`test`.`t1`.`a`)))) and trigcond(trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`b`) or isnull(`test`.`t1`.`b`))))) having (trigcond(<is_not_null_test>(`test`.`t1`.`a`)) and trigcond(<is_not_null_test>(`test`.`t1`.`b`)))))) AS `Z` from `test`.`t2` > select a,b, oref, > (a,b) in (select a,b from t1,t4 where c=t2.oref) Z > from t2; > @@ -314,7 +314,7 @@ id select_type table type possible_keys > 2 DEPENDENT SUBQUERY t1 index_subquery idx idx 5 func 4 100.00 Using where; Full scan on NULL key > Warnings: > Note 1276 Field or reference 'test.t2.oref' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select `test`.`t2`.`oref` AS `oref`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on idx checking NULL where ((`test`.`t1`.`oref` = `test`.`t2`.`oref`) and trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`ie1`) or isnull(`test`.`t1`.`ie1`))) and trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`ie2`) or isnull(`test`.`t1`.`ie2`)))) having (trigcond(<is_not_null_test>(`test`.`t1`.`ie1`)) and trigcond(<is_not_null_test>(`test`.`t1`.`ie2`))))))) AS `Z` from `test`.`t2` where ((`test`.`t2`.`b` = 10) and (`test`.`t2`.`a` = 10)) > +Note 1003 select `test`.`t2`.`oref` AS `oref`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on idx checking NULL where ((`test`.`t1`.`oref` = `test`.`t2`.`oref`) and trigcond(trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`ie1`) or isnull(`test`.`t1`.`ie1`)))) and trigcond(trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`ie2`) or isnull(`test`.`t1`.`ie2`))))) having (trigcond(<is_not_null_test>(`test`.`t1`.`ie1`)) and trigcond(<is_not_null_test>(`test`.`t1`.`ie2`))))))) AS `Z` from `test`.`t2` where ((`test`.`t2`.`b` = 10) and (`test`.`t2`.`a` = 10)) > drop table t1, t2; > create table t1 (oref char(4), grp int, ie int); > insert into t1 (oref, grp, ie) values > @@ -584,7 +584,7 @@ id select_type table type possible_keys > 2 DEPENDENT SUBQUERY t1 index_subquery idx idx 5 func 4 100.00 Using where; Full scan on NULL key > Warnings: > Note 1276 Field or reference 'test.t2.oref' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select `test`.`t2`.`oref` AS `oref`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on idx checking NULL where ((`test`.`t1`.`oref` = `test`.`t2`.`oref`) and trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`ie1`) or isnull(`test`.`t1`.`ie1`))) and trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`ie2`) or isnull(`test`.`t1`.`ie2`)))) having (trigcond(<is_not_null_test>(`test`.`t1`.`ie1`)) and trigcond(<is_not_null_test>(`test`.`t1`.`ie2`))))))) AS `Z` from `test`.`t2` > +Note 1003 select `test`.`t2`.`oref` AS `oref`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on idx checking NULL where ((`test`.`t1`.`oref` = `test`.`t2`.`oref`) and trigcond(trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`ie1`) or isnull(`test`.`t1`.`ie1`)))) and trigcond(trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`ie2`) or isnull(`test`.`t1`.`ie2`))))) having (trigcond(<is_not_null_test>(`test`.`t1`.`ie1`)) and trigcond(<is_not_null_test>(`test`.`t1`.`ie2`))))))) AS `Z` from `test`.`t2` > drop table t1,t2; > create table t1 (oref char(4), grp int, ie int primary key); > insert into t1 (oref, grp, ie) values > > === modified file 'mysql-test/r/subselect3_jcl6.result' > --- a/mysql-test/r/subselect3_jcl6.result 2012-10-25 12:50:10 +0000 > +++ b/mysql-test/r/subselect3_jcl6.result 2013-02-07 13:33:24 +0000 > @@ -262,7 +262,7 @@ id select_type table type possible_keys > 2 DEPENDENT SUBQUERY t1 index_subquery a a 5 func 2 100.00 Using where; Full scan on NULL key > Warnings: > Note 1276 Field or reference 'test.t2.oref' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`oref` AS `oref`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on a checking NULL where ((`test`.`t1`.`c` = `test`.`t2`.`oref`) and trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`) or isnull(`test`.`t1`.`a`))) and trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`b`) or isnull(`test`.`t1`.`b`)))) having (trigcond(<is_not_null_test>(`test`.`t1`.`a`)) and trigcond(<is_not_null_test>(`test`.`t1`.`b`))))))) AS `Z` from `test`.`t2` > +Note 1003 select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`oref` AS `oref`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on a checking NULL where ((`test`.`t1`.`c` = `test`.`t2`.`oref`) and trigcond(trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`) or isnull(`test`.`t1`.`a`)))) and trigcond(trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`b`) or isnull(`test`.`t1`.`b`))))) having (trigcond(<is_not_null_test>(`test`.`t1`.`a`)) and trigcond(<is_not_null_test>(`test`.`t1`.`b`))))))) AS `Z` from `test`.`t2` > select a,b, oref, (a,b) in (select a,b from t1 where c=t2.oref) Z from t2; > a b oref Z > NULL 1 100 0 > @@ -279,7 +279,7 @@ id select_type table type possible_keys > 2 DEPENDENT SUBQUERY t4 ALL NULL NULL NULL NULL 100 100.00 Using where; Using join buffer (flat, BNL join) > Warnings: > Note 1276 Field or reference 'test.t2.oref' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`oref` AS `oref`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(select `test`.`t1`.`a`,`test`.`t1`.`b` from `test`.`t1` join `test`.`t4` where ((`test`.`t1`.`c` = `test`.`t2`.`oref`) and trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`) or isnull(`test`.`t1`.`a`))) and trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`b`) or isnull(`test`.`t1`.`b`)))) having (trigcond(<is_not_null_test>(`test`.`t1`.`a`)) and trigcond(<is_not_null_test>(`test`.`t1`.`b`)))))) AS `Z` from `test`.`t2` > +Note 1003 select `test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,`test`.`t2`.`oref` AS `oref`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(select `test`.`t1`.`a`,`test`.`t1`.`b` from `test`.`t1` join `test`.`t4` where ((`test`.`t1`.`c` = `test`.`t2`.`oref`) and trigcond(trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`a`) or isnull(`test`.`t1`.`a`)))) and trigcond(trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`b`) or isnull(`test`.`t1`.`b`))))) having (trigcond(<is_not_null_test>(`test`.`t1`.`a`)) and trigcond(<is_not_null_test>(`test`.`t1`.`b`)))))) AS `Z` from `test`.`t2` > select a,b, oref, > (a,b) in (select a,b from t1,t4 where c=t2.oref) Z > from t2; > @@ -324,7 +324,7 @@ id select_type table type possible_keys > 2 DEPENDENT SUBQUERY t1 index_subquery idx idx 5 func 4 100.00 Using where; Full scan on NULL key > Warnings: > Note 1276 Field or reference 'test.t2.oref' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select `test`.`t2`.`oref` AS `oref`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on idx checking NULL where ((`test`.`t1`.`oref` = `test`.`t2`.`oref`) and trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`ie1`) or isnull(`test`.`t1`.`ie1`))) and trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`ie2`) or isnull(`test`.`t1`.`ie2`)))) having (trigcond(<is_not_null_test>(`test`.`t1`.`ie1`)) and trigcond(<is_not_null_test>(`test`.`t1`.`ie2`))))))) AS `Z` from `test`.`t2` where ((`test`.`t2`.`b` = 10) and (`test`.`t2`.`a` = 10)) > +Note 1003 select `test`.`t2`.`oref` AS `oref`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on idx checking NULL where ((`test`.`t1`.`oref` = `test`.`t2`.`oref`) and trigcond(trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`ie1`) or isnull(`test`.`t1`.`ie1`)))) and trigcond(trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`ie2`) or isnull(`test`.`t1`.`ie2`))))) having (trigcond(<is_not_null_test>(`test`.`t1`.`ie1`)) and trigcond(<is_not_null_test>(`test`.`t1`.`ie2`))))))) AS `Z` from `test`.`t2` where ((`test`.`t2`.`b` = 10) and (`test`.`t2`.`a` = 10)) > drop table t1, t2; > create table t1 (oref char(4), grp int, ie int); > insert into t1 (oref, grp, ie) values > @@ -594,7 +594,7 @@ id select_type table type possible_keys > 2 DEPENDENT SUBQUERY t1 index_subquery idx idx 5 func 4 100.00 Using where; Full scan on NULL key > Warnings: > Note 1276 Field or reference 'test.t2.oref' of SELECT #2 was resolved in SELECT #1 > -Note 1003 select `test`.`t2`.`oref` AS `oref`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on idx checking NULL where ((`test`.`t1`.`oref` = `test`.`t2`.`oref`) and trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`ie1`) or isnull(`test`.`t1`.`ie1`))) and trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`ie2`) or isnull(`test`.`t1`.`ie2`)))) having (trigcond(<is_not_null_test>(`test`.`t1`.`ie1`)) and trigcond(<is_not_null_test>(`test`.`t1`.`ie2`))))))) AS `Z` from `test`.`t2` > +Note 1003 select `test`.`t2`.`oref` AS `oref`,`test`.`t2`.`a` AS `a`,`test`.`t2`.`b` AS `b`,<expr_cache><`test`.`t2`.`a`,`test`.`t2`.`b`,`test`.`t2`.`oref`>(<in_optimizer>((`test`.`t2`.`a`,`test`.`t2`.`b`),<exists>(<index_lookup>(<cache>(`test`.`t2`.`a`) in t1 on idx checking NULL where ((`test`.`t1`.`oref` = `test`.`t2`.`oref`) and trigcond(trigcond(((<cache>(`test`.`t2`.`a`) = `test`.`t1`.`ie1`) or isnull(`test`.`t1`.`ie1`)))) and trigcond(trigcond(((<cache>(`test`.`t2`.`b`) = `test`.`t1`.`ie2`) or isnull(`test`.`t1`.`ie2`))))) having (trigcond(<is_not_null_test>(`test`.`t1`.`ie1`)) and trigcond(<is_not_null_test>(`test`.`t1`.`ie2`))))))) AS `Z` from `test`.`t2` > drop table t1,t2; > create table t1 (oref char(4), grp int, ie int primary key); > insert into t1 (oref, grp, ie) values > > === modified file 'mysql-test/r/subselect4.result' > --- a/mysql-test/r/subselect4.result 2013-01-29 14:10:47 +0000 > +++ b/mysql-test/r/subselect4.result 2013-02-07 13:33:24 +0000 > @@ -303,7 +303,7 @@ EXPLAIN > SELECT * FROM t1 WHERE (NULL, 1) NOT IN (SELECT t2a.i, t2a.pk FROM t2a WHERE t2a.pk = t1.pk); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 Using where > -2 DEPENDENT SUBQUERY t2a eq_ref PRIMARY PRIMARY 8 const,test.t1.pk 1 Using where; Using index; Full scan on NULL key > +2 DEPENDENT SUBQUERY t2a unique_subquery PRIMARY PRIMARY 8 const,test.t1.pk 1 Using index; Using where; Full scan on NULL key > SELECT * FROM t1 WHERE (NULL, 1) NOT IN (SELECT t2a.i, t2a.pk FROM t2a WHERE t2a.pk = t1.pk); > pk i > 0 10 > @@ -335,7 +335,7 @@ EXPLAIN > SELECT * FROM t1 WHERE (NULL, 1) NOT IN (SELECT t2c.i, t2c.pk FROM t2c WHERE t2c.pk = t1.pk); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 4 Using where > -2 DEPENDENT SUBQUERY t2c ref it2c it2c 8 const,test.t1.pk 2 Using where; Using index; Full scan on NULL key > +2 DEPENDENT SUBQUERY t2c index_subquery it2c it2c 8 const,test.t1.pk 2 Using index; Using where; Full scan on NULL key > SELECT * FROM t1 WHERE (NULL, 1) NOT IN (SELECT t2c.i, t2c.pk FROM t2c WHERE t2c.pk = t1.pk); > pk i > 0 10 > > === modified file 'mysql-test/r/subselect_mat_cost.result' > --- a/mysql-test/r/subselect_mat_cost.result 2012-12-20 18:58:40 +0000 > +++ b/mysql-test/r/subselect_mat_cost.result 2013-02-07 13:33:24 +0000 > @@ -348,7 +348,7 @@ FROM City LEFT JOIN Country ON (Country > AND Language IN ('English','Spanish'); > id select_type table type possible_keys key key_len ref rows Extra > 1 PRIMARY CountryLanguage range Language Language 30 NULL 72 Using index condition; Using where; Rowid-ordered scan > -2 DEPENDENT SUBQUERY City ref CityName CityName 35 func 1 Using index condition; Using where > +2 DEPENDENT SUBQUERY City ref CityName CityName 35 func 1 Using index condition > 2 DEPENDENT SUBQUERY Country eq_ref PRIMARY PRIMARY 3 world.City.Country 1 Using where; Using index > select count(*) > from CountryLanguage > > === modified file 'mysql-test/r/subselect_no_mat.result' > --- a/mysql-test/r/subselect_no_mat.result 2012-12-17 00:49:19 +0000 > +++ b/mysql-test/r/subselect_no_mat.result 2013-02-07 13:33:24 +0000 > @@ -2973,7 +2973,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 9 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<expr_cache><`test`.`t1`.`one`,`test`.`t1`.`two`>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1` > +Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<expr_cache><`test`.`t1`.`one`,`test`.`t1`.`two`>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)))) and trigcond(trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1` > explain extended SELECT one,two from t1 where ROW(one,two) IN (SELECT one,two FROM t2 WHERE flag = 'N'); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > @@ -2985,7 +2985,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 9 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<expr_cache><`test`.`t1`.`one`,`test`.`t1`.`two`>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1` > +Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<expr_cache><`test`.`t1`.`one`,`test`.`t1`.`two`>(<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)))) and trigcond(trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`)))))) AS `test` from `test`.`t1` > DROP TABLE t1,t2; > set optimizer_switch=@tmp11867_optimizer_switch; > CREATE TABLE t1 (a char(5), b char(5)); > > === modified file 'mysql-test/r/subselect_no_opts.result' > --- a/mysql-test/r/subselect_no_opts.result 2012-12-17 00:49:19 +0000 > +++ b/mysql-test/r/subselect_no_opts.result 2013-02-07 13:33:24 +0000 > @@ -2969,7 +2969,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 9 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1` > +Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)))) and trigcond(trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1` > explain extended SELECT one,two from t1 where ROW(one,two) IN (SELECT one,two FROM t2 WHERE flag = 'N'); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 Using where > @@ -2981,7 +2981,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 9 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1` > +Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)))) and trigcond(trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1` > DROP TABLE t1,t2; > set optimizer_switch=@tmp11867_optimizer_switch; > CREATE TABLE t1 (a char(5), b char(5)); > > === modified file 'mysql-test/r/subselect_no_scache.result' > --- a/mysql-test/r/subselect_no_scache.result 2012-12-17 00:49:19 +0000 > +++ b/mysql-test/r/subselect_no_scache.result 2013-02-07 13:33:24 +0000 > @@ -2972,7 +2972,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 9 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1` > +Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)))) and trigcond(trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1` > explain extended SELECT one,two from t1 where ROW(one,two) IN (SELECT one,two FROM t2 WHERE flag = 'N'); > id select_type table type possible_keys key key_len ref rows filtered Extra > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > @@ -2985,7 +2985,7 @@ id select_type table type possible_keys > 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 100.00 > 2 DEPENDENT SUBQUERY t2 ALL NULL NULL NULL NULL 9 100.00 Using where > Warnings: > -Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`))) and trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`)))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1` > +Note 1003 select `test`.`t1`.`one` AS `one`,`test`.`t1`.`two` AS `two`,<in_optimizer>((`test`.`t1`.`one`,`test`.`t1`.`two`),<exists>(select `test`.`t2`.`one`,`test`.`t2`.`two` from `test`.`t2` where ((`test`.`t2`.`flag` = '0') and trigcond(trigcond(((<cache>(`test`.`t1`.`one`) = `test`.`t2`.`one`) or isnull(`test`.`t2`.`one`)))) and trigcond(trigcond(((<cache>(`test`.`t1`.`two`) = `test`.`t2`.`two`) or isnull(`test`.`t2`.`two`))))) having (trigcond(<is_not_null_test>(`test`.`t2`.`one`)) and trigcond(<is_not_null_test>(`test`.`t2`.`two`))))) AS `test` from `test`.`t1` > DROP TABLE t1,t2; > set optimizer_switch=@tmp11867_optimizer_switch; > CREATE TABLE t1 (a char(5), b char(5)); > > === modified file 'sql/item_subselect.cc' > --- a/sql/item_subselect.cc 2013-01-29 14:10:47 +0000 > +++ b/sql/item_subselect.cc 2013-02-07 13:33:24 +0000 > @@ -2306,7 +2306,7 @@ Item_in_subselect::create_row_in_to_exis > ref_pointer_array+i, > (char *)"<no matter>", > (char *)"<list ref>")); > - if (!abort_on_null) > + if (!abort_on_null && select_lex->ref_pointer_array[i]->maybe_null) > { > Item *having_col_item= > new Item_is_not_null_test(this, > @@ -2325,10 +2325,6 @@ Item_in_subselect::create_row_in_to_exis > (char *)"<no matter>", > (char *)"<list ref>")); > item= new Item_cond_or(item, item_isnull); > - /* > - TODO: why we create the above for cases where the right part > - cant be NULL? > - */ > if (left_expr->element_index(i)->maybe_null) > { > if (!(item= new Item_func_trig_cond(item, get_cond_guard(i)))) > @@ -2339,6 +2335,11 @@ Item_in_subselect::create_row_in_to_exis > } > *having_item= and_items(*having_item, having_col_item); > } > + if (!abort_on_null && left_expr->element_index(i)->maybe_null) > + { > + if (!(item= new Item_func_trig_cond(item, get_cond_guard(i)))) > + DBUG_RETURN(true); > + } > *where_item= and_items(*where_item, item); > } > } > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] Idea for parallel replication with statement-based binlogging
by Kristian Nielsen 17 Feb '13

17 Feb '13

Hi Xiaobin, I hope you are enjoying the Spring Festival! All the best wishes for you and your family for the coming year. I had an idea for your parallel replication work, inspired by my work on in-order commit. I wanted to hear your opinion on it, if you are interested. The idea is to make your patch work with statement-based replication. For row-based InnoDB events, you hash all the unique keys to check for conflicts, and if no conflict you can run transactions in parallel even against the same table. For MyISAM, I get deadlock issues in my in-order-commit patch, if I try to replicate in parallel against the same table. So I hash just the table names, so that two transactions on the same table always conflict. Then I can still replicate in parallel events against different tables. Now suppose that for statement-based events, we obtain the names of all tables used in the queries. We could add a new event to the binlog with the table names, or perhaps parse the statement on the slave, if that is not too expensive. Then we could hash just the names to check for conflicts, just like I did for MyISAM with row-based events. It seems to me that we could then safely replicate statement-based events in parallel on the slave if they are to different tables. This would be great for people that do not want to use row-based replication, it would surely be better than the MySQL 5.6 multi-threaded slave which can only do queries against different databases in parallel. What do you think? - Kristian.

2 1

[Maria-developers] implementing index condition pushdown in MariaDB 5.5
by Zardosht Kasheff 16 Feb '13

16 Feb '13

Hello, Is there any documentation for what a storage engine needs to do to implement index condition pushdown in MariaDB 5.5? I see some related things, such as handler_index_cond_check, HA_DO_INDEX_COND_PUSHDOWN, and idx_cond_push, but I don't understand how these all interact with each other. Thanks -Zardosht

2 6

[Maria-developers] Help with running a transaction inside the server
by Kristian Nielsen 14 Feb '13

14 Feb '13

Hi Serg, Can you give me a tip for doing the following (for MDEV-26, global transaction ID): I need to run a transaction inside the server. This is in the slave I/O thread, when it connects to the master it receives the current replication position as a GTID, and I want to store it in the mysql.rpl_slave_state so that next reconnect of the slave can use the GTID automatically. So I basically need to run the equivalent of something like this: BEGIN; INSERT INTO mysql.rpl_slave_state VALUES (...); DELETE FROM mysql.rpl_slave_state WHERE id=...; COMMIT; I think I already have everything except the "BEGIN" part (if you want, you can check the code in rpl_slave_state::record_gtid() in my branch lp:~maria-captains/maria/10.0-mdev26/ on Launchpad). So how do I do the equivalent of BEGIN inside the server code? Can you think of any existing code I could use as example? - Kristian.

3 7

[Maria-developers] Fwd: debugging how query plans are made
by Zardosht Kasheff 12 Feb '13

12 Feb '13

Is there something similar in MariaDB? ---------- Forwarded message ---------- From: Øystein Grøvlen <oystein.grovlen(a)oracle.com> Date: Tue, Feb 12, 2013 at 9:11 AM Subject: Re: debugging how query plans are made To: Zardosht Kasheff <zardosht(a)gmail.com> Cc: "internals(a)lists.mysql.com" <internals(a)lists.mysql.com> On 02/12/13 02:54 PM, Zardosht Kasheff wrote: > > Hello all, > > In MySQL and/or MariaDB, are there any hooks or methods one can use to > learn why a query plan is chosen over alternatives? We sometimes > notice that a different query plan is chosen for us than InnoDB (which > may be fine, given we are a different storage engine), and we would > like to better understand why. Is there any debug parameter that gets > MySQL to output decisions made in the optimizer? MySQL 5.6 has optimizer tracing which outputs the decisions made by the optimizer. See http://dev.mysql.com/doc/internals/en/optimizer-tracing.html Hope this helps, -- Øystein

2 1

Re: [Maria-developers] Files under /etc/my.cnf.d/ read by default
by Sergei Golubchik 12 Feb '13

12 Feb '13

Hi, Honza! On Feb 05, Honza Horak wrote: > Hi guys, > > while we were packaging MariaDB into Fedora (finally) we used the > upstream's cnf files structure, which means /etc/my.cnf, that includes > all files from directory /etc/my.cnf.d/* using statement !includedir. > > That works fine when user installs (not updates) the MariaDB packages > without having them installed before. The problem is if user has changed > /etc/my.cnf before updating -- then /etc/my.cnf doesn't get updated > (!includedir won't be added) and we end with files under /etc/my.cnf.d/* > but nothing what includes them. That is quite confusing for users that > may change something in /etc/my.cnf.d/client.cnf but nothing happens. Agree. Especially as we've started to use /etc/my.cnf.d/ now - e.g. CassandraSE comes in a separate rpm, that (besides the plugin itself) drops a file into /etc/my.cnf.d/ to enable the engine in the server. I expect that more separately-packed plugins will start doing the same. > Since files under /etc/my.cnf.d/* are empty by default it shouldn't do > any harm if all files corresponding with /etc/my.cnf.d/*.cnf template > get loaded even without !includedir in /etc/my.cnf. Actually I believe > that is what users expect to happen when they see files under > /etc/my.cnf.d.. > > So, that's basically what I'm proposing -- read files under > /etc/my.cnf.d/* by default, without a need to use !includedir. What do > you think? What if we add !includedir to the /etc/my.cnf from the post-inst script? Something like grep -q '!includedir /etc/my.cnf.d' /etc/my.cnf || \ (echo; echo '!includedir /etc/my.cnf.d') >> /etc/my.cnf Would that be enough? Regards, Sergei

2 1

[Maria-developers] No Doxygen?
by Christian Convey 11 Feb '13

11 Feb '13

I was kind of surprised to not find anything in MariaDB's build system for using Doxygen to create HTML docs. Have people decided this isn't a worthwhile thing to do? Or has just no one gotten around to it yet? - Christian

3 4

Re: [Maria-developers] Question
by Michael Widenius 10 Feb '13

10 Feb '13

Hi! First, the MariaDB developers list is the right place to ask questions like this. >>>>> "Aamir" == Aamir Abbas <Abbas> writes: Aamir> Hi Monty, Aamir> I have researched this question about MySQL without luck and if you cannot answer it then nobody can. On some MySQL servers the version number returns a "-log" suffixed to the version number. For example, 5.0.45-log. What does the "-log" mean or signify? This is not a standard version number as far as I can tell. Should it not simply return 5.0.45? I have posted the question to a couple of forums but nobody's able to answer. I have just updated the documentation at https://kb.askmonty.org/en/version/ to answer this questions in detail. Here is a copy of the new documentation: The VERSION() string may have one or more of the following suffixes: Suffix Description -embedded The server is an embedded server (libmysqld). -log General logging, slow logging or binary (replication) logging is enabled. -debug The server is compiled for debugging. -valgrind The server is compiled to be instrumented with valgrind. Regards, Monty

1 0

[Maria-developers] Coverity scan results
by Christian Convey 07 Feb '13

07 Feb '13

Hey guys, For those of you who missed it, I volunteered to try gettin MariaDB scanned as part of the Coverity Scan service. I just got the trunk scanned for the first time, and a lot of potential-problem reports came up. I did a spot check on one of them, and the report looks like a true-positive. Coverity Scan reports: 178 high-impact problems 1020 medium-impact problems 47 low-impact problems. Any suggestions for how to get these looked at by the appropriate developers? It seems crazy for me to enter 1000+ bug reports into the bug tracker. I believe I have the power to create new user accounts in Coverity Scan's MariaDB project, for any MariaDB developer who wants to see the results. Thanks, Christian

3 12

Re: [Maria-developers] Fwd: [Commits] Rev 3622: Fix for bug MDEV-765 (LP:825075) in file:///home/tsk/mprog/src/5.3-md765/
by Sergei Petrunia 07 Feb '13

07 Feb '13

Hi Timour, On Mon, Feb 04, 2013 at 05:39:02PM +0200, Timour Katchaounov wrote: > > Sergey, > > Could you please review the following patch. The fix implements > your suggestion from your previous review: > https://lists.launchpad.net/maria-developers/msg04597.html > Ok to push. > Timour > > ------------------------------------------------------------ > revno: 3622 > revision-id: timour(a)askmonty.org-20130204153548-njv08hcdskv6ttjk > parent: sergii(a)pisem.net-20130128081223-mp9rsd3t9soz8lly > fixes bug: https://mariadb.atlassian.net/browse/MDEV-765 > committer: timour(a)askmonty.org > branch nick: 5.3-md765 > timestamp: Mon 2013-02-04 17:35:48 +0200 > message: > Fix for bug MDEV-765 (LP:825075) > > Analys: > The cause for the wrong result was that the optimizer > incorrectly chose min/max loose scan when it is not > applicable. The applicability test missed the case when > a condition on the MIN/MAX argument was OR-ed with a > condition on some other field. In this case, the MIN/MAX > condition cannot be used for loose scan. > > Solution: > Extend the test check_group_min_max_predicates() to check > that the WHERE clause is of the form: "cond1 AND cond2" > where > cond1 - does not use min_max_column at all. > cond2 - is an AND/OR tree with leaves in form "min_max_column $CMP$ const" > or $CMP$ is one of the functions between, is [not] null > > > === modified file 'mysql-test/r/group_min_max.result' > --- a/mysql-test/r/group_min_max.result 2013-01-28 08:12:23 +0000 > +++ b/mysql-test/r/group_min_max.result 2013-02-04 15:35:48 +0000 > @@ -3186,3 +3186,61 @@ a b > 109 19 > drop table t1; > End of 5.1 tests > +# > +# MDEV-765: LP:825075 - Wrong result with GROUP BY + multipart key + MIN/MAX loose scan > +# > +CREATE TABLE t1 (a varchar(1), b varchar(1), KEY (b,a)); > +INSERT INTO t1 VALUES > +('0',NULL),('9',NULL),('8','c'),('4','d'),('7','d'),(NULL,'f'), > +('7','f'),('8','g'),(NULL,'j'); > +explain > +SELECT max(a) , b FROM t1 WHERE a IS NULL OR b = 'z' GROUP BY b; > +id select_type table type possible_keys key key_len ref rows Extra > +1 SIMPLE t1 index b b 8 NULL 9 Using where; Using index > +SELECT max(a) , b FROM t1 WHERE a IS NULL OR b = 'z' GROUP BY b; > +max(a) b > +NULL f > +NULL j > +explain > +SELECT b, min(a) FROM t1 WHERE a = '7' OR b = 'z' GROUP BY b; > +id select_type table type possible_keys key key_len ref rows Extra > +1 SIMPLE t1 index b b 8 NULL 9 Using where; Using index > +SELECT b, min(a) FROM t1 WHERE a = '7' OR b = 'z' GROUP BY b; > +b min(a) > +d 7 > +f 7 > +explain > +SELECT b, min(a) FROM t1 WHERE (a = b OR b = 'd' OR b is NULL) GROUP BY b; > +id select_type table type possible_keys key key_len ref rows Extra > +1 SIMPLE t1 index b b 8 NULL 9 Using where; Using index > +SELECT b, min(a) FROM t1 WHERE (a = b OR b = 'd' OR b is NULL) GROUP BY b; > +b min(a) > +NULL 0 > +d 4 > +explain > +SELECT b, min(a) FROM t1 WHERE a > ('0' = b) AND b = 'z' GROUP BY b; > +id select_type table type possible_keys key key_len ref rows Extra > +1 SIMPLE t1 ref b b 4 const 1 Using where; Using index > +SELECT b, min(a) FROM t1 WHERE a > ('0' = b) AND b = 'z' GROUP BY b; > +b min(a) > +explain > +SELECT b, min(a) FROM t1 WHERE a > '0' AND (b < (a = '7')) GROUP BY b; > +id select_type table type possible_keys key key_len ref rows Extra > +1 SIMPLE t1 index NULL b 8 NULL 9 Using where; Using index > +SELECT b, min(a) FROM t1 WHERE a > '0' AND (b < (a = '7')) GROUP BY b; > +b min(a) > +d 7 > +f 7 > +explain > +SELECT b, min(a) FROM t1 WHERE (a > '0' AND (a > '1' OR b = 'd')) GROUP BY b; > +id select_type table type possible_keys key key_len ref rows Extra > +1 SIMPLE t1 index b b 8 NULL 9 Using where; Using index > +SELECT b, min(a) FROM t1 WHERE (a > '0' AND (a > '1' OR b = 'd')) GROUP BY b; > +b min(a) > +NULL 9 > +c 8 > +d 4 > +f 7 > +g 8 > +drop table t1; > +End of 5.3 tests > > === modified file 'mysql-test/t/group_min_max.test' > --- a/mysql-test/t/group_min_max.test 2013-01-28 08:12:23 +0000 > +++ b/mysql-test/t/group_min_max.test 2013-02-04 15:35:48 +0000 > @@ -1203,3 +1203,40 @@ WHERE EXISTS ( SELECT DISTINCT b FROM t1 > drop table t1; > > --echo End of 5.1 tests > + > +--echo # > +--echo # MDEV-765: LP:825075 - Wrong result with GROUP BY + multipart key + MIN/MAX loose scan > +--echo # > + > +CREATE TABLE t1 (a varchar(1), b varchar(1), KEY (b,a)); > +INSERT INTO t1 VALUES > +('0',NULL),('9',NULL),('8','c'),('4','d'),('7','d'),(NULL,'f'), > +('7','f'),('8','g'),(NULL,'j'); > + > +explain > +SELECT max(a) , b FROM t1 WHERE a IS NULL OR b = 'z' GROUP BY b; > +SELECT max(a) , b FROM t1 WHERE a IS NULL OR b = 'z' GROUP BY b; > + > +explain > +SELECT b, min(a) FROM t1 WHERE a = '7' OR b = 'z' GROUP BY b; > +SELECT b, min(a) FROM t1 WHERE a = '7' OR b = 'z' GROUP BY b; > + > +explain > +SELECT b, min(a) FROM t1 WHERE (a = b OR b = 'd' OR b is NULL) GROUP BY b; > +SELECT b, min(a) FROM t1 WHERE (a = b OR b = 'd' OR b is NULL) GROUP BY b; > + > +explain > +SELECT b, min(a) FROM t1 WHERE a > ('0' = b) AND b = 'z' GROUP BY b; > +SELECT b, min(a) FROM t1 WHERE a > ('0' = b) AND b = 'z' GROUP BY b; > + > +explain > +SELECT b, min(a) FROM t1 WHERE a > '0' AND (b < (a = '7')) GROUP BY b; > +SELECT b, min(a) FROM t1 WHERE a > '0' AND (b < (a = '7')) GROUP BY b; > + > +explain > +SELECT b, min(a) FROM t1 WHERE (a > '0' AND (a > '1' OR b = 'd')) GROUP BY b; > +SELECT b, min(a) FROM t1 WHERE (a > '0' AND (a > '1' OR b = 'd')) GROUP BY b; > + > +drop table t1; > + > +--echo End of 5.3 tests > > === modified file 'sql/opt_range.cc' > --- a/sql/opt_range.cc 2013-01-28 08:12:23 +0000 > +++ b/sql/opt_range.cc 2013-02-04 15:35:48 +0000 > @@ -11485,7 +11485,8 @@ static bool get_constant_key_infix(KEY * > KEY_PART_INFO **first_non_infix_part); > static bool > check_group_min_max_predicates(Item *cond, Item_field *min_max_arg_item, > - Field::imagetype image_type); > + Field::imagetype image_type, > + bool *has_min_max_fld, bool *has_other_fld); > > static void > cost_group_min_max(TABLE* table, KEY *index_info, uint used_key_parts, > @@ -12005,10 +12006,12 @@ get_best_group_min_max(PARAM *param, SEL > DBUG_RETURN(NULL); > > /* Check (SA3) for the where clause. */ > + bool has_min_max_fld= false, has_other_fld= false; > if (join->conds && min_max_arg_item && > !check_group_min_max_predicates(join->conds, min_max_arg_item, > (index_info->flags & HA_SPATIAL) ? > - Field::itMBR : Field::itRAW)) > + Field::itMBR : Field::itRAW, > + &has_min_max_fld, &has_other_fld)) > DBUG_RETURN(NULL); > > /* The query passes all tests, so construct a new TRP object. */ > @@ -12043,16 +12046,24 @@ get_best_group_min_max(PARAM *param, SEL > > SYNOPSIS > check_group_min_max_predicates() > - cond tree (or subtree) describing all or part of the WHERE > - clause being analyzed > - min_max_arg_item the field referenced by the MIN/MAX function(s) > - min_max_arg_part the keypart of the MIN/MAX argument if any > + cond [in] the expression tree being analyzed > + min_max_arg [in] the field referenced by the MIN/MAX function(s) > + image_type [in] > + has_min_max_arg [out] true if the subtree being analyzed references min_max_arg > + has_other_arg [out] true if the subtree being analyzed references a column > + other min_max_arg > > DESCRIPTION > The function walks recursively over the cond tree representing a WHERE > clause, and checks condition (SA3) - if a field is referenced by a MIN/MAX > aggregate function, it is referenced only by one of the following > - predicates: {=, !=, <, <=, >, >=, between, is null, is not null}. > + predicates $FUNC$: > + {=, !=, <, <=, >, >=, between, is [not] null, multiple equal}. > + In addition the function checks that the WHERE condition is equivalent to > + "cond1 AND cond2" where : > + cond1 - does not use min_max_column at all. > + cond2 - is an AND/OR tree with leaves in form > + "$FUNC$(min_max_column[, const])". > > RETURN > TRUE if cond passes the test > @@ -12061,7 +12072,8 @@ get_best_group_min_max(PARAM *param, SEL > > static bool > check_group_min_max_predicates(Item *cond, Item_field *min_max_arg_item, > - Field::imagetype image_type) > + Field::imagetype image_type, > + bool *has_min_max_arg, bool *has_other_arg) > { > DBUG_ENTER("check_group_min_max_predicates"); > DBUG_ASSERT(cond && min_max_arg_item); > @@ -12073,12 +12085,24 @@ check_group_min_max_predicates(Item *con > DBUG_PRINT("info", ("Analyzing: %s", ((Item_func*) cond)->func_name())); > List_iterator_fast<Item> li(*((Item_cond*) cond)->argument_list()); > Item *and_or_arg; > + Item_func::Functype func_type= ((Item_cond*) cond)->functype(); > + bool has_min_max= false, has_other= false; > while ((and_or_arg= li++)) > { > - if (!check_group_min_max_predicates(and_or_arg, min_max_arg_item, > - image_type)) > + /* > + The WHERE clause doesn't pass the condition if: > + (1) any subtree doesn't pass the condition or > + (2) the subtree passes the test, but it is an OR and it references both > + the min/max argument and other columns. > + */ > + if (!check_group_min_max_predicates(and_or_arg, min_max_arg_item, //1 > + image_type, > + &has_min_max, &has_other) || > + (func_type == Item_func::COND_OR_FUNC && has_min_max && has_other))//2 > DBUG_RETURN(FALSE); > } > + *has_min_max_arg= has_min_max || *has_min_max_arg; > + *has_other_arg= has_other || *has_other_arg; > DBUG_RETURN(TRUE); > } > > @@ -12112,6 +12136,10 @@ check_group_min_max_predicates(Item *con > if (cond_type == Item::FIELD_ITEM) > { > DBUG_PRINT("info", ("Analyzing: %s", cond->full_name())); > + if (min_max_arg_item->eq((Item_field*)cond, 1)) > + *has_min_max_arg= true; > + else > + *has_other_arg= true; > DBUG_RETURN(TRUE); > } > > @@ -12120,9 +12148,33 @@ check_group_min_max_predicates(Item *con > > /* Test if cond references only group-by or non-group fields. */ > Item_func *pred= (Item_func*) cond; > + Item_func::Functype pred_type= pred->functype(); > + DBUG_PRINT("info", ("Analyzing: %s", pred->func_name())); > + if (pred_type == Item_func::MULT_EQUAL_FUNC) > + { > + /* > + Check that each field in a multiple equality is either a constant or > + it is a reference to the min/max argument, or it doesn't contain the > + min/max argument at all. > + */ > + Item_equal_fields_iterator eq_it(*((Item_equal*)pred)); > + Item *eq_item; > + bool has_min_max= false, has_other= false; > + while ((eq_item= eq_it++)) > + { > + if (min_max_arg_item->eq(eq_item->real_item(), 1)) > + has_min_max= true; > + else > + has_other= true; > + } > + *has_min_max_arg= has_min_max || *has_min_max_arg; > + *has_other_arg= has_other || *has_other_arg; > + DBUG_RETURN(!(has_min_max && has_other)); > + } > + > Item **arguments= pred->arguments(); > Item *cur_arg; > - DBUG_PRINT("info", ("Analyzing: %s", pred->func_name())); > + bool has_min_max= false, has_other= false; > for (uint arg_idx= 0; arg_idx < pred->argument_count (); arg_idx++) > { > cur_arg= arguments[arg_idx]->real_item(); > @@ -12131,11 +12183,11 @@ check_group_min_max_predicates(Item *con > { > if (min_max_arg_item->eq(cur_arg, 1)) > { > - /* > - If pred references the MIN/MAX argument, check whether pred is a range > - condition that compares the MIN/MAX argument with a constant. > - */ > - Item_func::Functype pred_type= pred->functype(); > + has_min_max= true; > + /* > + If pred references the MIN/MAX argument, check whether pred is a range > + condition that compares the MIN/MAX argument with a constant. > + */ > if (pred_type != Item_func::EQUAL_FUNC && > pred_type != Item_func::LT_FUNC && > pred_type != Item_func::LE_FUNC && > @@ -12175,11 +12227,13 @@ check_group_min_max_predicates(Item *con > min_max_arg_item->field->cmp_type() != args[1]->result_type()))) > DBUG_RETURN(FALSE); > } > + else > + has_other= true; > } > else if (cur_arg->type() == Item::FUNC_ITEM) > { > - if (!check_group_min_max_predicates(cur_arg, min_max_arg_item, > - image_type)) > + if (!check_group_min_max_predicates(cur_arg, min_max_arg_item, image_type, > + &has_min_max, &has_other)) > DBUG_RETURN(FALSE); > } > else if (cur_arg->const_item()) > @@ -12192,7 +12246,11 @@ check_group_min_max_predicates(Item *con > } > else > DBUG_RETURN(FALSE); > + if(has_min_max && has_other) > + DBUG_RETURN(FALSE); > } > + *has_min_max_arg= has_min_max || *has_min_max_arg; > + *has_other_arg= has_other || *has_other_arg; > > DBUG_RETURN(TRUE); > } > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

[Maria-developers] Igor please review: EXPLAIN for DELETE
by Sergei Petrunia 07 Feb '13

07 Feb '13

Hello Igor, Hello Igor, Could you please review the following two patches: http://lists.askmonty.org/pipermail/commits/2012-December/003944.html http://lists.askmonty.org/pipermail/commits/2012-December/003945.html I think they implement the ideas about MDEV-3798 we've discussed earlier. BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

2 1