Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem
include/my_pthread.h:
Remove merge problem causing "struct timespec" to be declared twice
Add macro "get_timespec_sec" used for retrieving the time in seconds
sql/event_queue.cc:
Use macros for working with "struct timespec"
sql/log_event.cc:
Add casts from "byte*" to "char*"
- Result file was not properly committed.
- Update result file to match the new test case.
mysql-test/r/myisam.result:
Bug#17498 failed to put data file in custom directory use "data directory" option
- Update result file to match the new test case.
into shakedown.(none):/home/jpipes/dev/bug21970/my51-bug21970
mysql-test/mysql-test-run-shell.sh:
Fix for Bug#21970
Usage of "MASTER_MYPORT+1" caused a string "9306+1" to be evaluated instead of the correct "9307". Thie fix was adding a space around the plus sign.
Merged changes from 5.0 into 5.1; kept addition of --protocol=tcp in the 5.1 shell script entries and corrected the expression evaluation by adding a space between MASTER_MYPORT and "+1" to ensure that 9307 is output instead of the string "9306+1"
into siva.hindu.god:/usr/home/tim/m/bk/51
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
mysql-test/r/myisam.result:
Manual merge
mysql-test/t/myisam.test:
Manual merge
mysql-test/r/myisam.result:
Fix results file - a test was moved from the .test file, but the results were not updated.
mysql-test/r/symlink.result:
echo End of 4.1 tests while I'm here
mysql-test/t/myisam.test:
echo End of 4.1 tests while I'm here
mysql-test/t/symlink.test:
echo End of 4.1 tests while I'm here
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
extra/yassl/src/ssl.cpp:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/net_serv.cc:
Auto merged
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/r/archive.result:
Auto merged
mysql-test/t/archive.test:
SCCS merged
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
support-files/mysql.spec.sh:
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
into siva.hindu.god:/usr/home/tim/m/bk/51
client/mysqltest.c:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
server-tools/instance-manager/guardian.cc:
Auto merged
server-tools/instance-manager/instance.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
include/my_pthread.h:
Manual merge.
mysql-test/r/archive.result:
Manual merge.
mysql-test/t/archive.test:
Manual merge.
The mysql-test-run-shell.sh script was improperly evaluating an expression for setting up multiple masters.
This fix adds the `expr $MASTER_MYPORT + 1` construct to the offending line in order for the expression to evaluate properly and produce 9307 instead of the string "9306+1"
Problem:
When creating a temporary field for a temporary table in create_tmp_field_from_field(), a resulting field is created as an exact copy of an original one (in Field::new_field()). However, Field_enum and Field_set contain a pointer (typelib) to memory allocated in the parent table's MEM_ROOT, which under some circumstances may be deallocated later by the time a temporary table is used.
Solution:
Override the new_field() method for Field_enum and Field_set and create a separate copy of the typelib structure in there.
include/typelib.h:
Added copy_typelib() declaration
mysql-test/r/sp.result:
Added a testcase for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
mysql-test/t/sp.test:
Added a testcase for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache"
mysys/typelib.c:
Added copy_typelib() definition
sql/field.cc:
Create a copy of the internal 'typelib' structure when copying Field_enum of Field_set objects.
sql/field.h:
Override new_field method in Field_enum (and Field_set) to copy the typelib structure.
- Use same precision (milliseconds) for all time functions
used when calculating time for pthread_cond_timedwait
- Use 'GetSystemTimeAsFileTime' for both start and curr time
include/config-win.h:
Move all defines for 'pthread_cond_timedwait' to my_pthread.h
include/my_global.h:
Move all defines for 'pthread_cond_timedwait' to my_pthread.h
include/my_pthread.h:
Redefine "struct timespec" to better suite the needs
of 'pthread_cond_timedwait' for windows implementation
Add windows specific define for set_timespec_nsec
Move all defines related to pthread_cond_timed wait to same file
Declare union for reading FILETIME as __int64 with correct alignment
mysys/my_wincond.c:
Use 'GetSystemTimeAsFileTime()' both for getting start and current time
Use new members of "struct timespec"
Make sure the calculated timeout value never exceeds the value
passed to set_timespec/set_timespec_nsec
server-tools/instance-manager/guardian.cc:
Use set_timespec macro
server-tools/instance-manager/instance.cc:
Use set_timespec macro
into kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/r/myisam.result:
SCCS merged
Merged 4.1->5.0. Updated myisam.test
mysql-test/r/myisam.result:
updated result file
mysql-test/t/myisam.test:
Removing symlink specific test from myisam test
into kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/r/myisam.result:
SCCS merged
mysql-test/t/myisam.test:
SCCS merged
