- developers - lists.mariadb.org

Re: [Maria-developers] [Commits] 0240b866abc: MDEV-13838: Wrong result after altering a partitioned table
by Marko Mäkelä 09 Oct '17

09 Oct '17

On Mon, Oct 9, 2017 at 3:00 PM, jan <jan.lindstrom(a)mariadb.com> wrote: > revision-id: 109463fdb86d (mariadb-10.0.32-54-g0240b866abc) > parent(s): 172cc70bf8c0aea3d2d0c73bcf94f36c172b769a > author: Jan Lindström > committer: Jan Lindström > timestamp: 2017-10-09 14:52:51 +0300 > message: > > MDEV-13838: Wrong result after altering a partitioned table > > Reverted incorrect changes done on MDEV-7367 and MDEV-9469. Fixes properly > also related bugs: > > MDEV-13668: InnoDB unnecessarily rebuilds table when renaming a column and > adding index > MDEV-9469: 'Incorrect key file' on ALTER TABLE > MDEV-9548: Alter table (renaming and adding index) fails with "Incorrect > key file for table" > MDEV-10535: ALTER TABLE causes standalone/wsrep cluster crash > MDEV-13640: ALTER TABLE CHANGE and ADD INDEX on auto_increment column > fails with "Incorrect key file for table..." > This is a very welcome change that looks correct to me. I only have a few comments on the formatting and tests. The patch does not cleanly apply to 10.0 due to some difference in the comments of removed functions. Later, you informed me that this is https://github.com/MariaDB/server/commit/a8db085c51ccfd6df737d9261abac9d2b0… on bb-10.0-MDEV-13838 <https://github.com/MariaDB/server/compare/bb-10.0-MDEV-13838>. +Warnings: > +Note 1831 Duplicate index `c4_2`. This is deprecated and will be > disallowed in a future release. > The intention of the test was not to create duplicated indexes. The "rename column" and "add index" operations were split into two ALTER TABLE in order to work around the limitation that was introduced in a previous incorrect commit. You should have removed the added ALTER TABLE statements instead of adding SHOW CREATE TABLE statements. Please refer to https://github.com/MariaDB/server/commit/f56bd70f51020c67a30415ae381ae93b90… and revert the relevant parts of the test changes. The other tests seem to be adjusted fine. > @@ -171,3 +172,39 @@ ALTER TABLE ticket > SHOW CREATE TABLE ticket; > > DROP TABLE ticket; > + > +# > +# MDEV-13838: Wrong result after altering a partitioned table > +# > + > +CREATE TABLE `t` ( > +`id` bigint(20) unsigned NOT NULL auto_increment, > +`d` date NOT NULL, > +`a` bigint(20) unsigned NOT NULL, > +`b` smallint(5) unsigned DEFAULT NULL, > +PRIMARY KEY (`id`,`d`) > +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_general_cs > STATS_SAMPLE_PAGES=200 > +/*!50500 PARTITION BY RANGE COLUMNS(d) > +(PARTITION p20170913 VALUES LESS THAN ('2017-09-14') ENGINE = InnoDB, > +PARTITION p20170914 VALUES LESS THAN ('2017-09-15') ENGINE = InnoDB, > +PARTITION p20170915 VALUES LESS THAN ('2017-09-16') ENGINE = InnoDB, > +PARTITION p20170916 VALUES LESS THAN ('2017-09-17') ENGINE = InnoDB, > +PARTITION p20170917 VALUES LESS THAN ('2017-09-18') ENGINE = InnoDB, > +PARTITION p99991231 VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB) */; > Please clean up the CREATE TABLE statement. Remove trailing space and unnecessary quotes and comments. > +insert into t(d,a,b) values ('2017-09-15',rand()*10000,rand()*10); > +insert into t(d,a,b) values ('2017-09-15',rand()*10000,rand()*10); > + > +replace into t(d,a,b) select '2017-09-15',rand()*10000,rand()*10 from t > t1, t t2, t t3, t t4, t t5, t t6, t t7, t t8, t t9, t t10, t t11, t t12, t > t13, t t14; > Does the table really have to be this big for the bug to repeat? Can you please reduce the test? Shouldn’t it work with 1 or 2 partitions and a few records in each? > + > +select count(*) from t where d ='2017-09-15'; > + > +ALTER TABLE t CHANGE b c smallint(5) unsigned , ADD KEY idx_d_a (d, a); > +SHOW CREATE TABLE t; > +analyze table t; > + > +select count(*) from t where d ='2017-09-15'; > +select count(*) from t force index(primary) where d ='2017-09-15'; > + > +DROP TABLE t; > + > Please do not end files in empty lines. > @@ -1625,13 +1606,9 @@ innobase_create_index_def( > index->ind_type |= DICT_FTS; > } > > - if (!new_clustered) { > - altered_table = NULL; > - } > - > for (i = 0; i < n_fields; i++) { > - innobase_create_index_field_def( > - altered_table, &key->key_part[i], > &index->fields[i], fields); > + innobase_create_index_field_def(new_clustered, > + altered_table, &key->key_part[i], > &index->fields[i]); > } > > DBUG_VOID_RETURN; > Do not add the first parameter to the same line with the function name. Instead, add it on a line on its own. In this way, it follows the indentation rules set by (defun innodb-cc-mode (&optional map) "InnoDB adjustments to cc-mode. In MAP, binds C-c C-c to 'compile." (if (and (buffer-file-name) (string-match "/\$innobase\\|xtradb\$.*/.*[ihc]\\'" (buffer-file-name))) (progn (setq mode-name (concat "Ib" mode-name) c-basic-offset 8 c-label-minimum-indentation 0) (add-to-list 'c-offsets-alist '(c . 0)) (add-to-list 'c-offsets-alist '(arglist-intro . +)) (add-to-list 'c-offsets-alist '(label . [0])))) (if map (define-key map "\C-c\C-c" 'compile))) > @@ -2121,7 +2097,7 @@ struct ha_innobase_inplace_ctx : public > inplace_alter_handler_ctx > /** mapping of old column numbers to new ones, or NULL */ > const ulint* col_map; > /** new column names, or NULL if nothing was renamed */ > - const char** col_names; > + const char** col_names; > /** added AUTO_INCREMENT column position, or ULINT_UNDEFINED */ > const ulint add_autoinc; > /** default values of ADD COLUMN, or NULL */ > Please do not change TAB to spaces. > @@ -3067,7 +3043,7 @@ prepare_inplace_alter_table_dict( > > ctx->add_index[a] = row_merge_create_index( > ctx->trx, ctx->new_table, > - &index_defs[a], ctx->col_names); > + &index_defs[a]); > > add_key_nums[a] = index_defs[a].key_number; > Consider joining the line after new_table. Best regards, Marko

1 0

[Maria-developers] MDEV-11819 NO_ZERO_IN_DATE: Incorrect generated column value
by Alexander Barkov 06 Oct '17

06 Oct '17

Hello Sergei, Please review a patch for MDEV-11819. Thanks.

2 1

[Maria-developers] Add RMariaDB CRAN Link to MariaDB Foundation Download Webpage
by Juan Telleria 06 Oct '17

06 Oct '17

Dear R Developers, A new package has been released for the "R Statistical Programming Language" in which the R community has put a great effort into it: RMariaDB. It enables a robust data transfer between R and MariaDB. The link on CRAN (R package repository) can be accessed from: https://cran.r-project.org/web/packages/RMariaDB/index.html And can be installed in R by using the following statement: install.packages("RMariaDB") library(RMariaDB) So, just as PHP community developed connector was distributed in the past within MySQL webpage, I do think that this connector could benefit from being distributed (or having a link to CRAN) from the MariaDB Foundation Download Webpage. I believe that many people has putted a great effort on this connector, and it would benefit from greater visibility for better support and maintenance. Thank you, Juan

2 1

Re: [Maria-developers] [Commits] 3f7e619647f: MDEV-13928: Missing symbols building RocksDB on macOS 10.12.6
by Sergei Golubchik 05 Oct '17

05 Oct '17

Hi, Varun! Why did it fail only on MacOS X? On Oct 06, Varun wrote: > revision-id: 3f7e619647f7bc1ec31a6118b403da805c48ae51 (mariadb-10.2.5-653-g3f7e619647f) > parent(s): 08c493c62afae0e81f9da6bb9b86efe99a9a763d > author: Varun Gupta > committer: Varun Gupta > timestamp: 2017-10-06 00:20:08 +0530 > message: > > MDEV-13928: Missing symbols building RocksDB on macOS 10.12.6 > > rdb_sst_info.cc must be compiled with RTTI > > --- > storage/rocksdb/CMakeLists.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt > index 6db82119b45..80a6614b757 100644 > --- a/storage/rocksdb/CMakeLists.txt > +++ b/storage/rocksdb/CMakeLists.txt > @@ -170,6 +170,7 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") > # includes requires it. So, now everything in MariaRocks is compiled with > # -frtti) > set_source_files_properties(event_listener.cc rdb_cf_options.cc > + rdb_sst_info.cc > PROPERTIES COMPILE_FLAGS -frtti) > ENDIF() Regards, Sergei Chief Architect MariaDB and security(a)mariadb.org

1 0

[Maria-developers] MDEV-13417 / MDEV - 13418 The order of evaluation of SELECT..INTO assignments
by jerome brauge 03 Oct '17

03 Oct '17

Hello Sergei, Here is a patch for MDEV-13417 and MDEV-13418. Until you choose the right name for this new sql_mode, I temporarily chosen "SET_CONSISTENCY". It is set only for sql_mode=oracle for now. Can you review it ? Thank you. Regard.

2 6

[Maria-developers] MDEV-10596
by jerome brauge 27 Sep '17

27 Sep '17

Hi Alexander, In sql_mode=oracle, when a stored procedure varchar parameter is defined without size, you have chosen to translate it by VARCHAR(4000) (or CHAR(2000) for CHAR parameter). Oracle does not work like this. Size is inherited from the size of argument at runtime. Example: CREATE OR REPLACE PROCEDURE p1(p OUT VARCHAR) AS BEGIN p:='0123456789'; END; / declare w varchar(10); begin p1(w); end; / --> work fine declare w varchar(8); begin p1(w); end; / --> failed with : ERROR at line 1: ORA-06502: PL/SQL: numeric or value error: character string buffer too small ORA-06512: at "OPS$DBO.P1", line 4 ORA-06512: at line 3 Furthermore, since Oracle 9, VARCHAR datatype in PL/SQL is not limited to 4000 char but to 32k. It's the size of varchar column in a table that is limited to 4000 (until Oracle 12C which allow 32k when MAX_STRING_SIZE=EXTENDED). I've done the attached patch to resize these parameters at runtime. What do you think about it ? Another question : Oracle does not allow to change the value of an IN parameter. The following procedure cannot be compile : CREATE OR REPLACE PROCEDURE p1(p IN VARCHAR) AS BEGIN p:='0123456789'; END; / Warning: Procedure created with compilation errors. //sun10:1521/CS> select * from user_errors; NAME TYPE SEQUENCE LINE POSITION ------------------------------ ------------ ---------- ---------- ---------- TEXT ------------------------------------------------------------------------------------------------------------------------------------ ATTRIBUTE MESSAGE_NUMBER --------- -------------- P1 PROCEDURE 1 4 3 PLS-00363: expression 'P' cannot be used as an assignment target ERROR 363 Mariadb allow this. It's fine for us but do you have plan to change this behavior ? (or add a new STRICT_xxx mode ?) Regard, Jérôme.

2 3

[Maria-developers] GCC7 warnings
by Reindl Harald 24 Sep '17

24 Sep '17

hard to say how serious they are but maybe a good idea to take a look /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/mariadb_config/mariadb_config.c:9:49: warning: backslash and newline separated by space #define LIBS "-L/usr/lib64/mysql/ -lmariadb "\ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/mariadb_lib.c: In function 'mariadb_get_infov': /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/mariadb_lib.c:3872:30: warning: this statement may fall through [-Wimplicit-fallthrough=] *((unsigned long *)arg)= mysql->client_flag; ~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/mariadb_lib.c:3875:3: note: here default: ^~~~~~~ In file included from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/plugin/handler_socket/libhsclient/hstcpcli.cpp:13:0: /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/plugin/handler_socket/libhsclient/hstcpcli.hpp:33:14: warning: 'template<class> class std::auto_ptr' is deprecated [-Wdeprecated-declarations] typedef std::auto_ptr<hstcpcli_i> hstcpcli_ptr; ^~~~~~~~ In file included from /usr/include/c++/7/memory:80:0, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/plugin/handler_socket/libhsclient/hstcpcli.hpp:15, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/plugin/handler_socket/libhsclient/hstcpcli.cpp:13: /usr/include/c++/7/bits/unique_ptr.h:51:28: note: declared here template<typename> class auto_ptr; /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/ma_dtoa.c: In function 'dtoa': /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/ma_dtoa.c:1465:14: warning: this statement may fall through [-Wimplicit-fallthrough=] leftright= 0; ~~~~~~~~~^~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/ma_dtoa.c:1467:3: note: here case 4: ^~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/ma_dtoa.c:1473:14: warning: this statement may fall through [-Wimplicit-fallthrough=] leftright= 0; ~~~~~~~~~^~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/ma_dtoa.c:1475:3: note: here case 5: ^~~~ At top level: /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/ma_dtoa.c:1161:21: warning: 'tinytens' defined but not used [-Wunused-const-variable=] static const double tinytens[]= ^~~~~~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/mariadb_dyncol.c: In function 'mariadb_dyncol_val_double': /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/mariadb_dyncol.c:4044:7: warning: this statement may fall through [-Wimplicit-fallthrough=] { ^ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/mariadb_dyncol.c:4060:5: note: here case DYN_COL_DATETIME: ^~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/mariadb_dyncol.c:4050:15: warning: argument 1 null where non-null expected [-Wnonnull] *dbl= strtod(str, &end); ^~~~~~~~~~~~~~~~~ In file included from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/include/ma_global.h:168:0, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/libmariadb/mariadb_dyncol.c:64: /usr/include/stdlib.h:126:15: note: in a call to function 'strtod' declared here extern double strtod (const char *__restrict __nptr, ^~~~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/unittest/libmariadb/t_aurora.c: In function 'test_reconnect': /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/libmariadb/unittest/libmariadb/t_aurora.c:100:3: warning: ignoring return value of 'system', declared with attribute warn_unused_result [-Wunused-result] system("/usr/local/aws/bin/aws rds failover-db-cluster --db-cluster-identifier instance-1-cluster"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/mysys/my_lib.c: In function 'my_dir': /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/mysys/my_lib.c:144:3: warning: 'readdir_r' is deprecated [-Wdeprecated-declarations] while (!(READDIR(dirp,(struct dirent*) dirent_tmp,dp))) ^~~~~ In file included from /usr/include/features.h:410:0, from /usr/include/pthread.h:21, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/my_global.h:278, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/mysys/mysys_priv.h:19, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/mysys/my_lib.c:19: /usr/include/dirent.h:189:12: note: declared here extern int __REDIRECT (readdir_r, /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/myisamchk.c: In function 'myisamchk': /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/myisamchk.c:1411:22: warning: '%ld' directive writing between 1 and 10 bytes into a region of size 8 [-Wformat-overflow=] sprintf(null_pos,"%ld",(long) keyseg->null_pos+1); ^~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/myisamchk.c:1411:21: note: directive argument in the range [1, 4294967296] sprintf(null_pos,"%ld",(long) keyseg->null_pos+1); ^~~~~ In file included from /usr/include/stdio.h:939:0, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/my_global.h:322, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/my_base.h:23, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/myisam.h:26, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/myisamdef.h:20, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/fulltext.h:21, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/myisamchk.c:18: /usr/include/bits/stdio2.h:33:10: note: '__builtin___sprintf_chk' output between 2 and 11 bytes into a destination of size 8 return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ __bos (__s), __fmt, __va_arg_pack ()); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/mi_test3.c: In function 'test_write': /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/mi_test3.c:367:30: warning: '%7ld' directive writing between 7 and 11 bytes into a region of size 8 [-Wformat-overflow=] sprintf((char*) record.id,"%7ld",(long) getpid()); ^~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/mi_test3.c:367:29: note: directive argument in the range [-2147483648, 2147483647] sprintf((char*) record.id,"%7ld",(long) getpid()); ^~~~~~ In file included from /usr/include/stdio.h:939:0, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/my_global.h:322, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/my_base.h:23, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/myisam.h:26, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/myisam/mi_test3.c:20: /usr/include/bits/stdio2.h:33:10: note: '__builtin___sprintf_chk' output between 8 and 12 bytes into a destination of size 8 return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ __bos (__s), __fmt, __va_arg_pack ()); /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/maria_chk.c: In function 'maria_chk': /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/maria_chk.c:1703:22: warning: '%ld' directive writing between 1 and 10 bytes into a region of size 8 [-Wformat-overflow=] sprintf(null_pos,"%ld",(long) keyseg->null_pos+1); ^~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/maria_chk.c:1703:21: note: directive argument in the range [1, 4294967296] sprintf(null_pos,"%ld",(long) keyseg->null_pos+1); ^~~~~ In file included from /usr/include/stdio.h:939:0, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/my_global.h:322, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/my_base.h:23, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/maria.h:22, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/maria_def.h:18, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/ma_fulltext.h:20, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/maria_chk.c:18: /usr/include/bits/stdio2.h:33:10: note: '__builtin___sprintf_chk' output between 2 and 11 bytes into a destination of size 8 return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ __bos (__s), __fmt, __va_arg_pack ()); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/ma_test3.c: In function 'test_write': /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/ma_test3.c:365:30: warning: '%7ld' directive writing between 7 and 11 bytes into a region of size 8 [-Wformat-overflow=] sprintf((char*) record.id,"%7ld", (long) getpid()); ^~~~ /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/ma_test3.c:365:29: note: directive argument in the range [-2147483648, 2147483647] sprintf((char*) record.id,"%7ld", (long) getpid()); ^~~~~~ In file included from /usr/include/stdio.h:939:0, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/my_global.h:322, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/my_base.h:23, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/include/maria.h:22, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/maria_def.h:18, from /home/builduser/rpmbuild/BUILD/mariadb-10.2.8/storage/maria/ma_test3.c:20: /usr/include/bits/stdio2.h:33:10: note: '__builtin___sprintf_chk' output between 8 and 12 bytes into a destination of size 8 return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ __bos (__s), __fmt, __va_arg_pack ()); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

Re: [Maria-developers] [Commits] 2846574452e: MDEV-11553 Can't restore a PERSISTENT column that uses DATE_FORMAT()
by Alexander Barkov 23 Sep '17

23 Sep '17

Hello Sergei, Ok to push. One small suggestion. Instead of having a standalone function, please move get_locale as method in Item. Something like this: const MY_LOCALE *Item::get_locale() { StringBuffer<MAX_FIELD_WIDTH> tmp; String *locale_name= val_str_ascii(&tmp); const MY_LOCALE *lc; if (!locale_name || !(lc= my_locale_by_name(locale_name->c_ptr_safe()))) { THD *thd= current_thd; push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_LOCALE, ER_THD(thd, ER_UNKNOWN_LOCALE), locale_name ? locale_name->c_ptr_safe() : "NULL"); lc= &my_locale_en_US; } return lc; } Thanks! On 09/22/2017 10:30 PM, serg(a)mariadb.org wrote: > revision-id: 2846574452e82b9f391ca5d41d5021ac94730dec (base-0.6-627-g2846574452e) > parent(s): 5a8b6e38967f1e4aa7fe4885e54ee8ea44097e8e > author: Sergei Golubchik > committer: Sergei Golubchik > timestamp: 2017-09-22 20:24:53 +0200 > message: > > MDEV-11553 Can't restore a PERSISTENT column that uses DATE_FORMAT() > > 3-argument form of DATE_FORMAT > > --- > mysql-test/r/locale.result | 71 +++++++++++++++++++++- > .../suite/vcol/r/vcol_blocked_sql_funcs.result | 2 + > .../suite/vcol/r/vcol_supported_sql_funcs.result | 15 +++++ > .../suite/vcol/t/vcol_blocked_sql_funcs_main.inc | 3 + > .../suite/vcol/t/vcol_supported_sql_funcs_main.inc | 6 ++ > mysql-test/t/locale.test | 28 +++++++++ > sql/item_create.cc | 27 +------- > sql/item_strfunc.cc | 10 +-- > sql/item_strfunc.h | 4 +- > sql/item_timefunc.cc | 25 ++++++-- > sql/item_timefunc.h | 27 +++++--- > sql/lex.h | 1 + > sql/sql_yacc.yy | 16 ++++- > sql/sql_yacc_ora.yy | 16 ++++- > 14 files changed, 202 insertions(+), 49 deletions(-) > > diff --git a/mysql-test/r/locale.result b/mysql-test/r/locale.result > index a02e80ed21e..b750d038205 100644 > --- a/mysql-test/r/locale.result > +++ b/mysql-test/r/locale.result > @@ -229,15 +229,80 @@ SET lc_time_names=@old_50915_lc_time_names; > # End of 10.1 tests > # > create view v1 as select > +date_format('2001-10-02', '%c %b %M') as a, > +date_format('2001-10-02', '%c %b %M', 'ru_RU') as a1, > format(123456789,2) as b, > format(123456789,2,'rm_CH') as b1; > select * from v1; > -b b1 > -123,456,789.00 123'456'789,00 > +a a1 b b1 > +10 Oct October 10 Окт Октября 123,456,789.00 123'456'789,00 > 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 format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1` utf8 utf8_general_ci > +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select date_format('2001-10-02','%c %b %M') AS `a`,date_format('2001-10-02','%c %b %M','ru_RU') AS `a1`,format(123456789,2) AS `b`,format(123456789,2,'rm_CH') AS `b1` utf8 utf8_general_ci > drop view v1; > # > # End of 10.2 tests > # > +select date_format('2001-01-01', '%w %a %W', 'ro_RO'); > +date_format('2001-01-01', '%w %a %W', 'ro_RO') > +1 Lu Luni > +select date_format('2001-01-03', '%w %a %W', 'ro_RO'); > +date_format('2001-01-03', '%w %a %W', 'ro_RO') > +3 Mi Miercuri > +select date_format('2001-01-05', '%w %a %W', 'ro_RO'); > +date_format('2001-01-05', '%w %a %W', 'ro_RO') > +5 Vi Vineri > +select date_format('2001-01-07', '%w %a %W', 'ro_RO'); > +date_format('2001-01-07', '%w %a %W', 'ro_RO') > +0 Du Duminică > +select date_format('2001-01-01', '%w %a %W', 'de_AT'); > +date_format('2001-01-01', '%w %a %W', 'de_AT') > +1 Mon Montag > +select date_format('2001-02-01', '%w %a %W', 'de_AT'); > +date_format('2001-02-01', '%w %a %W', 'de_AT') > +4 Don Donnerstag > +select date_format('2001-03-01', '%w %a %W', 'de_AT'); > +date_format('2001-03-01', '%w %a %W', 'de_AT') > +4 Don Donnerstag > +select date_format('2001-01-01', '%w %a %W', 'en_US'); > +date_format('2001-01-01', '%w %a %W', 'en_US') > +1 Mon Monday > +select date_format('2001-03-01', '%c %b %M', 'en_US'); > +date_format('2001-03-01', '%c %b %M', 'en_US') > +3 Mar March > +select date_format('2001-01-01', '%w %a %W', 'rm_CH'); > +date_format('2001-01-01', '%w %a %W', 'rm_CH') > +1 gli glindesdi > +select date_format('2001-01-03', '%w %a %W', 'rm_CH'); > +date_format('2001-01-03', '%w %a %W', 'rm_CH') > +3 me mesemna > +select date_format('2001-01-05', '%w %a %W', 'rm_CH'); > +date_format('2001-01-05', '%w %a %W', 'rm_CH') > +5 ve venderdi > +select date_format('2001-01-07', '%w %a %W', 'rm_CH'); > +date_format('2001-01-07', '%w %a %W', 'rm_CH') > +0 du dumengia > +select date_format('2001-02-01', '%c %b %M', 'rm_CH'); > +date_format('2001-02-01', '%c %b %M', 'rm_CH') > +2 favr favrer > +select date_format('2001-04-01', '%c %b %M', 'rm_CH'); > +date_format('2001-04-01', '%c %b %M', 'rm_CH') > +4 avr avrigl > +select date_format('2001-06-01', '%c %b %M', 'rm_CH'); > +date_format('2001-06-01', '%c %b %M', 'rm_CH') > +6 zercl zercladur > +select date_format('2001-08-01', '%c %b %M', 'rm_CH'); > +date_format('2001-08-01', '%c %b %M', 'rm_CH') > +8 avust avust > +select date_format('2001-10-01', '%c %b %M', 'rm_CH'); > +date_format('2001-10-01', '%c %b %M', 'rm_CH') > +10 oct october > +select date_format('2001-12-01', '%c %b %M', 'rm_CH'); > +date_format('2001-12-01', '%c %b %M', 'rm_CH') > +12 dec december > +select date_format('2001-01-06', '%w %a %W', 'de_CH'); > +date_format('2001-01-06', '%w %a %W', 'de_CH') > +6 Sa Samstag > +select date_format('2001-09-01', '%c %b %M', 'de_CH'); > +date_format('2001-09-01', '%c %b %M', 'de_CH') > +9 Sep September > diff --git a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result > index 6605f7c99b4..2d5bcfe553d 100644 > --- a/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result > +++ b/mysql-test/suite/vcol/r/vcol_blocked_sql_funcs.result > @@ -247,3 +247,5 @@ ERROR HY000: Expression in the GENERATED ALWAYS AS clause is too big > # Constant expression > create or replace table t1 (a int as (PI()) PERSISTENT); > drop table if exists t1; > +create table t1 (a timestamp, b varchar(255) as (date_format(a, '%w %a %m %b')) stored); > +ERROR HY000: Function or expression 'date_format()' cannot be used in the GENERATED ALWAYS AS clause of `b` > diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result > index 3fa4f6e1431..10ab32f9486 100644 > --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result > +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result > @@ -2894,6 +2894,21 @@ a b > 2012-12-12 Wednesday Wed December Dec > drop table t1; > set sql_warnings = 0; > +# DATE_FORMAT() STORED > +set sql_warnings = 1; > +create table t1 (a date, b varchar(100) as (date_format(a, '%W %a %M %b', 'de_DE')) STORED); > +show create table t1; > +Table Create Table > +t1 CREATE TABLE `t1` ( > + `a` date DEFAULT NULL, > + `b` varchar(100) GENERATED ALWAYS AS (date_format(`a`,'%W %a %M %b','de_DE')) STORED > +) ENGINE=MyISAM DEFAULT CHARSET=latin1 > +insert into t1 values ('2012-12-12',default); > +select * from t1; > +a b > +2012-12-12 Mittwoch Mi Dezember Dez > +drop table t1; > +set sql_warnings = 0; > # CURRENT_USER() > set sql_warnings = 1; > create table t1 (a char, b varchar(32) as (current_user())); > diff --git a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc > index 766d0c7410c..37de02a2b29 100644 > --- a/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc > +++ b/mysql-test/suite/vcol/t/vcol_blocked_sql_funcs_main.inc > @@ -354,3 +354,6 @@ eval create or replace table t1 (a int, b varchar(16384) as (concat(a,'$tmp_long > create or replace table t1 (a int as (PI()) PERSISTENT); > > drop table if exists t1; > + > +--error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED > +create table t1 (a timestamp, b varchar(255) as (date_format(a, '%w %a %m %b')) stored); > diff --git a/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_main.inc b/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_main.inc > index dafc42098dd..fa2162e5981 100644 > --- a/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_main.inc > +++ b/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_main.inc > @@ -1197,6 +1197,12 @@ let $values1 = '2012-12-12',default; > let $rows = 1; > --source suite/vcol/inc/vcol_supported_sql_funcs.inc > > +--echo # DATE_FORMAT() STORED > +let $cols = a date, b varchar(100) as (date_format(a, '%W %a %M %b', 'de_DE')) STORED; > +let $values1 = '2012-12-12',default; > +let $rows = 1; > +--source suite/vcol/inc/vcol_supported_sql_funcs.inc > + > --echo # CURRENT_USER() > let $cols = a char, b varchar(32) as (current_user()); > let $values1 = 'a', default; > diff --git a/mysql-test/t/locale.test b/mysql-test/t/locale.test > index 4570b968ecf..a9a507bc387 100644 > --- a/mysql-test/t/locale.test > +++ b/mysql-test/t/locale.test > @@ -144,6 +144,8 @@ SET lc_time_names=@old_50915_lc_time_names; > > # Item::print > create view v1 as select > + date_format('2001-10-02', '%c %b %M') as a, > + date_format('2001-10-02', '%c %b %M', 'ru_RU') as a1, > format(123456789,2) as b, > format(123456789,2,'rm_CH') as b1; > select * from v1; > @@ -153,3 +155,29 @@ drop view v1; > --echo # > --echo # End of 10.2 tests > --echo # > + > +# > +# MDEV-11553 Can't restore a PERSISTENT column that uses DATE_FORMAT() > +# > +# 3-argument syntax for DATE_FORMAT() > +select date_format('2001-01-01', '%w %a %W', 'ro_RO'); > +select date_format('2001-01-03', '%w %a %W', 'ro_RO'); > +select date_format('2001-01-05', '%w %a %W', 'ro_RO'); > +select date_format('2001-01-07', '%w %a %W', 'ro_RO'); > +select date_format('2001-01-01', '%w %a %W', 'de_AT'); > +select date_format('2001-02-01', '%w %a %W', 'de_AT'); > +select date_format('2001-03-01', '%w %a %W', 'de_AT'); > +select date_format('2001-01-01', '%w %a %W', 'en_US'); > +select date_format('2001-03-01', '%c %b %M', 'en_US'); > +select date_format('2001-01-01', '%w %a %W', 'rm_CH'); > +select date_format('2001-01-03', '%w %a %W', 'rm_CH'); > +select date_format('2001-01-05', '%w %a %W', 'rm_CH'); > +select date_format('2001-01-07', '%w %a %W', 'rm_CH'); > +select date_format('2001-02-01', '%c %b %M', 'rm_CH'); > +select date_format('2001-04-01', '%c %b %M', 'rm_CH'); > +select date_format('2001-06-01', '%c %b %M', 'rm_CH'); > +select date_format('2001-08-01', '%c %b %M', 'rm_CH'); > +select date_format('2001-10-01', '%c %b %M', 'rm_CH'); > +select date_format('2001-12-01', '%c %b %M', 'rm_CH'); > +select date_format('2001-01-06', '%w %a %W', 'de_CH'); > +select date_format('2001-09-01', '%c %b %M', 'de_CH'); > diff --git a/sql/item_create.cc b/sql/item_create.cc > index e0bfe7a4402..88c1ac1f64f 100644 > --- a/sql/item_create.cc > +++ b/sql/item_create.cc > @@ -770,19 +770,6 @@ class Create_func_crosses : public Create_func_arg2 > #endif > > > -class Create_func_date_format : public Create_func_arg2 > -{ > -public: > - virtual Item *create_2_arg(THD *thd, Item *arg1, Item *arg2); > - > - static Create_func_date_format s_singleton; > - > -protected: > - Create_func_date_format() {} > - virtual ~Create_func_date_format() {} > -}; > - > - > class Create_func_datediff : public Create_func_arg2 > { > public: > @@ -4023,15 +4010,6 @@ Create_func_crosses::create_2_arg(THD *thd, Item *arg1, Item *arg2) > #endif > > > -Create_func_date_format Create_func_date_format::s_singleton; > - > -Item* > -Create_func_date_format::create_2_arg(THD *thd, Item *arg1, Item *arg2) > -{ > - return new (thd->mem_root) Item_func_date_format(thd, arg1, arg2, 0); > -} > - > - > Create_func_datediff Create_func_datediff::s_singleton; > > Item* > @@ -4530,7 +4508,7 @@ Create_func_from_unixtime::create_native(THD *thd, LEX_CSTRING *name, > Item *param_1= item_list->pop(); > Item *param_2= item_list->pop(); > Item *ut= new (thd->mem_root) Item_func_from_unixtime(thd, param_1); > - func= new (thd->mem_root) Item_func_date_format(thd, ut, param_2, 0); > + func= new (thd->mem_root) Item_func_date_format(thd, ut, param_2); > break; > } > default: > @@ -6483,7 +6461,7 @@ Create_func_time_format Create_func_time_format::s_singleton; > Item* > Create_func_time_format::create_2_arg(THD *thd, Item *arg1, Item *arg2) > { > - return new (thd->mem_root) Item_func_date_format(thd, arg1, arg2, 1); > + return new (thd->mem_root) Item_func_time_format(thd, arg1, arg2); > } > > > @@ -6844,7 +6822,6 @@ static Native_func_registry func_array[] = > { { C_STRING_WITH_LEN("CRC32") }, BUILDER(Create_func_crc32)}, > { { C_STRING_WITH_LEN("CROSSES") }, GEOM_BUILDER(Create_func_crosses)}, > { { C_STRING_WITH_LEN("DATEDIFF") }, BUILDER(Create_func_datediff)}, > - { { C_STRING_WITH_LEN("DATE_FORMAT") }, BUILDER(Create_func_date_format)}, > { { C_STRING_WITH_LEN("DAYNAME") }, BUILDER(Create_func_dayname)}, > { { C_STRING_WITH_LEN("DAYOFMONTH") }, BUILDER(Create_func_dayofmonth)}, > { { C_STRING_WITH_LEN("DAYOFWEEK") }, BUILDER(Create_func_dayofweek)}, > diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc > index 83432f95612..3e12a545c97 100644 > --- a/sql/item_strfunc.cc > +++ b/sql/item_strfunc.cc > @@ -2668,11 +2668,11 @@ String *Item_func_soundex::val_str(String *str) > const int FORMAT_MAX_DECIMALS= 30; > > > -MY_LOCALE *Item_func_format::get_locale(Item *item) > +const MY_LOCALE *get_locale(Item *item) > { > - DBUG_ASSERT(arg_count == 3); > - String tmp, *locale_name= args[2]->val_str_ascii(&tmp); > - MY_LOCALE *lc; > + StringBuffer<MAX_FIELD_WIDTH> tmp; > + String *locale_name= item->val_str_ascii(&tmp); > + const MY_LOCALE *lc; > if (!locale_name || > !(lc= my_locale_by_name(locale_name->c_ptr_safe()))) > { > @@ -2712,7 +2712,7 @@ String *Item_func_format::val_str_ascii(String *str) > int dec; > /* Number of characters used to represent the decimals, including '.' */ > uint32 dec_length; > - MY_LOCALE *lc; > + const MY_LOCALE *lc; > DBUG_ASSERT(fixed == 1); > > dec= (int) args[1]->val_int(); > diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h > index 685a64816be..542af13df5c 100644 > --- a/sql/item_strfunc.h > +++ b/sql/item_strfunc.h > @@ -28,6 +28,7 @@ > extern size_t username_char_length; > > class MY_LOCALE; > +const MY_LOCALE *get_locale(Item *item); > > class Item_str_func :public Item_func > { > @@ -932,14 +933,13 @@ class Item_func_make_set :public Item_str_func > > class Item_func_format :public Item_str_ascii_func > { > - MY_LOCALE *locale; > + const MY_LOCALE *locale; > public: > Item_func_format(THD *thd, Item *org, Item *dec): > Item_str_ascii_func(thd, org, dec) {} > Item_func_format(THD *thd, Item *org, Item *dec, Item *lang): > Item_str_ascii_func(thd, org, dec, lang) {} > > - MY_LOCALE *get_locale(Item *item); > String *val_str_ascii(String *); > void fix_length_and_dec(); > const char *func_name() const { return "format"; } > diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc > index 86bde00cced..5e660c58583 100644 > --- a/sql/item_timefunc.cc > +++ b/sql/item_timefunc.cc > @@ -455,7 +455,8 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, > */ > > static bool make_date_time(DATE_TIME_FORMAT *format, MYSQL_TIME *l_time, > - timestamp_type type, MY_LOCALE *locale, String *str) > + timestamp_type type, const MY_LOCALE *locale, > + String *str) > { > char intbuff[15]; > uint hours_i; > @@ -1833,7 +1834,14 @@ bool Item_func_sec_to_time::get_date(MYSQL_TIME *ltime, ulonglong fuzzy_date) > void Item_func_date_format::fix_length_and_dec() > { > THD* thd= current_thd; > - locale= thd->variables.lc_time_names; > + if (!is_time_format) > + { > + if (arg_count < 3) > + locale= thd->variables.lc_time_names; > + else > + if (args[2]->basic_const_item()) > + locale= get_locale(args[2]); > + } > > /* > Must use this_item() in case it's a local SP variable > @@ -1875,6 +1883,8 @@ bool Item_func_date_format::eq(const Item *item, bool binary_cmp) const > if (this == item) > return 1; > item_func= (Item_func_date_format*) item; > + if (arg_count != item_func->arg_count) > + return 0; > if (!args[0]->eq(item_func->args[0], binary_cmp)) > return 0; > /* > @@ -1884,6 +1894,8 @@ bool Item_func_date_format::eq(const Item *item, bool binary_cmp) const > */ > if (!args[1]->eq(item_func->args[1], 1)) > return 0; > + if (arg_count > 2 && !args[2]->eq(item_func->args[2], 1)) > + return 0; > return 1; > } > > @@ -1967,15 +1979,18 @@ String *Item_func_date_format::val_str(String *str) > String *format; > MYSQL_TIME l_time; > uint size; > - int is_time_flag = is_time_format ? TIME_TIME_ONLY : 0; > + const MY_LOCALE *lc= 0; > DBUG_ASSERT(fixed == 1); > > - if (get_arg0_date(&l_time, is_time_flag)) > + if (get_arg0_date(&l_time, is_time_format ? TIME_TIME_ONLY : 0)) > return 0; > > if (!(format = args[1]->val_str(str)) || !format->length()) > goto null_date; > > + if (!is_time_format && !(lc= locale) && !(lc= get_locale(args[2]))) > + goto null_date; // invalid locale > + > if (fixed_length) > size=max_length; > else > @@ -1998,7 +2013,7 @@ String *Item_func_date_format::val_str(String *str) > if (!make_date_time(&date_time_format, &l_time, > is_time_format ? MYSQL_TIMESTAMP_TIME : > MYSQL_TIMESTAMP_DATE, > - locale, str)) > + lc, str)) > return str; > > null_date: > diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h > index 7d2fe46b644..20ecb4774b3 100644 > --- a/sql/item_timefunc.h > +++ b/sql/item_timefunc.h > @@ -797,22 +797,24 @@ class Item_func_from_days :public Item_datefunc > > class Item_func_date_format :public Item_str_func > { > - MY_LOCALE *locale; > + const MY_LOCALE *locale; > int fixed_length; > - const bool is_time_format; > String value; > +protected: > + bool is_time_format; > public: > - Item_func_date_format(THD *thd, Item *a, Item *b, bool is_time_format_arg): > - Item_str_func(thd, a, b), is_time_format(is_time_format_arg) {} > + Item_func_date_format(THD *thd, Item *a, Item *b): > + Item_str_func(thd, a, b), locale(0), is_time_format(false) {} > + Item_func_date_format(THD *thd, Item *a, Item *b, Item *c): > + Item_str_func(thd, a, b, c), locale(0), is_time_format(false) {} > String *val_str(String *str); > - const char *func_name() const > - { return is_time_format ? "time_format" : "date_format"; } > + const char *func_name() const { return "date_format"; } > void fix_length_and_dec(); > uint format_length(const String *format); > bool eq(const Item *item, bool binary_cmp) const; > bool check_vcol_func_processor(void *arg) > { > - if (is_time_format) > + if (arg_count > 2) > return false; > return mark_unsupported_function(func_name(), "()", arg, VCOL_SESSION_FUNC); > } > @@ -820,6 +822,17 @@ class Item_func_date_format :public Item_str_func > { return get_item_copy<Item_func_date_format>(thd, mem_root, this); } > }; > > +class Item_func_time_format: public Item_func_date_format > +{ > +public: > + Item_func_time_format(THD *thd, Item *a, Item *b): > + Item_func_date_format(thd, a, b) { is_time_format= true; } > + const char *func_name() const { return "time_format"; } > + bool check_vcol_func_processor(void *arg) { return false; } > + Item *get_copy(THD *thd, MEM_ROOT *mem_root) > + { return get_item_copy<Item_func_time_format>(thd, mem_root, this); } > +}; > + > > class Item_func_from_unixtime :public Item_datetimefunc > { > diff --git a/sql/lex.h b/sql/lex.h > index f2dac95fce5..67c3bc8620d 100644 > --- a/sql/lex.h > +++ b/sql/lex.h > @@ -726,6 +726,7 @@ static SYMBOL sql_functions[] = { > { "CURTIME", SYM(CURTIME)}, > { "DATE_ADD", SYM(DATE_ADD_INTERVAL)}, > { "DATE_SUB", SYM(DATE_SUB_INTERVAL)}, > + { "DATE_FORMAT", SYM(DATE_FORMAT_SYM)}, > { "DECODE", SYM(DECODE_SYM)}, > { "DENSE_RANK", SYM(DENSE_RANK_SYM)}, > { "EXTRACT", SYM(EXTRACT_SYM)}, > diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy > index 7e89ad91a17..17d6f016b2c 100644 > --- a/sql/sql_yacc.yy > +++ b/sql/sql_yacc.yy > @@ -875,7 +875,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); > Comments for TOKENS. > For each token, please include in the same line a comment that contains > the following tags: > - SQL-2011-N : Non Reserved keywird as per SQL-2011 > + SQL-2011-N : Non Reserved keyword as per SQL-2011 > SQL-2003-R : Reserved keyword as per SQL-2003 > SQL-2003-N : Non Reserved keyword as per SQL-2003 > SQL-1999-R : Reserved keyword as per SQL-1999 > @@ -1010,6 +1010,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); > %token DATA_SYM /* SQL-2003-N */ > %token DATETIME > %token DATE_ADD_INTERVAL /* MYSQL-FUNC */ > +%token DATE_FORMAT_SYM /* MYSQL-FUNC */ > %token DATE_SUB_INTERVAL /* MYSQL-FUNC */ > %token DATE_SYM /* SQL-2003-R */ > %token DAY_HOUR_SYM > @@ -9806,6 +9807,18 @@ function_call_nonkeyword: > if ($$ == NULL) > MYSQL_YYABORT; > } > + | DATE_FORMAT_SYM '(' expr ',' expr ')' > + { > + $$= new (thd->mem_root) Item_func_date_format(thd, $3, $5); > + if ($$ == NULL) > + MYSQL_YYABORT; > + } > + | DATE_FORMAT_SYM '(' expr ',' expr ',' expr ')' > + { > + $$= new (thd->mem_root) Item_func_date_format(thd, $3, $5, $7); > + if ($$ == NULL) > + MYSQL_YYABORT; > + } > | DECODE_SYM '(' expr ',' expr ')' > { > $$= new (thd->mem_root) Item_func_decode(thd, $3, $5); > @@ -14719,6 +14732,7 @@ keyword_sp_not_data_type: > | CYCLE_SYM {} > | DATA_SYM {} > | DATAFILE_SYM {} > + | DATE_FORMAT_SYM {} > | DAY_SYM {} > | DECODE_SYM {} > | DEFINER_SYM {} > diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy > index a475914d369..54ddd3ae922 100644 > --- a/sql/sql_yacc_ora.yy > +++ b/sql/sql_yacc_ora.yy > @@ -284,7 +284,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); > Comments for TOKENS. > For each token, please include in the same line a comment that contains > the following tags: > - SQL-2011-N : Non Reserved keywird as per SQL-2011 > + SQL-2011-N : Non Reserved keyword as per SQL-2011 > SQL-2003-R : Reserved keyword as per SQL-2003 > SQL-2003-N : Non Reserved keyword as per SQL-2003 > SQL-1999-R : Reserved keyword as per SQL-1999 > @@ -419,6 +419,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); > %token DATA_SYM /* SQL-2003-N */ > %token DATETIME > %token DATE_ADD_INTERVAL /* MYSQL-FUNC */ > +%token DATE_FORMAT_SYM /* MYSQL-FUNC */ > %token DATE_SUB_INTERVAL /* MYSQL-FUNC */ > %token DATE_SYM /* SQL-2003-R */ > %token DAY_HOUR_SYM > @@ -9462,6 +9463,18 @@ column_default_non_parenthesized_expr: > if ($$ == NULL) > MYSQL_YYABORT; > } > + | DATE_FORMAT_SYM '(' expr ',' expr ')' > + { > + $$= new (thd->mem_root) Item_func_date_format(thd, $3, $5); > + if ($$ == NULL) > + MYSQL_YYABORT; > + } > + | DATE_FORMAT_SYM '(' expr ',' expr ',' expr ')' > + { > + $$= new (thd->mem_root) Item_func_date_format(thd, $3, $5, $7); > + if ($$ == NULL) > + MYSQL_YYABORT; > + } > | DECODE_SYM '(' expr ',' decode_when_list ')' > { > $5->push_front($3, thd->mem_root); > @@ -14893,6 +14906,7 @@ keyword_sp_not_data_type: > | CYCLE_SYM {} > | DATA_SYM {} > | DATAFILE_SYM {} > + | DATE_FORMAT_SYM {} > | DAY_SYM {} > | DECODE_SYM {} > | DEFINER_SYM {} > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits >

1 0

Re: [Maria-developers] [Commits] c132349bc79: MDEV-11846: ERROR 1114 (HY000) table full when performing GROUP BY
by Sergey Petrunia 21 Sep '17

21 Sep '17

Hi Varun, Ok to push. On Fri, Sep 15, 2017 at 01:28:53PM +0530, Varun wrote: > revision-id: c132349bc79d987947c8659e71601914cfec71e8 (mariadb-10.1.23-156-gc132349bc79) > parent(s): fa2701c6f7b028782cf231565f578b2fc0f10d51 > author: Varun Gupta > committer: Varun Gupta > timestamp: 2017-09-15 13:27:11 +0530 > message: > > MDEV-11846: ERROR 1114 (HY000) table full when performing GROUP BY > > The problem is there is an overflow for the key_file_length. > Added the maximum limit for the key_file_length > > --- > storage/maria/ma_create.c | 41 +++++++++++++++++++++++++++++++++-------- > 1 file changed, 33 insertions(+), 8 deletions(-) > > diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c > index 0ddd8b226e2..79e60a76abc 100644 > --- a/storage/maria/ma_create.c > +++ b/storage/maria/ma_create.c > @@ -660,11 +660,24 @@ int maria_create(const char *name, enum data_file_type datafile_type, > > if (length > max_key_length) > max_key_length= length; > - tot_length+= ((max_rows/(ulong) (((uint) maria_block_size - > + > + if (tot_length == ULLONG_MAX) > + continue; > + > + ulonglong tot_length_part= (max_rows/(ulong) (((uint) maria_block_size - > MAX_KEYPAGE_HEADER_SIZE - > KEYPAGE_CHECKSUM_SIZE)/ > - (length*2))) * > - maria_block_size); > + (length*2))); > + if (tot_length_part >= (ULLONG_MAX / maria_block_size + > + ULLONG_MAX % maria_block_size)) > + tot_length= ULLONG_MAX; > + else > + { > + if (tot_length > ULLONG_MAX - tot_length_part * maria_block_size) > + tot_length= ULLONG_MAX; > + else > + tot_length+= tot_length_part * maria_block_size; > + } > } > > unique_key_parts=0; > @@ -673,11 +686,24 @@ int maria_create(const char *name, enum data_file_type datafile_type, > uniquedef->key=keys+i; > unique_key_parts+=uniquedef->keysegs; > share.state.key_root[keys+i]= HA_OFFSET_ERROR; > - tot_length+= (max_rows/(ulong) (((uint) maria_block_size - > + > + if (tot_length == ULLONG_MAX) > + continue; > + ulonglong tot_length_part= (max_rows/(ulong) (((uint) maria_block_size - > MAX_KEYPAGE_HEADER_SIZE - > KEYPAGE_CHECKSUM_SIZE) / > - ((MARIA_UNIQUE_HASH_LENGTH + pointer)*2)))* > - (ulong) maria_block_size; > + ((MARIA_UNIQUE_HASH_LENGTH + pointer)*2))); > + > + if (tot_length_part >= (ULLONG_MAX / maria_block_size + > + ULLONG_MAX % maria_block_size)) > + tot_length= ULLONG_MAX; > + else > + { > + if (tot_length > ULLONG_MAX - tot_length_part * maria_block_size) > + tot_length= ULLONG_MAX; > + else > + tot_length+= tot_length_part * maria_block_size; > + } > } > keys+=uniques; /* Each unique has 1 key */ > key_segs+=uniques; /* Each unique has 1 key seg */ > @@ -746,8 +772,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, > Get estimate for index file length (this may be wrong for FT keys) > This is used for pointers to other key pages. > */ > - tmp= (tot_length + maria_block_size * keys * > - MARIA_INDEX_BLOCK_MARGIN) / maria_block_size; > + tmp= (tot_length / maria_block_size + keys * MARIA_INDEX_BLOCK_MARGIN); > > /* > use maximum of key_file_length we calculated and key_file_length value we > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits -- BR Sergei -- Sergei Petrunia, Software Developer MariaDB Corporation | Skype: sergefp | Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] [Commits] 0319ee58fbb: MDEV-13290: Assertion Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())' or `! is_set()' failed
by Alexander Barkov 19 Sep '17

19 Sep '17

Hi Sanja, The patch looks OK for me. Please find one suggestion below: On 09/19/2017 05:56 PM, Oleksandr Byelkin wrote: > revision-id: 0319ee58fbb6372ccc8533613e0c55666abc948a (mariadb-10.0.32-32-g0319ee58fbb) > parent(s): 389f7cdf3ccd11a6b4fb9b6346436790254e615c > author: Oleksandr Byelkin > committer: Oleksandr Byelkin > timestamp: 2017-09-19 15:55:59 +0200 > message: > > MDEV-13290: Assertion Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())' or `! is_set()' failed > > Check error status which can be set by conversion procedures. > > --- > mysql-test/r/insert.result | 22 ++++++++++++++++++++++ > mysql-test/t/insert.test | 26 ++++++++++++++++++++++++++ > sql/table.cc | 3 +++ > 3 files changed, 51 insertions(+) > > diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result > index 82f3977e231..0efee36e22d 100644 > --- a/mysql-test/r/insert.result > +++ b/mysql-test/r/insert.result > @@ -717,3 +717,25 @@ insert ignore into t1 values (1,12); > Warnings: > Warning 1062 Duplicate entry '1' for key 'f1' > DROP TABLE t1; > +# > +# MDEV-13290 Assertion Assertion `!is_set() || (m_status == DA_OK_BULK > +# && is_bulk_op())' or `! is_set()' failed > +# > +SET @save_mode= @@sql_mode; > +SET sql_mode= 'STRICT_ALL_TABLES'; > +CREATE TABLE t1 (f1 INT DEFAULT 0, f2 INT); > +CREATE ALGORITHM = MERGE VIEW v1 AS SELECT f1, f2 FROM t1 WHERE f1 = 'x' WITH CHECK OPTION; > +REPLACE INTO v1 SET f2 = 1; > +ERROR 22007: Truncated incorrect DOUBLE value: 'x' > +drop view v1; > +CREATE ALGORITHM = MERGE VIEW v1 AS SELECT f1, f2 FROM t1 WHERE f1 = cast('' as decimal) WITH CHECK OPTION; > +REPLACE INTO v1 SET f2 = 1; > +ERROR 22007: Truncated incorrect DECIMAL value: '' > +drop view v1; > +SELECT 0,0 INTO OUTFILE 't1.txt'; > +CREATE ALGORITHM = MERGE VIEW v1 AS SELECT f1, f2 FROM t1 WHERE f1 = 'x' WITH CHECK OPTION; > +LOAD DATA INFILE 't1.txt' INTO TABLE v1; > +ERROR 22007: Truncated incorrect DOUBLE value: 'x' > +drop view v1; > +drop table t1; > +SET @@sql_mode= @save_mode; > diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test > index ff8396fd7fd..d84c0cee90d 100644 > --- a/mysql-test/t/insert.test > +++ b/mysql-test/t/insert.test > @@ -573,3 +573,29 @@ insert ignore into t1 values (1,12) on duplicate key update f2=13; > set @@old_mode=""; > insert ignore into t1 values (1,12); > DROP TABLE t1; > + > +--echo # > +--echo # MDEV-13290 Assertion Assertion `!is_set() || (m_status == DA_OK_BULK > +--echo # && is_bulk_op())' or `! is_set()' failed > +--echo # > + > +SET @save_mode= @@sql_mode; > +SET sql_mode= 'STRICT_ALL_TABLES'; > +CREATE TABLE t1 (f1 INT DEFAULT 0, f2 INT); > +CREATE ALGORITHM = MERGE VIEW v1 AS SELECT f1, f2 FROM t1 WHERE f1 = 'x' WITH CHECK OPTION; > +--error ER_TRUNCATED_WRONG_VALUE > +REPLACE INTO v1 SET f2 = 1; Can you please add "SELECT * FROM t1" here and some other places (see below), to make sure that REPLACE did not actually insert new records. Please see my comments in MDEV. > +drop view v1; > +CREATE ALGORITHM = MERGE VIEW v1 AS SELECT f1, f2 FROM t1 WHERE f1 = cast('' as decimal) WITH CHECK OPTION; > +--error ER_TRUNCATED_WRONG_VALUE > +REPLACE INTO v1 SET f2 = 1; Please add "SELECT * FROM t1". > +drop view v1; > +SELECT 0,0 INTO OUTFILE 't1.txt'; > +CREATE ALGORITHM = MERGE VIEW v1 AS SELECT f1, f2 FROM t1 WHERE f1 = 'x' WITH CHECK OPTION; > +--error ER_TRUNCATED_WRONG_VALUE > +LOAD DATA INFILE 't1.txt' INTO TABLE v1; Please add "SELECT * FROM t1". > +let $MYSQLD_DATADIR= `select @@datadir`; > +remove_file $MYSQLD_DATADIR/test/t1.txt; > +drop view v1; > +drop table t1; > +SET @@sql_mode= @save_mode; > diff --git a/sql/table.cc b/sql/table.cc > index 975d9d53882..ff9c4217b7d 100644 > --- a/sql/table.cc > +++ b/sql/table.cc > @@ -4642,6 +4642,9 @@ int TABLE_LIST::view_check_option(THD *thd, bool ignore_failure) > main_view->view_name.str); > return(VIEW_CHECK_ERROR); > } > + /* We check thd->error() because it can be set by conversion problem. */ > + if (thd->is_error()) > + return(VIEW_CHECK_ERROR); > return(VIEW_CHECK_OK); > } > > _______________________________________________ > commits mailing list > commits(a)mariadb.org > https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits >

1 0