diff options
| author | unknown <monty@mysql.com> | 2004-01-29 15:16:48 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-01-29 15:16:48 +0100 |
| commit | b9073593d0defc65472125b625e399e5ab22d1f6 (patch) | |
| tree | 1a3482e487cc9dcf2c6335c759351aacd5960227 /sql/item_strfunc.cc | |
| parent | 4db4ffef27624e58cc5c45cc8a165bfb9509fbfa (diff) | |
| download | mariadb-git-b9073593d0defc65472125b625e399e5ab22d1f6.tar.gz | |
Mark that strings may change on index only reads (for BDB tables).
This fixed problem with index reads on character fields with BDB tables. (Bug #2509)
BitKeeper/etc/ignore:
added man/*.1
mysql-test/r/bdb.result:
New test
mysql-test/r/myisam.result:
More tests
mysql-test/t/bdb.test:
Test for idnex only read
mysql-test/t/myisam.test:
More test to verify pushed bug fix
sql/ha_berkeley.h:
Mark that strings may change on index only reads
sql/item_strfunc.cc:
Cleanup
sql/table.cc:
Allow index only reads on binary strings
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 74a7c97113e..31c2dc943e5 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1507,14 +1507,11 @@ void Item_func_elt::fix_length_and_dec() { max_length=0; decimals=0; - /* - first numeric argument isn't in args (3.23 and 4.0) - but since 4.1 the cycle should start from 1 - so this change - - should NOT be merged into 4.1!!! - */ +#if MYSQL_VERSION_ID < 40100 for (uint i= 0; i < arg_count ; i++) +#else + for (uint i= 1; i < arg_count ; i++) +#endif { set_if_bigger(max_length,args[i]->max_length); set_if_bigger(decimals,args[i]->decimals); |