diff options
| author | unknown <monty@mysql.com> | 2004-02-16 10:15:52 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-16 10:15:52 +0200 |
| commit | d00fbce3083f11d071300447e11dab124debb2b7 (patch) | |
| tree | f9bef14abcf4ef1e6145cb3c16e63c9a56e221e9 /sql/opt_range.cc | |
| parent | a07e48eca04b1564da9868f229ba5d958994db69 (diff) | |
| parent | 40ad9154930ca5d42649b776f84989cc372b060c (diff) | |
| download | mariadb-git-d00fbce3083f11d071300447e11dab124debb2b7.tar.gz | |
Merge with 4.0 to get fix for mysqlbinlog
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
sql/log_event.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_load.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
client/mysqlbinlog.cc:
Merge with 4.0
configure.in:
Merge with 4.0
mysql-test/r/range.result:
Use local file
mysql-test/t/range.test:
Use local file
sql/share/english/errmsg.txt:
Use local file
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 1dbe883aef4..6f97a5afe94 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -496,6 +496,7 @@ SEL_ARG *SEL_ARG::clone(SEL_ARG *new_parent,SEL_ARG **next_arg) return 0; // OOM } increment_use_count(1); + tmp->color= color; return tmp; } |