9bf39c6fe9
Merge bodhi.(none):/opt/local/work/mysql-5.1-target-5.1.22
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-11 14:09:15 +04:00
9c72c3dfdb
A fix for Bug#29049 lock_multi fails in rare case.
...
The patch changes the test case only.
The fix is to replace all 'sleep's with wait_condition. This makes
the test deterministic and also ~300 times faster.
2007-08-11 14:07:49 +04:00
da84df71e8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-11 01:19:51 +04:00
8f9168df53
A fix for Bug#30212 events_logs_tests not deterministic; SLEEP(2), others
...
Make the test deterministic.
2007-08-11 01:11:56 +04:00
b3cc3d4a9d
Bug#25930 (CREATE TABLE x SELECT ... parses columns wrong when ran with
...
ANSI_QUOTES mode)
This patch contains a test case only, showing that the bug has been fixed.
The issue was related to parsing <"blah">, where the lexical analyser
would not properly delimit the start and end of the token.
Properly making the token boundaries has been fixed in sql_lex.cc
with the patch for bug 25411 : see the Lex_input_stream class.
2007-08-09 17:31:00 -06:00
3ecef8c0b9
A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system
2007-08-08 15:49:19 +04:00
28f1f1828d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-08 11:36:55 +04:00
0065e85e32
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-06 01:35:43 +02:00
6ab4112c37
mysql-test-run.pl:
...
Search "relwithdebinfo" directory in CMake Visual Studio build
Search for "mysqld-debug" even in source tree
2007-08-06 01:29:53 +02:00
c3e3a5e188
Added test for bug #21281 "Pending write lock is incorrectly removed
...
when its statement being KILLed". The bug itself was fixed by separate
patch in 5.0 tree.
2007-08-05 13:55:37 +04:00
ec2aeb4fae
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2
2007-08-05 13:26:10 +04:00
f0f9652988
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-08-04 11:08:11 +02:00
64b6c61108
Merge amd64.(none):/src/mysql-5.1-maint
...
into amd64.(none):/src/mysql-5.1-build_29903
2007-08-03 21:44:59 -04:00
171f402ad4
Bug#29903 The CMake build method does not produce the embedded library.
...
- GCov fix.
2007-08-03 21:08:48 -04:00
3ed9739c82
Bug#29903 The CMake build method does not produce the embedded library.
...
- Changes to correct and test Windows embedded build.
2007-08-03 14:43:12 -04:00
92d4958eb7
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
2007-08-03 19:04:59 +02:00
ea9848094a
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
2007-08-03 18:59:16 +02:00
493634e4c7
Merge bk-internal:/home/bk/mysql-5.1-marvel
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 17:15:23 +02:00
fb8dff9721
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
...
into mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
2007-08-03 17:16:02 +05:00
7754da28f9
After merge fix
2007-08-03 15:57:14 +05:00
c01ce7b1e3
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
2007-08-03 15:30:31 +05:00
4eebfd09c2
Bug#28875 Conversion between ASCII and LATIN1 charsets does not function
...
(Regression, caused by a patch for the bug 22646).
Problem: when result type of date_format() was changed from
binary string to character string, mixing date_format()
with a ascii column in CONCAT() stopped to work.
Fix:
- adding "repertoire" flag into DTCollation class,
to mark items which can return only pure ASCII strings.
- allow character set conversion from pure ASCII to other character sets.
2007-08-03 15:25:23 +05:00
237d586700
Simplify logging code a bit (to make code smaller and faster)
...
Moved duplicated code to inline function store_timestamp()
Save thd->time_zone_used when logging to table as CSV internally cases it to be changed
Added MYSQL_LOCK_IGNORE_FLUSH to log tables to avoid deadlock in case of flush tables.
Mark log tables with TIMESTAMP_NO_AUTO_SET to avoid automatic timestamping
Set TABLE->no_replicate on open
2007-08-03 01:14:27 +03:00
27ab885525
WL#3732 Information schema optimization
2007-08-03 03:14:05 +05:00
e8aff50790
WL#3228 (NDB) : RBR using different table defs on slave/master
...
This patch corrects a problem found during testing on Solaris. The code
changes how length values are retrieved on big endian machines. The
patch allows the rpl_extraColmaster tests to run on these machines.
2007-08-02 16:15:52 -04:00
dc2cab6561
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
2007-08-02 15:27:47 -04:00
0d9301585b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b30088/b30088.5.0
2007-08-02 18:23:23 +05:00
e8eaca54a3
After-merge fix: result adjusted.
2007-08-02 17:14:48 +05:00
7512856c31
Merge mysql.com:/home/ram/work/b30088/b30088.5.0
...
into mysql.com:/home/ram/work/b30088/b30088.5.1
2007-08-02 16:56:32 +05:00
ea3388f2b2
Add a test case for Bug#5719 "impossible to lock VIEW".
...
It has been possible to lock a view in 5.1 for some time.
2007-08-02 13:59:02 +04:00
0f6f44424f
Post-merge fix. Update some test results, and add an InnoDB-only
...
compatibility hook, thd_mark_transaction_to_rollback().
2007-08-02 02:22:31 -06:00
93f0771fca
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-08-02 07:55:33 +03:00
b13de9343f
Merge 50 -> 51 (-opt changesets)
2007-08-01 18:59:41 -06:00
a52a078f75
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:40:02 -06:00
534c3f325d
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:39:13 -06:00
7509e1ed24
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:32:01 -06:00
33c4cdaa66
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:30:55 -06:00
9ce717b0fe
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-01 18:15:24 -06:00
8575227571
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:14:50 -06:00
d63d8cb1a3
Add a test case for Bug#18287 create federated table always times out,
...
error 1159 ' ' (fixed by the patch for Bug 25679)
2007-08-02 03:32:54 +04:00
96f90711a7
Fixes Bug#30127: --debug-info no longer prints memory usage in mysql
...
Fixed compiler warnings, errors and link errors
Fixed new bug on Solaris with gethrtime()
Added --debug-check option to all mysql clients to print errors and memory leaks
Added --debug-info to all clients. This now works as --debug-check but also prints memory and cpu usage
2007-08-01 22:59:05 +03:00
1c1abb4252
Fix an unstable test.
2007-08-01 16:48:14 +04:00
c5209fcbd0
Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
...
into mysql.com:/home/ram/work/b29928.new/b29928.new.5.1
2007-08-01 15:31:20 +05:00
7fb417d0ba
Fix for bug #29928 : INSERT ... VALUES(connection_id(), ...) incorrect
...
restores from mysqlbinlog out
Problem: using "mysqlbinlog | mysql" for recoveries the connection_id()
result may differ from what was used when issuing the statement.
Fix: if there is a connection_id() in a statement, write to binlog
SET pseudo_thread_id= XXX; before it and use the value later on.
2007-08-01 15:27:03 +05:00
b89ff2fd6f
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-08-01 12:32:40 +04:00
d0dc51b4f7
Fix an unstable test. It was reliant on the current time.
2007-08-01 12:28:08 +04:00
c6bdcd19f2
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-08-01 09:59:48 +02:00
c62d7528c8
Fix for bug #30088 : Can't disable myisam-recover by a value of "".
...
- test result.
Problem: we don't proper handle "" value of the --myisam-recover option.
Fix: turn off myisam recovering if --myisam-recover="" is set.
2007-08-01 11:41:13 +05:00
70e14610d6
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
2007-07-31 17:36:19 -06:00
6238763281
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-31 23:47:38 +04:00
