summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug#20166 mysql-test-run.pl does not test system privilege tables creationunknown2007-02-284-530/+7
| | | | | | | | | | | | | | | | | - Build lib/init-db.sql from the output of mysql_create_system_tables - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql - Leave netware/init_db.sql until 5.0 where we should soon have possibility to test with mysql-test-run.pl BitKeeper/deleted/.del-init_db.sql: Delete: mysql-test/init_db.sql BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8: Delete: mysql-test/lib/init_db.sql BitKeeper/etc/ignore: Added mysql-test/lib/init_db.sql to the ignore list mysql-test/Makefile.am: Build lib/init_db.sql from the output of mysql_create_system_tables
* When using a --mem=<dir> the memdir must be removed to assureunknown2007-02-281-0/+10
| | | | | | | afresh start
* Bug#26416 mysql-test-run exits with "Hangup" when piped to grepunknown2007-02-281-8/+2
| | | | | | | | | - Thanks to Christian for the patch! mysql-test/lib/mtr_process.pl: Avoid printout of "Hangup" when script exits by using POSIX::kill
* Bug#26686 mysql-test-run.pl aborts when waitpid returns -1unknown2007-02-281-9/+20
| | | | | | | | | | | | | - Add error handling for waitpid returns -1 for "simple run of command" mysql-test/lib/mtr_process.pl: - Add error handling for waitpid returns -1 when a simple command is run. - Add missing return - Add mtr_errors where the program should never come - Remove an else to improve program readability - Change mtr_debug to mtr_warning for "Got EAGAIN from fork()..."
* Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint-without-cygwinunknown2007-02-281-1/+2
|\ | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint client/mysqltest.c: Auto merged
| * Bug#19410 Test 'kill' fails on Windows + SCOunknown2007-02-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Use "mysql_stmt_field_count" to determine if there is a need to call "mysql_stmt_store_result" client/mysqltest.c: Only call 'mysql_stmt_store_result' if 'mysql_stmt_field_count' is greater than 0 indicating that this query has a result set. This change is mainly since if mysql_stmt_store_result fails the value returned by mysql_stmt_field_count will be reset.
* | Use cygwin for --exec and --system in mysqltest for MySQL before 5.0unknown2007-02-281-0/+5
| |
* | Only allow a version number to be read from "/etc/debian_version"unknown2007-02-261-1/+1
| |
* | Add "diff_files" command to mysqltestunknown2007-02-202-1/+110
| |
* | New version of 'do_cat_file' that will trim cr/lf to lfunknown2007-02-201-3/+20
| |
* | Turn the "is_windows" flag _on_ when compiled on windowsunknown2007-02-191-1/+1
| |
* | Commment out two test's thats just confusing for cmd.exe unknown2007-02-192-7/+4
| |
* | Add cat_file command to mysqltestunknown2007-02-193-1/+65
| |
* | Add "append_file" command to mysqltestunknown2007-02-192-30/+109
| |
* | Don't output escape char from 'do_eval' on windows. "It" won't unknown2007-02-191-3/+20
| | | | | | | | | | | | | | | | | | know it's an escape char. Replace /dev/null with NUL Replace "closed stdout" with "not open fd"
* | Merge 192.168.0.10:mysql/mysql-4.1-maintunknown2007-02-164-22/+161
|\ \ | |/ |/| | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint client/mysqltest.c: Auto merged
| * Workaround for problem where cygwin's bash/sh randomly fails with error 128 ↵unknown2007-02-164-22/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which mainly occurs on win2003 64bit. - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..." client/mysqltest.c: Workaround the problem with "echo" in windows not behaving like "echo" in Unix. - Replace "--exec echo ..." with "--exec <path to mysqltest>\echo.exe" thus forcing use of our own echo implementation which baheves like on Unix. - The above change makes it possible to remove the need to execute all --exec's inside cygwin. Add ifdefs to only use use cygwin's bash conditionally mysql-test/lib/mtr_misc.pl: Add function for converting to the OS's native format mysql-test/mysql-test-run.pl: Convert path to executables to "windows native" (c:\<path>\) instead of "mixed"(c:/<path>) mode necessary for pipes and redirects to work properly in cmd.exe client/echo.c: New BitKeeper file ``client/echo.c''
* | Merge 192.168.0.10:mysql/mysql-4.1-maintunknown2007-02-151-0/+28
|\ \ | |/ |/| | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
| * Use my_vsnprintf instead of vsnprintfunknown2007-02-141-1/+1
| |
| * Write some debug info to result log file before dying in 'do_exec'unknown2007-02-131-0/+27
| |
| * Reset value of variable "escaped" in "default" label causing $variables notunknown2007-02-131-0/+1
| | | | | | | | | | | | | | | | to be expanded in same cases client/mysqltest.c: Reset value of variable "escaped" in "default" label
* | Merge neptunus.(none):/home/msvensson/mysql/bug10777/my41-bug10777unknown2007-02-151-1/+2
|\ \ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
| * | Bug#10777 ERROR File = sql_lex.cc, Line = 93 The identifier "symbols" is ↵unknown2007-02-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | undefined. - Protect againt empty/corrupt lex_hash-h by writing output from gen_lex_hash to a temporary file first. sql/Makefile.am: Protect against empty lex_hash.h due to failed execution of gen_lex_hash by writing outpout to a tmp file first
* | | Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126unknown2007-02-143-1/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint sql/item.cc: Auto merged mysql-test/r/order_by.result: Manual merge. mysql-test/t/order_by.test: Manual merge.
| * | | Bug#25126: Reference to non-existant column in UPDATE...ORDER BY... crashes ↵unknown2007-02-093-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server "update existingtable set anycolumn=nonexisting order by nonexisting" would crash the server. Though we would find the reference to a field, that doesn't mean we can then use it to set some values. It could be a reference to another field. If it is NULL, don't try to use it to set values in the Item_field and instead return an error. Over the previous patch, this signals an error at the location of the error, rather than letting the subsequent deref signal it. mysql-test/r/order_by.result: Verify that all permutations work. mysql-test/t/order_by.test: Verify that all permutations work. sql/item.cc: When the field is NULL, don't dereference it when we set_field(). Instead, raise an error.
* | | | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2007-02-1342-128/+466
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
| * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-02-1342-128/+466
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/sql_select.cc: Auto merged
| | * | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-02-124-33/+86
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/tnurnberg/24660/41-24660 sql/table.cc: Auto merged
| | | * | | Bug#24660: "enum" field type definition problemunknown2007-02-124-33/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales. This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from being used. Now if 0xff makes an appearance, we find a character not used in the enum and use that as a separator. If no such character exists, we throw an error. Any solution would have broken some sort of existing behaviour. This solution should serve both fractions (those with 0xff and those with ',' in their enums), but WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/ That is, mysqldump with their current server, and restore when upgrading to one with this patch. mysql-test/r/type_enum.result: Bug#24660: "enum" field type definition problem Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable char in some locales), or ',', or both. mysql-test/t/type_enum.test: Bug#24660: "enum" field type definition problem Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable char in some locales), or ',', or both. sql/table.cc: Bug#24660: "enum" field type definition problem Revert fix for Bug#20922. sql/unireg.cc: Bug#24660: "enum" field type definition problem Use a field-separator for ENUM-values that is not part of those values. If impossible, throw error.
| | * | | | Merge siva.hindu.god:/home/tsmith/m/bk/41unknown2007-02-0838-95/+380
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/41 sql/sql_prepare.cc: Manual merge
| | | * \ \ \ Merge 192.168.0.10:mysql/mysql-4.1-maintunknown2007-02-061-1/+4
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
| | | | * | | | Bug#25344 Segmentation violation when try to run the perror utilityunknown2007-02-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - strerror might return NULL on some platforms extra/perror.c: Backport fix from 5.0
| | | * | | | | Merge 192.168.0.10:mysql/mysql-4.1-maintunknown2007-02-0635-88/+369
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint mysys/default.c: Auto merged sql/mysqld.cc: Auto merged sql/sql_prepare.cc: Auto merged
| | | | * | | | Merge bk-internal:/home/bk/mysql-4.1-maintunknown2007-02-061-5/+6
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
| | | | | * \ \ \ Merge 192.168.0.10:mysql/mysql-4.1-maintunknown2007-02-061-5/+6
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint sql/sql_prepare.cc: Auto merged
| | | | * | \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-02-063-1/+14
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug23938/my41-bug23938 sql/item_timefunc.cc: Auto merged
| | | | | * | | | | | fix for bug #23938: ISNULL on DATE AND CAST AS DATE returns false for null ↵unknown2006-12-043-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values Set null_value in case of wrong data. mysql-test/r/cast.result: fix for bug #23938: ISNULL on DATE AND CAST AS DATE returns false for null values - test result. mysql-test/t/cast.test: fix for bug #23938: ISNULL on DATE AND CAST AS DATE returns false for null values - test case. sql/item_timefunc.cc: fix for bug #23938: ISNULL on DATE AND CAST AS DATE returns false for null values - set null_value in case of error.
| | | | * | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-02-051-0/+7
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug10798/my41-bug10798 sql/slave.cc: Auto merged
| | | | | * | | | | | | Fix for bug #10798: If relay log fails to rotate, slave will crash afterunknown2006-12-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The relay log may not be open for some reason (e.g. disk error) after rotation, and using it causes the slave crash. Fix: check we have it open before access, return error otherwise. sql/slave.cc: Fix for bug #10798: If relay log fails to rotate, slave will crash after - check if the relay log is open before any access.
| | | | * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-02-011-0/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b26012/b26012.4.1 sql/field.h: Auto merged
| | | | | * | | | | | | | Fix for bug #26012: missed Field_double::size_of()unknown2007-02-011-0/+1
| | | | | | |_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we have Field_double::not_fixed we must have Field_double::size_of(). sql/field.h: Fix for bug #26012: missed Field_double::size_of() - Field_double::size_of() added.
| | | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-01-3126-85/+285
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/mysqld_multi.sh: Auto merged sql/mysqld.cc: Auto merged
| | | | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-01-3110-10/+177
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
| | | | | | * \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-01-3110-10/+177
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b19690/b19690.4.1 sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
| | | | | | | * | | | | | | fix for bug #19690: ORDER BY eliminates rows from the resultunknown2007-01-3110-10/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on the queries we use different data processing methods and can lose some data in case of double (and decimal in 4.1) fields. The fix consists of two parts: 1. double comparison changed, now double a is equal to double b if (a-b) is less than 5*0.1^(1 + max(a->decimals, b->decimals)). For example, if a->decimals==1, b->decimals==2, a==b if (a-b)<0.005 2. if we use a temporary table, store double values there as is to avoid any data conversion (rounding). mysql-test/r/type_float.result: fix for bug #19690: ORDER BY eliminates rows from the result - test result mysql-test/t/type_float.test: fix for bug #19690: ORDER BY eliminates rows from the result - test case sql/field.cc: fix for bug #19690: ORDER BY eliminates rows from the result - use not_fixed flag instead of dec to check bounds. sql/field.h: fix for bug #19690: ORDER BY eliminates rows from the result - Field_Double::not_fixed flag introduced, which is set if dec == NOT_FIXED_DEC and is used in the ::store() to check bounds. - new constructor introduced (with not_fixed_arg parameter). sql/init.cc: fix for bug #19690: ORDER BY eliminates rows from the result - fill log_01[] array with 0.1 powers. sql/item_cmpfunc.cc: fix for bug #19690: ORDER BY eliminates rows from the result - compare_real_fixed() and compare_e_real_fixed() introduced, they consider double a == double b if a-b is less than 'precision', 'precision' is set to 5*0.1^(1 + max(a->decimals, b->decimals)), for example, if a->decimals==1, b->decimals==2, 'precision' is 0.005 - use the above functions if both arguments are fixed. sql/item_cmpfunc.h: fix for bug #19690: ORDER BY eliminates rows from the result - Arg_comparator::presision introduced. - Arg_comparator::compare_real_fixed(), Arg_comparator::compare_e_real_fixed() introduced. sql/mysql_priv.h: fix for bug #19690: ORDER BY eliminates rows from the result - log_01 array of 0.1 powers added. sql/mysqld.cc: fix for bug #19690: ORDER BY eliminates rows from the result - log_01 array of 0.1 powers added. sql/sql_select.cc: fix for bug #19690: ORDER BY eliminates rows from the result - if we create double field in a temporary table, set not_fixed flag (use proper constructor) to avoid data conversion in the Field_double::store(). Otherwise we can lose some data.
| | | | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-01-2912-46/+76
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
| | | | | | * | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-maintunknown2007-01-2912-46/+76
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
| | | | | | | * \ \ \ \ \ \ \ Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943unknown2007-01-2911-44/+73
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged
| | | | | | | | * | | | | | | | Bug#22943 syscall pruning in libmysqlunknown2007-01-2911-44/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set the timeout values only where needed sql/mysql_priv.h: Add new functions for setting read and write timeout on "net" sql/mysqld.cc: - Move the setting of "read_timeout" to the value of "connect_timeout" to just before 'check_connection' which is the function where we want to use the different timeout - With the new functions to set timeout on "net", there is no need to specifically set the default wait_timeout on windows. sql/net_serv.cc: Add new functions for setting read and write timeout of "net, when server is compiled not to use alarms it will set the write/read timeout directly on connection using 'vio_timeout'(using setsockopt if socket) sql/repl_failsafe.cc: Put unused code within "#if NOT_USED" sql/set_var.cc: Use 'net_set_*_timeout' when adjusting timeout value on the current connection sql/slave.cc: The read timeout used when connecting to master server is set using 'mysql_options' in 'connect_to_master' function sql/sql_parse.cc: - Set read and write timeout values to "connect_timeout" during connect phase - Use "read_timeout" value during sslaccept phase, since this is during connect phase it implies "connect-timeout" - Set read and write timeout value back to default after connect phase - Set "read_timeout" to "wait_timeout" while waiting for client. sql/sql_repl.cc: Set "read_timeout" to "wait_timeout" while ask other mysqld to send file sql-common/client.c: Call 'vio_timeout' to set up the read and write timeout's for the newly created connection. It only need to be done once at connect time. vio/vio.c: Use 'vio_timeout' for setting timeout also on an SSL connection since they both use sockets vio/viossl.c: Remove 'vio_ssl_timeout' function
| | | | | | | * | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-maintunknown2007-01-221-2/+3
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint