diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-28 17:14:16 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-28 17:14:16 +0100 |
| commit | 95b72158698f8b0ea0be7e9846a6e7fa1b9cc680 (patch) | |
| tree | 83a78303b4c4267413216f751a1b6558df61ee99 /sql-common | |
| parent | 76b4ccbdf8d4913993eb64ef08986654ac5f0423 (diff) | |
| parent | 7fe3f31345313d8580d1b5e976fcfed67160e06a (diff) | |
| download | mariadb-git-95b72158698f8b0ea0be7e9846a6e7fa1b9cc680.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql-common/client.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/table.cc:
Auto merged
strings/decimal.c:
Auto merged
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 2 | ||||
| -rw-r--r-- | sql-common/my_time.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 4ca62e0649a..7d6f7024727 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1211,6 +1211,8 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, for (row=data->data; row ; row = row->next,field++) { uchar *pos; + /* fields count may be wrong */ + DBUG_ASSERT ((field - result) < fields); cli_fetch_lengths(&lengths[0], row->data, default_value ? 8 : 7); field->catalog = strdup_root(alloc,(char*) row->data[0]); field->db = strdup_root(alloc,(char*) row->data[1]); diff --git a/sql-common/my_time.c b/sql-common/my_time.c index cdd18fd0051..886be050bf0 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -76,8 +76,8 @@ uint calc_days_in_year(uint year) 1 error */ -static my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, - ulong flags, int *was_cut) +my_bool check_date(const MYSQL_TIME *ltime, my_bool not_zero_date, + ulong flags, int *was_cut) { if (not_zero_date) { |