BUILD/SETUP.sh:
Use --with-openssl instead of --with-yassl for now
(We need to fix that libmysqlclient_r links with a -PIC compiled yassl library before enabling yassl)
server-tools/instance-manager/instance_options.cc:
move declaration of end to start of function so gcc is happy
server-tools/instance-manager/parse_output.cc:
remove space before =
use my_isspace to determine if *end is white space
remove comments related to get_word which was removed
replace tab character with appropriate # of spaces
Optimize new pushed code
sql/item_func.cc:
Fixed wrong merge
sql/sql_update.cc:
Optimize new pushed code
(There is no reason to add extra test for not common error case if code can handle it anyway)
(BDB keylength limitted to 255)
mysql-test/r/bdb.result:
fix bdb test after fixing the maximal length of BDB keys to 2^32-1
sql/ha_berkeley.h:
use the maximal possible length of 2^32 - 1
client/mysqltest.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/update.test:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/spatial.cc:
Auto merged
sql/sql_select.h:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
Item_func_group_concat::print() wasn't printing sort order thus creating wrong
view. This results in reported error.
sql/item_sum.cc:
Fix bug #14466 lost sort order in GROUP_CONCAT() in a view
Now Item_func_group_concat::print() prints sort order.
mysql-test/r/view.result:
Test case for bug #14466 lost sort order in GROUP_CONCAT() in a view
mysql-test/t/view.test:
Test case for bug #14466 lost sort order in GROUP_CONCAT() in a view
Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements
mysql-test/r/func_sapdb.result:
Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
mysql-test/r/type_newdecimal.result:
Correct tests after reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
mysql-test/r/user_var.result:
More test with SELECT @a:=
mysql-test/t/disabled.def:
Enable user_var.test for
mysql-test/t/user_var.test:
More test with SELECT @a:=
sql/item.cc:
Simple optimization during review of new code
sql/item_func.cc:
Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort)
sql/item_timefunc.h:
timediff() can return NULL for not NULL arguments
sql/sql_base.cc:
Remove usage of current_thd() in mysql_make_view()
sql/sql_lex.h:
Remove usage of current_thd() in mysql_make_view()
sql/sql_select.cc:
Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements
sql/sql_view.cc:
Remove usage of current_thd() in mysql_make_view()
Simple optimization of new code
sql/sql_view.h:
Remove usage of current_thd() in mysql_make_view()
sql/table.cc:
Simple optimization of new code
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
Mark that add_time(), time_diff() and str_to_date() can return null values
myisam/mi_check.c:
keyoffset is not a position (no %lx here)
mysql-test/r/func_sapdb.result:
Fixed test after marking that timediff() can return NULL
sql/item_func.cc:
Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
sql/item_timefunc.cc:
Mark that add_time and str_to_date() can return null values
sql/item_timefunc.h:
Mark that time_diff can return 0
sql/spatial.cc:
Simple cleanups during review of new code
Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
work.
mysql-test/r/federated.result:
BUG# 14532
Test fix by creating table with bit column and inserting,selecting
mysql-test/t/federated.test:
BUG# 14532
Test fix by creating table with bit column and inserting,selecting
sql/field.cc:
BUG #14532
Just needed to quote/escape bit field, add FIELD_TYPE_BIT to switch
sql/item_func.cc:
some optimisation
sql/sql_acl.cc:
some optimisation
sql/sql_base.cc:
some optimisation
sql/sql_parse.cc:
some optimisation
sql/table.cc:
some optimisation
even when --ledir option is specified. (Bug #13774)
scripts/mysqld_safe.sh:
Figure out whether to use mysqld or mysqld-max after we have handled
the command-line options and .cnf files.
1. Made sure that base64 string is terminated with NUL.
2. Made calculation of needed size for base64 string exact.
Added checks in test for the above two fixes.
mysys/base64.c:
Made sure that base64 string is terminated with NUL.
Made calculation of needed size for base64 string exact.
Added checks in test for the above two fixes.
server-tools/instance-manager/instance_options.cc:
fixed to coding guidelines
server-tools/instance-manager/parse_output.cc:
removed tabs
and added call to trim_space
server-tools/instance-manager/instance_options.cc:
small cleanup
-and-
convert mysqld_path to the proper syntax after reading
server-tools/instance-manager/parse_output.cc:
stop using get_word since it stops at spaces. Now we just read the entire line and trim spaces.
