database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Auto-merge from mysql-5.1.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-03-01 12:02:15 +03:00
parent d583c459f7 3f484dbecf
commit 43f5b7cdde
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bzr-mysql/default.conf
View File

@ -1,4 +1,4 @@
[MYSQL] [MYSQL]
post_commit_to = "commits@lists.mysql.com" post_commit_to = "commits@lists.mysql.com"
post_push_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com"
tree_name = "mysql-trunk-bugfixing" tree_name = "mysql-trunk"

1
scripts/mysqld_multi.sh
View File

@ -71,7 +71,6 @@ sub main
print "WARNING: --config-file is deprecated and will be removed\n"; print "WARNING: --config-file is deprecated and will be removed\n";
print "in MySQL 5.6. Please use --defaults-extra-file instead\n"; print "in MySQL 5.6. Please use --defaults-extra-file instead\n";
} }
}
} }
foreach (@defaults_options) foreach (@defaults_options)

2
sql/item_timefunc.cc
View File

@ -876,7 +876,7 @@ static bool get_interval_info(const char *str,uint length,CHARSET_INFO *cs,
value= value*LL(10) + (longlong) (*str - '0'); value= value*LL(10) + (longlong) (*str - '0');
if (transform_msec && i == count - 1) // microseconds always last if (transform_msec && i == count - 1) // microseconds always last
{ {
int msec_length= 6 - (int)(str - start); int msec_length= 6 - (int) (str - start);
if (msec_length > 0) if (msec_length > 0)
value*= (long)log_10_int[msec_length]; value*= (long)log_10_int[msec_length];
} }