- 12 Oct, 2006 2 commits
-
-
unknown authored
into polly.local:/home/kaa/src/maint/mysql-5.0-maint sql-common/my_time.c: Auto merged sql/field.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/time.cc: Auto merged mysql-test/r/func_time.result: Manually merged mysql-test/t/func_time.test: Manually merged
-
unknown authored
mysql-test/r/func_time.result: Fixed func_time test when merging the fix for bug #11655 and bug #20927 to 5.0 sql/item_timefunc.cc: Fixed compilation when merging the fix for bug #11655 and bug #20927 to 5.0
-
- 11 Oct, 2006 5 commits
-
-
unknown authored
into example.com:/work/bug23074/my50-bug23074
-
unknown authored
into polly.local:/tmp/maint/bug11655/my50-bug11655 sql/time.cc: Auto merged include/my_time.h: Manually merged mysql-test/r/func_sapdb.result: Manually merged mysql-test/r/func_time.result: Manually merged mysql-test/t/func_time.test: Manually merged sql-common/my_time.c: Manually merged sql/field.cc: Manually merged sql/item_timefunc.cc: Manually merged
-
unknown authored
into example.com:/work/bug23074/my50-bug23074 myisam/sort.c: Auto merged
-
unknown authored
set. This has always worked because when flag is !=0 then HA_VAR_LENGTH_KEY is always set. Therefore, a test case cannot reveal a faulty behavior. Fix for bug#23074: typo in myisam/sort.c myisam/sort.c: fix typo. Nevertheless, it has worked as expected because when a bit in flag is set HA_VAR_LENGTH_KEY has been always set too. Actually, no problem exposed through DDL.
-
unknown authored
into naruto.:C:/cpp/mysql-5.0-maint mysql-test/r/func_time.result: Auto merged sql/item_timefunc.cc: Auto merged
-
- 09 Oct, 2006 5 commits
-
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583 BitKeeper/etc/collapsed: auto-union client/mysql.cc: Auto merged
-
unknown authored
Porting forward tests to replacement files. mysql-test/r/mysql.result: Ported changes from previous commit to new file. mysql-test/t/mysql.test: Ported changes from previous commit to new file.
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583 BitKeeper/deleted/.del-collapsed~fbec3523369aae99: Delete: BitKeeper/etc/collapsed BitKeeper/etc/collapsed: 'Auto converge' client/mysql.cc: Auto merged BitKeeper/deleted/.del-mysql_client.result: File is gone. BitKeeper/deleted/.del-mysql_client.test: File is gone.
-
unknown authored
When the client program had its stdout file descriptor closed by the calling shell, after some amount of work (enough to fill a socket buffer) the server would complain about a packet error and then disconnect the client. This is a serious security problem. If stdout is closed before the mysql is exec()d, then the first socket() call allocates file number 1 to communicate with the server. Subsequent write()s to that file number (as when printing results that come back from the database) go back to the server instead in the command channel. So, one should be able to craft data which, upon being selected back from the server to the client, and injected into the command stream become valid MySQL protocol to do something nasty when sent /back/ to the server. The solution is to close explicitly the file descriptor that we *printf() to, so that the libc layer and the OS layer both agree that the file is closed. BitKeeper/etc/collapsed: BitKeeper file /home/cmiller/work/mysql/bug17583/my41-bug17583/BitKeeper/etc/collapsed client/mysql.cc: If standard output is not open (specifically, if dup() of its file number fails) then we explicitly close it so that future uses of the file descriptor behave correctly for a closed file. mysql-test/r/mysql_client.result: Prove that the problem of writing SQL output to the command socket no longer exists. mysql-test/t/mysql_client.test: Prove that the problem of writing SQL output to the command socket no longer exists.
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/tmp/50 sql/sql_parse.cc: Auto merged
-
- 04 Oct, 2006 8 commits
-
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint client/mysqldump.c: manula merge
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660 client/mysqldump.c: Auto merged
-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356 BitKeeper/etc/collapsed: auto-union
-
unknown authored
The executing code had a safety assertion so that it refused to free Items that it didn't create. However, there is a case, undefined user variables, which would put Items into the list to be freed. Instead, do something that is more risky in expectation that the code will be refactored soon, as Kostja wants to do: Remove the assertions from prepare() and execute(). Put one assertion at a higher level, before stmt->set_params_from_vars(), which may then create new to-be-freed Items . mysql-test/r/ps_11bugs.result: Create tests to prove that undefined variables work, as keys and not, and that variables explicitly assigned to Null work. mysql-test/t/ps_11bugs.test: Create tests to prove that undefined variables work, as keys and not, and that variables explicitly assigned to Null work. sql/sql_prepare.cc: Move a safety assertion up one level and higher, because there is legitimately a case where thd->free_list is not NULL going into Prepared_statement::{prepare,execute} methods. Kostja plans to refactor this code so that it is both safe and works. (Now it works, but isn't very safe.)
-
unknown authored
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint sql/set_var.cc: Auto merged
-
unknown authored
The server variable warning_count should include the number of warnings, errors and notes according to the manual mysql-test/r/user_var.result: Added warning_count results. mysql-test/t/user_var.test: Added test case for warning_count. sql/set_var.cc: Added number errors to warning_count.
-
unknown authored
- bug #11655 "Wrong time is returning from nested selects - maximum time exists - input and output TIME values were not validated properly in several conversion functions - bug #20927 "sec_to_time treats big unsigned as signed" - integer overflows were not checked in several functions. As a result, input values like 2^32 or 3600*2^32 were treated as 0 - BIGINT UNSIGNED values were treated as SIGNED in several functions - in cases where both input string truncation and out-of-range TIME value occur, only 'truncated incorrect time value' warning was produced include/my_time.h: Added defines for the TIME limits Added defines for the warning flags set by str_to_time() and check_time_range() Added check_time_range() declaration mysql-test/r/func_sapdb.result: Fixed testcases which relied on incorrect TIMEDIFF() behaviour mysql-test/r/func_time.result: Fixed testcase which relied on incorrect behaviour Added testcases for out-of-range values in SEC_TO_TIME(), TIME_TO_SEC(), ADDTIME(), SUBTIME() and EXTRACT() mysql-test/t/func_time.test: Added testcases for out-of-range values in SEC_TO_TIME(), TIME_TO_SEC(), ADDTIME(), SUBTIME() and EXTRACT() sql-common/my_time.c: Added check_time_range() to be used from str_to_time() and item_timefunc.cc Added new out-of-range flag to str_to_time() warnings Use '%u' instead of '%d' in my_*_to_str() because the arguments are unsigned sql/field.cc: Replaced out-of-range checks with checks for flags returned by str_to_time() sql/item_timefunc.cc: Added wrappers over make_datetime() and make_time() which perform out-of-range checks on input values Moved common code in Item_func_sec_to_time::val_str() and Item_func_sec_to_time::val_int() into a separate function sec_to_time() Replaced calls to make_datetime() with make_datetime_with_warn() in Item_func_add_time and Item_func_timediff Checks for 'unsigned int' overflows in Item_func_maketime Use make_time_with_warn() instead of make_time() in Item_func_maketime Fixed incorrect sizeof() in Item_func_str_to_date::get_time() sql/time.cc: Check for return value of str_to_time() along with warning flags
-
unknown authored
Set a flag when a SHOW command is parsed, and check it in log_slow_statement(). SHOW commands are not counted as slow queries, even if they use table scans. mysql-test/t/show_check-master.opt: BitKeeper file /usr/home/tim/m/bk/b19764/50/mysql-test/t/show_check-master.opt mysql-test/r/show_check.result: Add test for bug #19764 mysql-test/t/show_check.test: Add test for bug #19764 sql/sql_lex.cc: Set lex->is_show_command= FALSE in lex_start sql/sql_lex.h: Add LEX->is_slow_command flag to prevent SHOW commands from being written to the slow queries log sql/sql_parse.cc: Don't log slow statement if it is a SHOW command sql/sql_yacc.yy: Set lex->is_show_command for all SHOW commands
-
- 03 Oct, 2006 9 commits
-
-
unknown authored
client/mysqldump.c: Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT - Remove old BEGIN syntax and replace with START TRANSATION. Add CONSISTENT SNAPSHOT option for servers that support it.
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/collapsed: auto-union mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ps.result: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged include/m_ctype.h: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/field.cc: Auto merged sql/item_func.cc: Auto merged
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint scripts/mysqlhotcopy.sh: Auto merged
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.0-rpl mysql-test/r/cast.result: null merge for bug#8663 It will beed another fix for 5.0 - changes in new DECIMAL instead of FLOAT mysql-test/r/ps.result: null merge mysql-test/t/cast.test: null merge mysql-test/t/count_distinct3.test: null merge sql/item_func.cc: null merge
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
-
unknown authored
into mysql.com:/usr/home/bar/mysql-4.1-rpl mysql-test/r/cast.result: Auto merged mysql-test/r/ps.result: Auto merged sql/item_func.cc: Auto merged
-
unknown authored
into mysql.com:/usr/home/ram/work/bug22271/my50-bug22271 sql/field.cc: Auto merged
-
- 02 Oct, 2006 11 commits
-
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint include/m_ctype.h: Auto merged include/my_global.h: Manual merge
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/ignore: auto-union sql/item_func.h: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
-
unknown authored
This was available from gcc 3.1, so diable it before that Update m_ctype.h to use the new macro include/m_ctype.h: Use macro ATTRIBUTE_FORMAT_FPTR on function pointer include/my_global.h: Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers This was available from gcc 3.1, so diable it before that
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/41 scripts/mysqlhotcopy.sh: Auto merged
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/41
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/40
-
unknown authored
into siva.hindu.god:/usr/home/tim/m/bk/wl3516/50
-
unknown authored
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge 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/sql_select.cc: Auto merged sql/sql_update.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint include/my_global.h: Auto merged mysql-test/r/ctype_utf8.result: Auto merged sql/item_subselect.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.h: Auto merged mysql-test/t/ctype_utf8.test: Manual merge sql/mysqld.cc: Manual merge
-