- developers - lists.mariadb.org

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

03 Jul '13

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

2 1

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

02 Jul '13

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

2 6

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

02 Jul '13

1 0

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

02 Jul '13

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

2 1

[Maria-developers] Doubt at query cache resize
by Roberto Spadim 28 Jun '13

28 Jun '13

Hi guys I was trying to compile in windows and warning was displayed at mariadb 10:0:3 in sysvars.cc at line 2235 Ulong new cache size = ulonglong function Could we lost the query cache size? Like a overflow

2 2

Re: [Maria-developers] Please review: EXPLAIN UPDATE patch + refactoring
by Sergei Petrunia 28 Jun '13

28 Jun '13

Now with attachment. On Fri, Jun 28, 2013 at 09:18:56PM +0400, Sergei Petrunia wrote: > Hello Igor, > > Please review the attached patch against current 10.0-base which contains > - EXPLAIN UPDATE/DELETE support > - "Query Plan Footprint" refactoring. > > The tree is at lp:~maria-captains/maria/10.0-base-explain-update-r2 > > BR Sergei -- Sergei Petrunia, Software Developer Monty Program AB, http://askmonty.org Blog: http://s.petrunia.net/blog

1 0

Re: [Maria-developers] Rev 3768: Changed acl_roles to be stored into a HASH
by Sergei 28 Jun '13

28 Jun '13

Hi, Vicențiu! A couple of small notes: On Jun 27, noreply(a)launchpad.net wrote: > ------------------------------------------------------------ > revno: 3768 > committer: Vicențiu Ciorbaru <cvicentiu(a)gmail.com> > branch nick: trunk > timestamp: Fri 2013-06-28 01:20:45 +0300 > message: > Changed acl_roles to be stored into a HASH. > > === modified file 'sql/sql_acl.cc' > --- sql/sql_acl.cc 2013-06-25 21:49:50 +0000 > +++ sql/sql_acl.cc 2013-06-27 22:20:45 +0000 > @@ -51,6 +51,7 @@ > #include "hostname.h" > #include "sql_db.h" > #include "sql_array.h" > +#include "sql_hset.h" You should probably include hash.h not sql_hset.h because you don't use Hash_set<> template. > @@ -520,6 +521,13 @@ > return (uchar*) entry->key; > } > > +uchar* acl_role_get_key(ACL_USER *entry, size_t *length, > + my_bool not_used __attribute__((unused))) > +{ > + *length=(uint) (entry->user ? strlen(entry->user) : 0); You know, we generally try to avoid strlens, especially in a code that's used often, like here. Please, replace char *user; in the ACL_USER with LEX_STRING user; > + return (uchar*) entry->user; > +} > + > #define IP_ADDR_STRLEN (3 + 1 + 3 + 1 + 3 + 1 + 3) > #define ACL_KEY_LENGTH (IP_ADDR_STRLEN + 1 + NAME_LEN + \ > 1 + USERNAME_LENGTH + 1) Regards, Sergei

1 0

Re: [Maria-developers] Review request: mdev-4634
by Alexander Barkov 27 Jun '13

27 Jun '13

Hi Sergei, Please review a small patch that fixes the exact problem reported in 4634 (and nothing else). Thanks. (the other problems from the original big patch are now reported separately, with some of them already fixed). On 06/13/2013 12:08 PM, Sergei Golubchik wrote: > Hi, Alexander! > > On Jun 13, Alexander Barkov wrote: >>> Hi, Alexander! >>> >>> This looks like a lot of changes for what you explained the reason of >>> the bug was. There will be lots of "whys" below... >> >> The fix itself was quite small. However, an attempt >> to write a reasonable test case revealed a few other bugs. >> I just tried to fixing everything in a single patch. > > I understood this and it was okay. > > But I still wanted to know what change fixes what bug and what test > case. > >> Okey. Let's do everything separately. >> These are separate reports for the problems >> found during writing a test case for 4634: >> https://mariadb.atlassian.net/browse/MDEV-4652 >> https://mariadb.atlassian.net/browse/MDEV-4653 >> https://mariadb.atlassian.net/browse/MDEV-4654 >> >> Here's a new one, found today: >> https://mariadb.atlassian.net/browse/MDEV-4651 > > Okay, as you prefer :) > > Regards, > Sergei >

2 1

[Maria-developers] query cache issue
by Roberto Spadim 27 Jun '13

27 Jun '13

guys, i sent some (many) MDEV issues to have a better control over query cache i want to comment here to don't stay with this idea in my mind only... i created some labels in JIRA: querycache - relative to query cache qc_info - relative to qc_info plugin querycache_client - relative to implement query cache at client side (not in server) querycache_control - relative to DELETE queries in cache, DELETE tables in cache, LOCK/UNLOCK QUERY CACHE querycache_insert - relative to prune of queries that should be or shouldn't be cacheable querycache_lowmen - realtive to what we could do if we get low men in query cache querycache_result - features relative to when should or shouldn't hit query cache when query is cached if they will be or not implemented is another history is labels ok? should i remove it? -- Roberto Spadim

2 5

Re: [Maria-developers] Rev 3766: Added separation between roles and users in the mysql.user table
by Sergei 26 Jun '13

26 Jun '13

Hi, Vicențiu! On Jun 25, noreply(a)launchpad.net wrote: > ------------------------------------------------------------ > revno: 3766 > committer: Vicențiu Ciorbaru <cvicentiu(a)gmail.com> > branch nick: trunk > timestamp: Tue 2013-06-25 23:52:30 +0300 > message: > Added separation between roles and users in the mysql.user table > modified: > sql/sql_acl.cc > > === modified file 'sql/sql_acl.cc' > --- sql/sql_acl.cc 2013-06-23 12:25:04 +0000 > +++ sql/sql_acl.cc 2013-06-25 20:52:30 +0000 > @@ -542,7 +542,16 @@ > #endif /* HAVE_OPENSSL && !EMBEDDED_LIBRARY */ > #define NORMAL_HANDSHAKE_SIZE 6 > > -static DYNAMIC_ARRAY acl_hosts, acl_users, acl_dbs, acl_proxy_users; > +static DYNAMIC_ARRAY acl_hosts, acl_users, acl_dbs, acl_proxy_users, acl_roles; > +/* XXX > + ***** Potential optimization ***** > + role_grants could potentially be a HASH with keys as usernames and values > + as a DYNAMIC_ARRAY of pointers to granted roles > + XXX > + ***** Implementation choice for now ***** > + An array representing mappings between acl_users and acl_roles; > +*/ Agree about a hash. Hosts, users and dbs are stored in an array, because they support wildcards in MariaDB, not only exact matches. And very specific sort order, from most specific to least specific. But we only need exact matches for role names, so you can put all roles in a hash (see HASH or Hash_set). > +static DYNAMIC_ARRAY role_grants; Same. Do you need an array here? Is the order of entries important? I don't think it is. In fact, you probably may store role<->user relationships directly in the ACL_USER structure. For a user - list of granted roles. For a role - list of users it is granted to. Then it should be easy to check if a given user can SET a given role. > static MEM_ROOT mem, memex; > static bool initialized=0; > static bool allow_all_hosts=1; > @@ -876,11 +891,20 @@ > while (!(read_record_info.read_record(&read_record_info))) > { > ACL_USER user; > + bool is_role= FALSE; > bzero(&user, sizeof(user)); > update_hostname(&user.host, get_field(&mem, table->field[0])); > user.user= get_field(&mem, table->field[1]); > - DBUG_PRINT("info", ("user_entry %s", user.user)); > - if (check_no_resolve && hostname_requires_resolving(user.host.hostname)) > + > + /* If the user entry is a role, skip password and hostname checks > + A user can not log in with a role so some checks are not necessary > + */ > + if (!user.host.hostname) { > + is_role= TRUE; I'm sorry, but it wouldn't do. Apparently it is possible to create a user with the empty host name: MariaDB [test]> create user foo@''; Query OK, 0 rows affected (0.00 sec) MariaDB [test]> select user,host from mysql.user; +------+-----------+ | user | host | +------+-----------+ | foo | | Looking at compare_hostname() function, one can see that empty hostname means "any hostname is ok", it's a wildcard. It means, you cannot use empty hostnames to distinguish between roles and users. Which is a pity, I'd also prefer to use an empty hostname for that. You can use a NULL hostname (you'd need ALTER TABLE to make the column nullable) or a separate column, like, Is_role ENUM('N','Y'). > + } > + > + if (!is_role && check_no_resolve && > + hostname_requires_resolving(user.host.hostname)) Regards, Sergei

1 0

Re: [Maria-developers] Rev 3517: MySQL 5.6.10 performance schema: merge of host_cache table
by Sergei Golubchik 25 Jun '13

25 Jun '13

Hi, Timour! Just few comments On Jun 25, timour(a)askmonty.org wrote: > ------------------------------------------------------------ > revno: 3517 > revision-id: timour(a)askmonty.org-20130621115451-tyxgeeroqyxwz7gn > parent: monty(a)askmonty.org-20130623091543-zqu5dvhry6okna6g > committer: timour(a)askmonty.org > branch nick: 10.0-perf-schema-merge > timestamp: Fri 2013-06-21 14:54:51 +0300 > message: > MySQL 5.6.10 performance schema: merge of host_cache table > === modified file 'sql/hostname.cc' > --- a/sql/hostname.cc 2013-01-15 18:13:32 +0000 > +++ b/sql/hostname.cc 2013-06-21 11:54:51 +0000 > @@ -24,7 +24,7 @@ > Hostnames are checked with reverse name lookup and checked that they > doesn't resemble an IP address. > */ > - > +#include "my_global.h" > #include "sql_priv.h" > #include "hostname.h" > #include "my_global.h" you don't need to include my_global.h twice here > === modified file 'sql/sql_acl.cc' > --- a/sql/sql_acl.cc 2013-06-17 23:01:34 +0000 > +++ b/sql/sql_acl.cc 2013-06-21 11:54:51 +0000 > @@ -8730,7 +8737,6 @@ static int server_mpvio_read_packet(MYSQ > err: > if (mpvio->status == MPVIO_EXT::FAILURE) > { > - inc_host_errors(mpvio->thd->security_ctx->ip); > if (!mpvio->thd->is_error()) > { > if (mpvio->make_it_fail) > @@ -8890,6 +8896,10 @@ static int do_auth_once(THD *thd, const > else > { > /* Server cannot load the required plugin. */ > + Host_errors errors; > + errors.m_no_auth_plugin= 1; > + // merge-todo: struct MPVIO_EXT’ has no member named ‘ip’ > + // inc_host_errors(mpvio->ip, &errors); see above, the line you've removed in a previous chunk, used inc_host_errors(mpvio->thd->security_ctx->ip); > my_error(ER_PLUGIN_IS_NOT_LOADED, MYF(0), auth_plugin_name->str); > res= CR_ERROR; > } > @@ -8913,8 +8923,6 @@ static int do_auth_once(THD *thd, const > Perform the handshake, authorize the client and update thd sctx variables. > > @param thd thread handle > - @param connect_errors number of previous failed connect attemps > - from this host really? you've removed it from the comment, but not from the function, so now acl_authenticate() has one undocumented argument. > @param com_change_user_pkt_len size of the COM_CHANGE_USER packet > (without the first, command, byte) or 0 > if it's not a COM_CHANGE_USER (that is, if > @@ -9017,8 +9025,27 @@ bool acl_authenticate(THD *thd, uint con > > if (res > CR_OK && mpvio.status != MPVIO_EXT::SUCCESS) > { > + Host_errors errors; > DBUG_ASSERT(mpvio.status == MPVIO_EXT::FAILURE); > - > + switch (res) > + { > + case CR_AUTH_PLUGIN_ERROR: > + errors.m_auth_plugin= 1; > + break; > + case CR_AUTH_HANDSHAKE: > + errors.m_handshake= 1; > + break; > + case CR_AUTH_USER_CREDENTIALS: > + errors.m_authentication= 1; > + break; > + case CR_ERROR: > + default: > + /* Unknown of unspecified auth plugin error. */ > + errors.m_auth_plugin= 1; > + break; > + } > + // merge-todo: struct MPVIO_EXT’ has no member named ‘ip’ > + // inc_host_errors(mpvio.ip, &errors); same as above. And personally, I'd rather make a method errors.set_error(res); and move the switch inside. But you may decide to stay closer to 5.6 code. > if (!thd->is_error()) > login_failed_error(thd); > DBUG_RETURN(1); > @@ -9256,23 +9283,20 @@ static int native_password_authenticate( > #endif > > if (pkt_len == 0) /* no password */ > - DBUG_RETURN(info->auth_string[0] ? CR_ERROR : CR_OK); > + DBUG_RETURN(mpvio->acl_user->salt_len != 0 ? CR_AUTH_USER_CREDENTIALS : CR_OK); Why did you change the condition? Our pluggable auth code is not identical to MySQL's, so not all changes can be copied verbatim from there. I think the old condition was ok. > info->password_used= PASSWORD_USED_YES; > if (pkt_len == SCRAMBLE_LENGTH) > { > if (!mpvio->acl_user->salt_len) > - DBUG_RETURN(CR_ERROR); > + DBUG_RETURN(CR_AUTH_USER_CREDENTIALS); > > - if (check_scramble(pkt, thd->scramble, mpvio->acl_user->salt)) > - DBUG_RETURN(CR_ERROR); > - else > - DBUG_RETURN(CR_OK); > + DBUG_RETURN(check_scramble(pkt, thd->scramble, mpvio->acl_user->salt) ? > + CR_AUTH_USER_CREDENTIALS : CR_OK); could you change it back please and only replace the error code? if() is easier to debug, than a function call inside DBUG_RETURN(). I suppose that's why we have it that way. > } > > - inc_host_errors(mpvio->thd->security_ctx->ip); > my_error(ER_HANDSHAKE_ERROR, MYF(0)); > - DBUG_RETURN(CR_ERROR); > + DBUG_RETURN(CR_AUTH_HANDSHAKE); > } Regards, Sergei

1 0

[Maria-developers] Debug interface
by Roberto Spadim 25 Jun '13

25 Jun '13

hi guys, what ide could i use to debug easily in linux mariadb version? i'm using gdb via command line, but it's very complicate, i'm a visual studio user, but a console interface is nice, if i could put some break points and F5 (run),F8 (run one step) there's another place to ask about it? -- Roberto Spadim

3 2

[Maria-developers] RFC: Pausing a query thread
by Marian Marinov 25 Jun '13

25 Jun '13

Hi guys, I work with hosting companies and all of my clients have the same irritating problem, one query taking a lot of time to finish and consuming a lot of resources. So I have solved the same issue but with processes on the machine by simply pausing(kill -STOP) these processes when the load is high and continuing(kill -CONT) them when the server load goes down. I want to implement the same logic within MariaDB, so I can STOP/CONT the thread that is executing this query. My idea is to implement this in the 'KILL query_id' function, so it will accept one more argument, which will be either STOP or CONT. If the parameter is not present, the default behavior should remain. What do you think about my approach? Marian

6 18

Re: [Maria-developers] Help with MDEV-4419, ENUM optimization
by Roberto Spadim 24 Jun '13

24 Jun '13

hummm :) nice, i will study it =) it give me a lot of speed, since some system are closed source and i can't rewrite the query, just change the mysql server or put a mysql proxy

1 5

[Maria-developers] users table
by Roberto Spadim 24 Jun '13

24 Jun '13

hi guys, what's the better way to have a shared mysql schema? i'm talking about creating a user in one database and this user be created in many databases (in the same server) i'm trying with symbolic links in data directory, but sure i have some problems that i need same server version (ok no problem) and flush tables in all servers after add an user i don't know if i could do a two replications since it's like a master-master storage when one database add a user all databases need that information any idea? -- Roberto Spadim

4 4

[Maria-developers] Debug on windows
by Roberto Spadim 24 Jun '13

24 Jun '13

Hi guys i want to learn about optrange.cc, but i dont know how to debug I'm using visual studio 2008 on windows, could anyone help me I will place a break point at get_mm_leaf function and watch all variables Anyone could help me?

1 0

[Maria-developers] Build and/or support of MariaDB on AIX
by Frank Fegert 23 Jun '13

23 Jun '13

Hello all, i'm currently running MySQL 5.1.62 on IBM Power LPARs with AIX 6.1. I'll spare you the discussion of why AIX and not Linux and will just say "it is what it is ATM" ;-) Anyhow, with things proceeding as they are, i guess chances are that Oracle and IBM are not going to get any more friendly with each other, so i'm looking for an alternative way to move forward. That being said, i'd like to get an idea of the general feeling around the MariaDB development team on the support of non-(Linux|*BSD|Windows) platforms. Are there currently any plans? Would you be willing to invest some time in helping to get MariaDB running on AIX? Right now, i can successfully build stock MySQL 5.1.70 with some minor patches and stock MySQL 5.5.32 with some minor patches and the option "DWITHOUT_PERFSCHEMA_STORAGE_ENGINE=ON". With performance schema enabled the build fails at linking the unittests in "storage/perfschema/unittest/", see below for a full error output. The MariaDB 5.5.31 build does currently not even go that far, if fails earlier on the threadpool code, see below. Unfortunately my C/C++-fu is not strong enough to determine what might be considered a sound alternative to the epoll/kevent/port_event calls on AIX to do an alteration like the one in MDEV-4174. Can someone please help me out here? My build environment: Compiler: IBM XL C/C++ for AIX, V11.1 (5724-X13) Version: 11.01.0000.0009 AIX oslevel: 6100-08-01-1245 Thanks & best regards, Frank Fegert ## Begin: MariaDB 5.5.31 ############################################## ... [ 37%] Building CXX object sql/CMakeFiles/sql.dir/threadpool_unix.cc.o cd /home/user/rpmbuild/tmp/mariadb-5.5.31/build-mysql/sql && /usr/vacpp/bin/xlC_r -+ -DHAVE_CONFIG_H -DHAVE_EVENT_SCHEDULER -DHAVE_OPENSSL -DHAVE_POOL_OF_THREADS -DMYSQL_SERVER -ma -O2 -qlanglvl=extc99 -qstrict -qoptimize=2 -qmaxmem=16384 -DSYSV -D_AIX -D_AIX32 -D_AIX41 -D_AIX43 -D_AIX51 -D_AIX52 -D_AIX53 -D_AIX61 -D_ALL_SOURCE -DFUNCPROTO=15 -I/opt/freeware/include -qthreaded -qhalt=e -qstaticinline -g -DDBUG_OFF -I/home/user/rpmbuild/tmp/mariadb-5.5.31/build-mysql/include -I/home/user/rpmbuild/tmp/mariadb-5.5.31/include -I/home/user/rpmbuild/tmp/mariadb-5.5.31/sql -I/home/user/rpmbuild/tmp/mariadb-5.5.31/regex -I/home/user/rpmbuild/tmp/mariadb-5.5.31/build-mysql/sql -o CMakeFiles/sql.dir/threadpool_unix.cc.o -c /home/user/rpmbuild/tmp/mariadb-5.5.31/sql/threadpool_unix.cc "/home/user/rpmbuild/tmp/mariadb-5.5.31/sql/threadpool_unix.cc", line 39.2: 1540-0859 (S) #error directive: threadpool is not available on this platform. gmake[2]: *** [sql/CMakeFiles/sql.dir/threadpool_unix.cc.o] Error 1 gmake[2]: Leaving directory `/home/user/rpmbuild/tmp/mariadb-5.5.31/build-mysql' gmake[1]: *** [sql/CMakeFiles/sql.dir/all] Error 2 gmake[1]: Leaving directory `/home/user/rpmbuild/tmp/mariadb-5.5.31/build-mysql' gmake: *** [all] Error 2 ## End: MariaDB 5.5.31 ################################################ ## Begin: MySQL 5.5.32 ################################################ ... Linking CXX executable pfs-t cd /home/user/rpmbuild/tmp/mysql-5.5.32/build-mysql/storage/perfschema/unittest && /opt/freeware/bin/cmake -E cmake_link_script CMakeFiles/pfs-t.dir/lin k.txt --verbose=1 /usr/vacpp/bin/xlC_r -ma -O2 -qlanglvl=extc99 -qstrict -qoptimize=2 -qmaxmem=16384 -DSYSV -D_AIX -D_AIX32 -D_AIX41 -D_AIX43 -D_AIX51 -D_AIX52 -D_AIX53 -D_A IX61 -D_ALL_SOURCE -DFUNCPROTO=15 -I/opt/freeware/include -qthreaded -qhalt=e -qstaticinline -L/opt/freeware/lib/mysql -L/opt/freeware/lib -Wl,-bmaxdata:0x80000000 CMakeFiles/pfs-t.dir/pfs-t.cc.o -o pfs-t -Wl,-brtl,-bnoipath,-bexpfull ../../../unittest/mytap/libmytap.a ../libperfschema.a ../../../mysys/libmysys.a ../../../dbug/libdbug.a ../../../mysys/libmysys.a ../../../dbug/libdbug.a ../../../strings/libstrings.a -lz -lm -Wl,-blibpath:/opt/freeware/lib:/usr/lib:/lib ld: 0711-317 ERROR: Undefined symbol: .MDL_request::init(MDL_key::enum_mdl_namespace,const char*,const char*,enum_mdl_type,enum_mdl_duration) ld: 0711-317 ERROR: Undefined symbol: .LEX::LEX() ld: 0711-317 ERROR: Undefined symbol: .lex_start(THD*) ld: 0711-317 ERROR: Undefined symbol: Virtual table for class "DML_prelocking_strategy": Some possible causes are: first non-inline virtual function in "DML_prelocking_strategy" is not defined; or the class is a template instantiation and an explicit instantiation definition of the class is missing. ld: 0711-317 ERROR: Undefined symbol: .open_and_lock_tables(THD*,TABLE_LIST*,bool,unsigned int,Prelocking_strategy*) ld: 0711-317 ERROR: Undefined symbol: .Table_check_intact::check(TABLE*,const st_table_field_def*) ld: 0711-317 ERROR: Undefined symbol: .close_thread_tables(THD*) ld: 0711-317 ERROR: Undefined symbol: .lex_end(LEX*) ld: 0711-317 ERROR: Undefined symbol: .Query_tables_list::destroy_query_tables_list() ld: 0711-317 ERROR: Undefined symbol: .plugin_unlock_list(THD*,st_plugin_int**,unsigned int) ld: 0711-317 ERROR: Undefined symbol: THR_THD ld: 0711-317 ERROR: Undefined symbol: .sql_print_error(const char*,...) ld: 0711-317 ERROR: Undefined symbol: Virtual table for class "st_select_lex_node": Some possible causes are: first non-inline virtual function in "st_select_lex_node" is not defined; or the class is a template instantiation and an explicit instantiation definition of the class is missing. ld: 0711-317 ERROR: Undefined symbol: lower_case_table_names ld: 0711-317 ERROR: Undefined symbol: .Field_enum::store_type(unsigned long long) ld: 0711-317 ERROR: Undefined symbol: .ACL_internal_schema_registry::register_schema(const st_mysql_lex_string*,const ACL_internal_schema_access*) ld: 0711-317 ERROR: Undefined symbol: handler::clone(const char*,st_mem_root*) ld: 0711-317 ERROR: Undefined symbol: handler::get_error_message(int,String*) ld: 0711-317 ERROR: Undefined symbol: handler::column_bitmaps_signal() ld: 0711-317 ERROR: Undefined symbol: handler::index_read_idx_map(unsigned char*,unsigned int,const unsigned char*,unsigned long,ha_rkey_function) ld: 0711-317 ERROR: Undefined symbol: handler::index_next_same(unsigned char*,const unsigned char*,unsigned int) ld: 0711-317 ERROR: Undefined symbol: handler::read_multi_range_first(st_key_multi_range**,st_key_multi_range*,unsigned int,bool,st_handler_buffer*) ld: 0711-317 ERROR: Undefined symbol: handler::read_multi_range_next(st_key_multi_range**) ld: 0711-317 ERROR: Undefined symbol: handler::read_range_first(const st_key_range*,const st_key_range*,bool,bool) ld: 0711-317 ERROR: Undefined symbol: handler::read_range_next() ld: 0711-317 ERROR: Undefined symbol: handler::read_first_row(unsigned char*,unsigned int) ld: 0711-317 ERROR: Undefined symbol: handler::get_dynamic_partition_info(PARTITION_STATS*,unsigned int) ld: 0711-317 ERROR: Undefined symbol: handler::get_auto_increment(unsigned long long,unsigned long long,unsigned long long,unsigned long long*,unsigned long long*) ld: 0711-317 ERROR: Undefined symbol: handler::drop_table(const char*) ld: 0711-317 ERROR: Undefined symbol: Virtual table for class "handler": Some possible causes are: first non-inline virtual function in "handler" is not defined; or the class is a template instantiation and an explicit instantiation definition of the class is missing. ld: 0711-317 ERROR: Undefined symbol: .handler::ha_table_share_psi(const TABLE_SHARE*) const ld: 0711-317 ERROR: Undefined symbol: .handler::ha_statistic_increment(unsigned long system_status_var::*) const ld: 0711-317 ERROR: Undefined symbol: .handler::print_error(int,int) ld: 0711-317 ERROR: Undefined symbol: key_map_empty ld: 0711-317 ERROR: Undefined symbol: .calculate_key_len(TABLE*,unsigned int,const unsigned char*,unsigned long) ld: 0711-345 Use the -bloadmap or -bnoquiet option to obtain more information. gmake[2]: *** [storage/perfschema/unittest/pfs-t] Error 8 gmake[2]: Leaving directory `/home/user/rpmbuild/tmp/mysql-5.5.32/build-mysql' gmake[1]: *** [storage/perfschema/unittest/CMakeFiles/pfs-t.dir/all] Error 2 gmake[1]: Leaving directory `/home/user/rpmbuild/tmp/mysql-5.5.32/build-mysql' gmake: *** [all] Error 2 ###End: MySQL 5.5.32 ##################################################

3 3

Re: [Maria-developers] Build and/or support of MariaDB on AIX
by Frank Fegert 23 Jun '13

23 Jun '13

Hello Harald, On Sun, Jun 23, 2013 at 12:37:24PM +0200, Reindl Harald wrote: > your outoput contains "#error directive: threadpool is not available > on this platform" which clearly states you must not configure > "-DHAVE_POOL_OF_THREADS" on your platform thanks for your fast reply! Yes, to disable threadpool for AIX would be an option, but unfortunately the /dev/human attached to my computer seems to be defective ;-) All fun aside, i went through the configure option list, but nothing related to threadpools caught my eye. Manually patching the above option out of "sql/CMakeLists.txt" didn't help either. I'm missing something here, aren't i? Thanks & best regards, Frank

1 0

[Maria-developers] Uninstalling MariaDB 5.2 does not remove everything.
by Peter Laursen 22 Jun '13

22 Jun '13

For @wlad I guess: After uninstalling MariaDB 5.2.on Win7/64 some (don't remember which minor version), it remains in the list of installed programs in Control Panel .. Programs. Trying to uninstall displays this dialog (translates to "This action is only valid for programs currently installed"). I did not try if rebooting system would remove the item from the list. It may also have been fixed in the installer since the 5.2 release I installed. -- Peter

2 5

Re: [Maria-developers] [GSoC] Kerberize MariaDB -- some unclear point about the project
by QIU Shuang 22 Jun '13

22 Jun '13

Hi wlad, Thank you for your concern. > Create user > 'foo@bar'@localhost creates user foo@bar, on localhost. > create user that is identified with name and domain and can connect > from any computer I admit that I mis-understood the usage of User@Host in MariaDB. I thought the User and Host fields in MariaDB are in the same place as those in a Kerberos principal. i.e. if my MariaDB login name is qiush(a)sjtu.edu.cn, then my Kerberos principal will be qiush(a)sjtu.edu.cn/CHINA, where MariaDB login name is part of Kerberos principal. (if that case, the realm part is omitted in MariaDB, and we should find another way to figure it out. That's what I argued in my previous email.) From your reply, it seems qiush@sjtu.edu.cn/CHINA@sjtu.edu.cn, the bold part is MariaDB User and italic part Host, can be a valid login name in our project. Suddenly realise the Host in MariaDB login name will constraint the user login place. It's much clear now. > Re realm, I do not know this much but 'shuang(a)uni.shanghai.edu/REALM' also > does not look too weird to me. To me, either :). > Or perhaps I miss something still? Can you elaborate? No, you're right. I confused these two names. Thank you for you hints! Sincerely, Shuang On Jun 20, 2013, at 2:22 AM, Vladislav Vaintroub <wlad(a)montyprogram.com> wrote: > > > From: QIU Shuang [mailto:qiush.summer@gmail.com] > Sent: Mittwoch, 19. Juni 2013 19:52 > To: Vladislav Vaintroub > Subject: Re: [Maria-developers] [GSoC] Kerberize MariaDB -- some unclear > point about the project > > > Hi Shuang, > >>> Trying to make a nicer name, for example by removing domain part could > introduce some ambiguity here and different Kerberos users to login as the > same. >> I think so. >> But per my knowledge, the fully qualified name in MariaDB is > username@hostname. >> What about the realm/domain part? >> I think this may be a gap between MariaDB and Kerberos. > > Maybe I oversee something, but I do not really see any contradiction here. > Do you mean that @ is special character should not be used in usernames? It > actually can, it just must be properly escaped. Create user > 'foo@bar'@localhost creates user foo@bar, on localhost. > Hypothetical CREATE USER 'shuang(a)uni.shanghai.edu' @'%' IDENTIFIED WITH > 'Kerberos' > > will create user that is identified with name and domain and can connect > from any computer (due to use of wildcard for computername part, this > wildcard can be omitted). > Re realm, I do not know this much but 'shuang(a)uni.shanghai.edu/REALM' also > does not look too weird to me. > > Or perhaps I miss something still? Can you elaborate? > > Wlad >

3 4

[Maria-developers] help with parser
by Roberto Spadim 20 Jun '13

20 Jun '13

hi guys i'm trying to implement MDEV-4579<https://mariadb.atlassian.net/browse/MDEV-4579>, could anyone help me with parser + warning generation? MDEV-4579 title: SQL PARSER - Add Ignore to SET SQL command example: SET @@some_global_variable_that_dont_exists=1 *this cause an error* SET @@some_global_variable_that_dont_exists=1,@@some_variable_that_exists_and_should_be_changed=3 *this cause an error and don't change the second variable* *could we implement:* SET *IGNORE * @@some_global_variable_that_dont_exists=1,@@some_variable_that_exists_and_should_be_changed=3 *this cause an warning (first variable don't exists) and change the second variable* thanks -- Roberto Spadim

2 1

[Maria-developers] [GSoC] Kerberize MariaDB -- some unclear point about the project
by QIU Shuang 19 Jun '13

19 Jun '13

Hi Wlad and the community, I've developed a Kerberos plugin prototype with both raw API and GSSAPI supported on my own Linux box. The codes are pushed to my private repo already. It is just a prototype, which can handle only the normal case, without any tests in deployed environment. And I know there is a long way to go before accepted I now have a clear knowledge about the control flow of authentication plugin and Kerberos protocol. The working use case is like this: 1. login my computer as, for example, qiush; 2. create a user in MariaDB named qiush; 3. get the initial credential from Kerberos Key Distribution Center (KDC), i.e. tgt; 4. connect mysqld as qiush and now I can login DBMS passwordlessly before tgt expires. Correctly me if I miss something in this case. The exception case is how to get/renew tgt when the original expired. I have created a private repo based on 5.5 release version, which is available at https://launchpad.net/~qiush-summer. For those that concern about our project, you can track my progress. (The reason why I choose 5.5 release version instead of the latest development branch 10.x is that I cannot clone the repo lp:~maria-captains/maria/10.0-base from launchpad and I don't know why. I'll figure it out later if necessary). Some problems (three, exactly) when implementing the toy plugin. The first one is about the private repo and bazaar (I'm a git guy and have little experience working with bazaar). In order to make some demonstrated progress, I push my local update to the private repo each time I create a new commit. It seems the commit number is global (see the screen shot of my private repo history below). Recent revisions 3796. By Shuang Qiu 20 hours ago prototype with GSSAPI enabled 3795. By Shuang Qiu on 2013-06-15 Kerberos plugin prototype with raw krb5 API 3794. By Shuang Qiu on 2013-06-13 doodle 3793. By Michael Widenius on 2013-06-11 Fixed tests that failed on 32 bit because of my earlier fixes of 32 bit limits. 3792. By Sergei on 2013-06-07 MDEV-4468 Assertion `error != 0' fails or timeout occurs on select from a FEDERATED table which points at a non-existent table I'm afraid that my commits may pollute the code base. So the question is that will others (e.g. Sergei since commit 3792) see my changes next time he gets local branch updated. Is it the best practice to use bazaar like this (push after each commit)? If not, could you please give me some suggestion to use bazaar and launchpad correctly in our community? The other two are about the exception case. When get the initial credential from KDC, clients/services are asked for a password or asked to provide a keytab file to derive a long-term key that can be used encrypting messages between clients and KDC. On the server/service side, I think the keytab approach is better. Otherwise, each time we restart the service, a password will be asked. It may be annoying, I think :p. Then how to figure out the name of keytab file? I can come up with three approaches: 1. hard coded the filename and document the keytab file name clearly in the manual for users to follow (not the best choice, I think); 2. use the default Kerberos setting, which is /etc/krb5.keytab when properly configured; 3. make the filename an option in configuration file, e.g. ~/.my.cnf, with a default value /etc/krb5.keytab, since it is the default Kerberos setting. I prefer the third solution. As to the client side, I think both are OK. The problem of keytab choice is the same. Then I try to get some hints from similar password requesting authentication plugin. I read code in plugin/auth_dialog and plugin/auth_examples where server plugin and client plugin are implemented separately. In the client plugin, a external function of type mysql_authenticaton_dialog_ask_t static mysql_authentication_dialog_ask_t ask; can be provided as an alternative to command line input. Should I also implement them in two parts? And also provide the mysql_authentication_dialog_ask_t hook? The last problem. Kerberos requires user to provide a service name to resolve before requesting service ticket. How to name our service? Hard coded it as MYSQL or set in configuration file (I prefer the latter one)? Let me know your thoughts :). Thank you very much and best regards! Sincerely, Shuang

2 2

Re: [Maria-developers] [GSoC] Kerberize MariaDB -- some unclear point about the project
by QIU Shuang 19 Jun '13

19 Jun '13

Hi serg, Thank you for your comment. I will clean my repo at some later time follow your advice. :) Sincerely, Shuang On Jun 18, 2013, at 4:51 PM, Sergei Golubchik <serg(a)mariadb.org> wrote: > Hi, QIU Shuang! > > Just to answer the bzr part: > > On Jun 16, QIU Shuang wrote: >> The first one is about the private repo and bazaar (I'm a git guy and >> have little experience working with bazaar). In order to make some >> demonstrated progress, I push my local update to the private repo each >> time I create a new commit. It seems the commit number is global (see >> the screen shot of my private repo history below). >> >> Recent revisions >> 3796. By Shuang Qiu 20 hours ago >> prototype with GSSAPI enabled >> 3795. By Shuang Qiu on 2013-06-15 >> Kerberos plugin prototype with raw krb5 API >> 3794. By Shuang Qiu on 2013-06-13 >> doodle >> 3793. By Michael Widenius on 2013-06-11 >> Fixed tests that failed on 32 bit because of my earlier fixes of 32 bit limits. >> 3792. By Sergei on 2013-06-07 >> MDEV-4468 Assertion `error != 0' fails or timeout occurs on select from a FEDERATED table which points at a non-existent table >> >> I'm afraid that my commits may pollute the code base. So the question >> is that will others (e.g. Sergei since commit 3792) see my changes >> next time he gets local branch updated. Is it the best practice to >> use bazaar like this (push after each commit)? > > Don't worry about it. Revision numbers in bzr aren't stable, during a > merge they might be renumbered (*). Revision ids are stable and unique, > but they look like > > sergii(a)pisem.net-20130607133513-p27s1bg8gt0amkiw > > (this is for my commit with revno 3792 above). > Think of revision numbers as of convenient shortcuts that help to avoid > typing and that are easy to remember. But don't use them for long-term > references or something. > > And no, I won't see your changes when I pull from 5.5. > Not unless I pull from your repository. > > Regards, > Sergei > > [1]. Details. Example. Say you have a repo with only one changeset. It > has revno 1. You've branched. And you've made changes and committed > something in both branches, independently. Every branch has now two > changesets. Changeset 1 (it's the same in both, save revid), and > Changeset 2 (revno is the same, revid is different). Now if you merge > the second branch into the first, the changeset 2 of the second branch > will be renumbered, it'll get revno 1.1 (but its revid won't change). > The history will look like (Changeset 3 is the merge changeset): > > 1 > | \ > 2 1.1 > | / > 3 > >

1 0

[Maria-developers] mysql 5.6, 5.7
by Roberto Spadim 18 Jun '13

18 Jun '13

hi guys, i was reading mysql 5.6 and 5.7 manual i know that mariadb is very different (a bit) than mysql internally there's a mysql merge issue or something like that i can see what will be merged and what not? i like the partition lock prune, memcache and optimizer tracer of mysql 5.6, but today i'm not using it in mariadb (not a problem, but it's nice features) -- Roberto Spadim

3 6

Re: [Maria-developers] review / close MDEV-4581
by Roberto Spadim 18 Jun '13

18 Jun '13

nice! thanks sergei! i think it's now rich in features, maybe should be used by community to check if it's usefull (there's many columns) thanks again! 2013/6/18 Sergei Golubchik <serg(a)mariadb.org> > Hi, Roberto! > > On Jun 18, Roberto Spadim wrote: > > hi guys, could review / close > > MDEV-4581<https://mariadb.atlassian.net/browse/MDEV-4581> ? > > Roberto, as you can see in Jira, > MDEV-4581 is assigned to me, it's targeted for the 10.0.4 release. > So yes, I could and I will. > > Regards, > Sergei > -- Roberto Spadim SPAEmpresarial

1 0