sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
include/mysqld_error.h:
merging
sql/share/english/errmsg.txt:
merging
WL#1163 (Make spatial code separable)
fixes before the push
include/my_global.h:
Temporary place for these defines
include/mysqld_error.h:
ER_FEATURE_DISABLED definition
sql/item_geofunc.cc:
#ifdef HAVE_SPATIAL moved to the better place
sql/share/english/errmsg.txt:
Message for ER_FEATURE_DISABLED
wl #1163 (Make spatial code optional)
Patch I cleaned with Serg & Monty's suggestions
sql/gen_lex_hash.cc:
mysql_priv.h was included for SYM_GROUP declaration
sql/lex.h:
sym_group_xxx made global so we can use texts from them
throughout the code
sql/lex_symbol.h:
SYM_GROUP declaration moved to mysql_priv.h
sql/mysql_priv.h:
declarations about SYM_GROUP
sql/sql_table.cc:
sym_group_xxx objects used instead of text constants
a couple of HAVE_SPATIAL removed
sql/sql_yacc.yy:
sym_group_xxx used instead of text constants
some duplicated code restructured
MYF(0) parameters removed from net_printf calls
<monty> ramil, in MySQL/MyISAM we should only strip end space, not 'space-like' characters.
<monty> This is according to SQL; When doing a comparision end space and only end space are ignored.
myisam/mi_key.c:
a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
myisam/mi_search.c:
a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
mysql-test/r/select.result:
test case for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
mysql-test/t/select.test:
test case for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
sql/sql_string.cc:
a proper fix for the bug #2298 Trailing whitespace inconsistently handled in WHERE clause.
spec file after the build as RPM has its own option for this
Build-tools/Do-rpm:
- remove unnecessary code to delete the source tarball and spec file
after the build as RPM has its own option for this
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/derived.result:
SCCS merged
mysql-test/t/derived.test:
e
merge
mysql-test/t/multi_update.test:
new results of changed multi-delete
mysql-test/t/update.test:
new results of changed multi-delete
mysql-test/r/multi_update.result:
new results of changed multi-delete
mysql-test/r/update.result:
new results of changed multi-delete
Some errorneous code trimmed
sql/item.cc:
initialization of the Item_type_holder::orig_item added
sql/item.h:
No use to call cleanup() in ~Item
this only calls Item::cleanup()
We should use item->delete_self() instead of 'delete item' now
Code added to restore Item_type_holder::item_type value
sql/item_row.h:
this cleanup is wrong
sql/item_sum.cc:
initialization added
sql/item_sum.h:
Item_xxx& -> Item_xxx*
sql/sql_parse.cc:
delete item -> item->delete_self()
manpage) turned out as a major overhaul of all man pages:
- renamed all *.1 files to *.1.in to act as templates which are being
processed at build time
- replaced some hard-coded values with place holder that are being
replaced with the proper values at build time
- Updated list of available man pages in the SEE ALSO section and added a
hint to the manual for more details
- Added a BUGS section to all pages, referring to the bugs DB
- Updated some obsolete URLs and mail addresses
The actual content of these man pages should probably be cross-checked for
correctness, though...
man/Makefile.am:
- Replace some hard-coded values in the man pages with the proper values
at build time instead. Instead of the *.1 files, we now add the *.1.in
files (the templates) to the source distribution and generate the *.1
files during make.
man/isamchk.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/isamlog.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysql_fix_privilege_tables.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysql_zap.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqlaccess.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqladmin.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqld.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqld_multi.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqld_safe.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqldump.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqlshow.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/perror.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/replace.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysql.1.in:
- replaced some hard-coded values (e.g. Version numbers, path names) with
variables which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
