summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/kent/bk/tmp/mysql-4.0unknown2007-02-282-3/+117
|\ | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-4.1-build Docs/Makefile.am: SCCS merged
| * Makefile.am:unknown2007-02-282-3/+117
| | | | | | | | | | | | | | | | | | | | | | | | EXCEPTIONS-CLIENT is now static part of repository EXCEPTIONS-CLIENT: BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT EXCEPTIONS-CLIENT: BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT Docs/Makefile.am: EXCEPTIONS-CLIENT is now static part of repository
* | Merge mysql.com:/home/kent/bk/tmp/mysql-4.0unknown2007-02-280-0/+0
|\ \ | |/ | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
| * Merge trift2.:/MySQL/M40/clone-4.0unknown2007-02-223-2/+4
| |\ | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M40/mysql-4.0
| * | Raise version number after cloning 4.0.30unknown2007-02-091-1/+1
| | |
* | | After-merge fix:unknown2007-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c". mysys/thr_alarm.c: After-merge fix: In 4.1, the variable "thr_client_alarm" is declared in this module.
* | | Merge trift2.:/MySQL/M40/clone-4.0unknown2007-02-201-1/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M41/merge-4.1 include/config-win.h: Auto merged mysys/my_pthread.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/my_thr_init.c: Not applicable to 4.1 in its current state. sql/mysqld.cc: Change was a backport already, null-merged to 4.1.
| * | include/config-win.h : unknown2007-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Companion change to this one ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0 include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10 which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ... include/config-win.h: Companion change to this one ChangeSet@1.2206, 2007-01-22 02:32:07+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +8 -0 include/my_pthread.h@1.67, 2007-01-22 02:32:06+02:00, jani@a88-113-38-195.elisa-laajakaista.fi +31 -10 which renamed "sigset()" -> "my_sigset()" but forgot to do it for Windows ...
| * | Fix a linkage problem with the previous patch for "thr_client_alarm".unknown2007-02-122-1/+1
| | | | | | | | | | | | | | | | | | | | | mysys/my_pthread.c: Linkage problem with previous patch: "thr_client_alarm" must be declared in here. mysys/thr_alarm.c: Linkage problem: Declare "thr_client_alarm" over in "mysys/my_pthread.c".
| * | Break a double declare of "uint thr_client_alarm" between ↵unknown2007-02-121-1/+0
| | | | | | | | | | | | | | | | | | | | | "mysys/thr_alarm.c" and "mysys/my_pthread.c". mysys/my_pthread.c: Break a double declare: "uint thr_client_alarm" is also declared in "mysys/thr_alarm.c", take it from there.
| * | Compile error on Windows: Signal names are undefined. Fix by hiding the ↵unknown2007-02-121-0/+3
| |/ | | | | | | | | | | | | | | whole section. mysys/my_thr_init.c: Compile error on Windows: Both "SIGALRM" and "SIGUSR1" are undefined. Fix by hiding the whole section, according to Jani it is not needed on Windows.
| * Fixes a compilation problem on Windows. Backport of theunknown2007-02-091-0/+4
| | | | | | | | | | | | | | same fix from 4.0.
* | Merge trift2.:/MySQL/M41/mysql-4.1unknown2007-02-1543-135/+493
|\ \ | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M41/push-4.1
| * \ 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
| | | | | | | | | * \ \ \ \ \ \ \ \ Merge 192.168.0.10:mysql/mysql-4.1-maintunknown2007-01-171-2/+3
| | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / / | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
| | | | | | * | | | | | | | | | | | User visible change - breaks some environments, per Paul DuBois. Reverting ↵unknown2007-01-262-9/+0
| | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in 4.1 and 5.0.
| | | | | | * | | | | | | | | | | Merge bk://localhost:5556unknown2007-01-231-13/+16
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
| | | | | | | * | | | | | | | | | | Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshotsunknown2007-01-211-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: - Bug #24299: - Bug #25596: innobase/dict/dict0dict.c: Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots Revision r36: innodb-4.1: Port r1030 from innodb/branches/5.0: Replace isspace() with a wrapper ib_isspace(), because on Win32 isspace(0xa0) appears to hold. (Bug #24299) Revision r38: ib_isspace(c): Check for c being the null character. (Bug #25596)
| | | | | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-01-221-0/+8
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
| | | | | | | * | | | | | | | | | | Merge ymer.(none):/usr/local/mysql/mysql-4.1-maintunknown2007-01-221-0/+8
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|/ / / / / / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ymer.(none):/usr/local/mysql/x/mysql-4.1-maint
| | | | | | | | * | | | | | | | | | Implement mysql-test-run.pl option to limit the number of saved coreunknown2007-01-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files. This helps stability of multiple parallel automated test runs, avoiding the situation where one bad build fills up disk with 1000s of core files, causing failures in other test runs.
| | | | | | * | | | | | | | | | | | Moving version-script to acinclude.m4unknown2007-01-192-7/+8
| | | | | | |/ / / / / / / / / / /
| | | | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-01-318-11/+72
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint configure.in: Auto merged mysql-test/r/range.result: Auto merged mysql-test/t/range.test: Auto merged
| | | | | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-01-195-11/+52
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
| | | | | | | * | | | | | | | | | after merge fix.unknown2007-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/range.result: Fix for bug #22533: Traditional: Too-long bit value not rejected. - results adjusted.
| | | | | | | * | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2007-01-194-9/+50
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/bug22533/my41-bug22533