diff options
| author | unknown <monty@mishka.local> | 2005-07-18 19:03:01 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-07-18 19:03:01 +0300 |
| commit | 5b6c1348c737ddf705800c3f734c25349d0ca841 (patch) | |
| tree | 2a23167b636e05bfda983614bbee36653c7c2c12 /sql/item_strfunc.cc | |
| parent | abde46de62241a722f4e17d2b1d820d1d496b582 (diff) | |
| parent | 68b4d7b74d80062b09edfdaeb7137c74b3071346 (diff) | |
| download | mariadb-git-5b6c1348c737ddf705800c3f734c25349d0ca841.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
mysys/Makefile.am:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/sql_select.cc:
Auto merged
mysys/default.c:
SCCS merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index ec30dbf8aea..6d519c73b13 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2118,7 +2118,7 @@ String *Item_func_rpad::val_str(String *str) func_name(), current_thd->variables.max_allowed_packet); goto err; } - if(args[2]->null_value || !pad_char_length) + if (args[2]->null_value || !pad_char_length) goto err; res_byte_length= res->length(); /* Must be done before alloc_buffer */ if (!(res= alloc_buffer(res,str,&tmp_value,byte_count))) |