diff options
| author | unknown <monty@mysql.com> | 2006-06-30 19:15:18 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-30 19:15:18 +0300 |
| commit | ad2dacd729f5f29f58776b0547c29ba68c123438 (patch) | |
| tree | 15c1c844006e3cdc77167f5ef3986b9d40c16104 /libmysql | |
| parent | 4c9c37af7ad52cdf8d135ca6b0d7b5ea7a676d3c (diff) | |
| parent | 4283d414fa0e1605b3d0ca96761da3c462a87adb (diff) | |
| download | mariadb-git-ad2dacd729f5f29f58776b0547c29ba68c123438.tar.gz | |
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/key.test:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/key.result:
Manual merge
mysql-test/t/mysqldump.test:
Manual merge
(Now we have same code as in 4.1 and 5.1)
sql/ha_ndbcluster.cc:
Manual merge
Change %ll -> llstr()
tests/mysql_client_test.c:
manual merge
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index c1e0703af10..a851d62b108 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -2391,10 +2391,9 @@ static void net_store_datetime(NET *net, MYSQL_TIME *tm) static void store_param_date(NET *net, MYSQL_BIND *param) { - MYSQL_TIME *tm= (MYSQL_TIME *) param->buffer; - tm->hour= tm->minute= tm->second= 0; - tm->second_part= 0; - net_store_datetime(net, tm); + MYSQL_TIME tm= *((MYSQL_TIME *) param->buffer); + tm.hour= tm.minute= tm.second= tm.second_part= 0; + net_store_datetime(net, &tm); } static void store_param_datetime(NET *net, MYSQL_BIND *param) |