- 28 May, 2007 7 commits
-
-
unknown authored
into polly.local:/home/kaa/src/maint/mysql-5.1-maint include/m_string.h: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged strings/strtod.c: Auto merged
-
unknown authored
include/m_string.h: Reduced the number of elements in log_10[] and log_01[] to not exceed DBL_MAX. sql/field.cc: Avoid the warning on Windows. strings/strtod.c: Reduced the number of elements in log_10[] and log_01[] to not exceed DBL_MAX.
-
unknown authored
into polly.local:/home/kaa/src/maint/mysql-5.0-maint sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged strings/strtod.c: Auto merged
-
unknown authored
into polly.local:/home/kaa/src/maint/mysql-5.1-maint sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged strings/strtod.c: Auto merged
-
unknown authored
This is for bug #28121. mysql-test/r/type_float.result: Changed the warning messages in the testcase to match 5.1 text.
-
unknown authored
into polly.local:/home/kaa/src/maint/bug28121/my51-bug28121 include/m_string.h: Auto merged mysql-test/r/type_float.result: Auto merged mysql-test/t/type_float.test: Auto merged sql/init.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/field.cc: Manual merge. sql/field.h: Manual merge.
-
unknown authored
When storing a large number to a FLOAT or DOUBLE field with fixed length, it could be incorrectly truncated if the field's length was greater than 31. This patch also does some code cleanups to be able to reuse code which is common between Field_float::store() and Field_double::store(). include/m_string.h: Added declarations for log_10 and log_01 from strtod.c mysql-test/r/type_float.result: Added the testcase for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits" mysql-test/t/type_float.test: Added the testcase for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits" sql/field.cc: Moved common code from Field_float::store() and Field_double:store() to Field_real::truncate() Fixed the algorithm to not truncate large input numbers if the field length is greater than 31. Fixed rounding to not depend on FLT_MAX/DBL_MAX constants. sql/field.h: Moved not_fixed member from Field_double to Field_real to allow code reuse between Field_float::store() and Field_double::store() Added truncate() method to Field_real which is used by both Field_float and Field_double sql/init.cc: log_10[] and log_01[] are now defined as statical arrays in strtod.c, no need to pre-computed them. sql/item_cmpfunc.cc: log_01[] now starts from 1e0, not from 1e-1 for consistency. sql/mysql_priv.h: Moved log_10[] and log_01[] from mysqld.cc to libmystrings. sql/mysqld.cc: Moved log_10[] and log_01[] from mysqld.cc to libmystrings. strings/strtod.c: Define and use log_10[] and log_01[] as static arrays of constants instead of values pre-computed at startup.
-
- 25 May, 2007 9 commits
-
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint sql/net_serv.cc: Auto merged
-
unknown authored
- Add checks to make sure net has a vio assigned - For example bootstrap will create a fake "net" with vio set to 0 sql/net_serv.cc: Add checks to make sure net has a vio assigned
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row. mysql-test/r/binlog_stm_ps.result: New BitKeeper file ``mysql-test/r/binlog_stm_ps.result'' mysql-test/t/binlog_stm_ps.test: New BitKeeper file ``mysql-test/t/binlog_stm_ps.test''
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint include/mysql_com.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
- Make the two "my_net_set*" function only visible when included from my_global.h include/mysql_com.h: Make the two "my_net_set*" functions only visible when included from my_global.h
-
unknown authored
into mysql.com:/home/ram/work/b26842/b26842.5.0
-
unknown authored
into mysql.com:/home/ram/work/b26842/b26842.5.1
-
unknown authored
-
- 24 May, 2007 15 commits
-
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
between 5.0 and 5.1 and thus missed the merge
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/ps.test: Auto merged sql/item.cc: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_repl.cc: Auto merged sql-common/client.c: Auto merged
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint libmysql/libmysql.c: Auto merged sql-common/client.c: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_repl.cc: Auto merged
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664 include/mysql_com.h: Auto merged include/violite.h: Auto merged libmysql/libmysql.c: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged sql-common/client.c: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_repl.cc: Auto merged vio/viosocket.c: Auto merged sql/sql_parse.cc: Merge 5.0->5.1
-
unknown authored
into mysql.com:/home/ram/work/b28464.new/b28464.new.5.0 sql/item.h: Auto merged sql/sql_yacc.yy: Auto merged sql/item.cc: SCCS merged
-
unknown authored
into mysql.com:/home/ram/work/b28464.new/b28464.new.5.1 mysql-test/t/limit.test: Auto merged sql/item.h: Auto merged sql/sql_yacc.yy: Auto merged sql/item.cc: SCCS merged
-
unknown authored
into mysql.com:/home/ram/work/b26842/b26842.5.1 sql/sql_prepare.cc: Auto merged
-
unknown authored
bug #26842: master binary log contains invalid queries - replication fails bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements Problem: binlogging PS' we may produce syntacticly incorrect queries in the binlog replacing some parameters with variable names (instead of variable values). E.g. in the reported case of "limit ?" clause: replacing "?" with "@var" produces "limit @var" which is not a correct SQL syntax. Also it may lead to different query execution on slave if we set and use a variable in the same statement, e.g. "insert into t1 values (@x:=@x+1, ?)" Fix: make the stored statement string created upon its execution use variable values (instead of names) to fill placeholders. mysql-test/r/ctype_cp932_binlog.result: Fix for bug #26842: master binary log contains invalid queries - replication fails bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements - result adjusted. mysql-test/r/ctype_cp932_notembedded.result: Fix for bug #26842: master binary log contains invalid queries - replication fails bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements - result adjusted. mysql-test/r/rpl_user_variables.result: Fix for bug #26842: master binary log contains invalid queries - replication fails bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements - test result. mysql-test/t/ctype_cp932_binlog.test: Fix for bug #26842: master binary log contains invalid queries - replication fails bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements - test adjusted. mysql-test/t/rpl_user_variables.test: Fix for bug #26842: master binary log contains invalid queries - replication fails bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements - test case. sql/sql_prepare.cc: Fix for bug #26842: master binary log contains invalid queries - replication fails bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements - set val to the variable's value (escaped if needed) then insert it into the query string in the position of the placeholder. We don't need to call get_var_with_binlog() here as there is no trace of the variable's name in the binlog.
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into pilot.blaudden:/home/msvensson/mysql/bug27438/my51-bug27438 mysql-test/r/rpl_rotate_logs.result: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged
-
unknown authored
- The "mysql client in mysqld"(which is used by replication and federated) should use alarms instead of setting socket timeout value if the rest of the server uses alarm. By always calling 'my_net_set_write_timeout' or 'my_net_set_read_timeout' when changing the timeout value(s), the selection whether to use alarms or timeouts will be handled by ifdef's in those two functions. - Move declaration of 'vio_timeout' into "vio_priv.h" include/mysql_com.h: Move the net_set_*_timeout function declarations to mysql_com.h and rename to my_net_set_*_timeout to avoid name clashes include/violite.h: Move declaration of 'vio_timeout' to vio_priv.h (to make the function as private as possible) libmysql/libmysql.c: Use my_net_read_timeout or my_net_write_timeout when setting the timeouts. Move the global variables for my_net_read/my_write_timeout into the only place where they are used. Thus removing them... server-tools/instance-manager/mysql_connection.cc: Use my_net_read_timeout or my_net_write_timeout when setting the timeouts sql-common/client.c: Use my_net_read_timeout or my_net_write_timeout when setting the timeouts sql/mysql_priv.h: Move the net_set_*_timeout function declarations to mysql_com.h sql/net_serv.cc: No need to cast the net->write_timeout value from "uint" to "uint" sql/set_var.cc: Rename net_set_*_timeout to my_net_set_*_timeout sql/sql_client.cc: Use my_net_read_timeout or my_net_write_timeout when setting the timeouts sql/sql_parse.cc: Rename net_set_*_timeout to my_net_set_*_timeout sql/sql_repl.cc: Rename net_set_*_timeout to my_net_set_*_timeout vio/vio_priv.h: Move declaration of 'vio_timeout' to vio_priv.h vio/viosocket.c: Cleanup 'vio_timeout' - Use "const void*" on POSIX and "const char*" on windows for setsockopt - Add DBUG_PRINT's - Add comment about why we don't have an implementation of vio_timeout for platforms not supporting SO_SNDTIMEO or SO_RCVTIMEO
-
- 23 May, 2007 9 commits
-
-
unknown authored
into mysql.com:/home/ram/work/b28509/b28509.5.0
-
unknown authored
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Merge 4.1 -> 5.0
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
- Check that filemode was set to 0000 mysql-test/mysql-test-run.pl: Checking for "running as root" should also read the filemode to see it was properly set to 0000
-
unknown authored
into mysql.com:/home/ram/work/b28509/b28509.5.0 mysql-test/r/ps.result: Auto merged mysql-test/t/ps.test: Auto merged sql/item.cc: Auto merged
-
unknown authored
into mysql.com:/home/ram/work/b28509/b28509.5.1 mysql-test/r/ps.result: Auto merged mysql-test/t/ps.test: Auto merged sql/item.cc: Auto merged
-
unknown authored
into mysql.com:/home/ram/work/b23810/b23810.5.1
-
unknown authored
We access some variable values using casts like *(long *) buff that may cause crashes on some platforms (e.g. solaris 64) if buff is not properly aligned. Fix: align the buffer used. include/my_global.h: Fix for bug #23810: Server crashes on various "show status ..." commands - MY_DIV_UP(A, B) macro introduced, which devides A then rounds up by B. - MY_ALIGNED_BYTE_ARRAY(N, S, T) macro introduced, which declares an S-byte long (aligned) N array of type T. sql/sql_show.cc: Fix for bug #23810: Server crashes on various "show status ..." commands - align the buffer used.
-