msvensson@neptunus.(none)
a25cc0b933
Change 'mtr_kill_process' to only take three arguments. The last indicating max number of seconds to wait for process to be killed.
...
Leave it to the implementation of 'mtr_kill_process' how long to wait between each attempt to kill/detect if process has been killed.
2006-06-11 11:28:11 +02:00
msvensson@neptunus.(none)
942b98384f
Add printout of commment why test was skipped
2006-06-11 10:12:31 +02:00
msvensson@neptunus.(none)
ade1b6ce11
Prepare for selective restart of slaves
...
Add comment why test is skipped
2006-06-11 10:10:55 +02:00
msvensson@neptunus.(none)
82103ed9b3
Update test results
...
Fix merge problem
2006-06-11 09:04:23 +02:00
msvensson@neptunus.(none)
c7bedca12f
Add comment about when ndbcluster tables are removed from mysqld datadir
2006-06-10 22:10:57 +02:00
msvensson@neptunus.(none)
d13d9dec55
Cacluate nodeid and ndb_fs path when initializing ndbds, to be used when defining log files and when removing the ndb_fs after failed test case
2006-06-10 21:47:25 +02:00
msvensson@neptunus.(none)
da9d2e3270
Use foreach loop to remove fs for ndbd nodes when restoring snapshot
2006-06-10 21:20:14 +02:00
msvensson@neptunus.(none)
0dc04dd7f1
Use function 'stop_all_servers' to stop the running servers before restoring snapshot and resuming tests
2006-06-10 20:59:14 +02:00
msvensson@neptunus.(none)
2c538f6cde
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-06-10 20:33:50 +02:00
msvensson@neptunus.(none)
0e9798d3d2
Update result
2006-06-10 19:35:18 +02:00
msvensson@neptunus.(none)
b24fbccc95
Run check testcase for all masters and slaves
2006-06-10 19:33:37 +02:00
ingo@mysql.com
76f066aa32
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-amerge
2006-06-10 12:24:44 +02:00
ingo@chilla.local
a94ad6a2e3
Merge mysql.com:/home/mydev/mysql-5.1--main
...
into mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-10 06:15:26 +02:00
igor@rurik.mysql.com
60620b31fe
Post-merge fixes
2006-06-09 19:29:39 -07:00
igor@rurik.mysql.com
940fe6fea6
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-06-09 17:56:08 -07:00
igor@rurik.mysql.com
bcc898f71b
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into rurik.mysql.com:/home/igor/mysql-5.1
2006-06-09 15:39:10 -07:00
kent@mysql.com
3744b46a1d
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/data0/mysqldev/my/mysql-4.1
2006-06-09 22:42:34 +02:00
konstantin@mysql.com
5579fc230d
Disable im_life_cycle test
2006-06-10 00:35:44 +04:00
kent@mysql.com
a5bc38a0d3
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/mysqldev/my/mysql-5.0
2006-06-09 22:34:21 +02:00
igor@rurik.mysql.com
3d6899948b
Merge rurik.mysql.com:/home/igor/mysql-5.1
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 12:31:15 -07:00
igor@rurik.mysql.com
e6e4462d68
Post-merge fixes
2006-06-09 12:27:28 -07:00
msvensson@neptunus.(none)
9ebf7944e3
Bug #7498 User variable SET saves SIGNED BIGINT as UNSIGNED BIGINT
...
- Add unsigned flag to user_var_entry, used when 'type' is INT_RESULT
- Propagate unsigned flag from the query executed by Item_single_row_subselect
2006-06-09 19:35:54 +02:00
sergefp@mysql.com
a0676542a7
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/psergey/mysql-5.1-bug19684
2006-06-09 20:38:53 +04:00
ingo@chilla.local
091401e7a8
Merge mysql.com:/home/mydev/mysql-5.1--main
...
into mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 18:20:10 +02:00
ingo@chilla.local
f991b573c5
Merge mysql.com:/home/mydev/mysql-5.1--main
...
into mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 17:32:23 +02:00
rburnett@bk-internal.mysql.com
017e1a502e
Many files:
...
Merging changesets from crashed 5.1-kt
2006-06-09 16:20:23 +02:00
holyfoot@mysql.com
c2df72d6cb
Merge
2006-06-09 19:09:42 +05:00
joerg@trift2.mysql.com
44c0053a44
Merge trift2.mysql.com:/M41/bug20303-4.1
...
into trift2.mysql.com:/M41/mysql-4.1
2006-06-09 14:37:24 +02:00
joerg@trift2.mysql.com
4b9a1a8bbb
Merge trift2.mysql.com:/M50/bug20303-5.0
...
into trift2.mysql.com:/M50/mysql-5.0
2006-06-09 14:13:01 +02:00
joerg@trift2.
7987ef89fd
Merge mysql.com:/M51/bug20303-5.1 into mysql.com:/M51/mysql-5.1
2006-06-09 13:56:29 +02:00
ingo@mysql.com
0ae24af51b
Merge mysql.com:/home/mydev/mysql-5.1--main
...
into mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 13:51:41 +02:00
joerg@mysql.com
98b80d12cd
Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1
2006-06-09 13:49:10 +02:00
mskold@mysql.com
22fea185bd
Merge mysql.com:/home/marty/MySQL/mysql-4.1
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-09 12:07:04 +02:00
igor@rurik.mysql.com
9ec346b980
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 00:48:51 -07:00
igor@rurik.mysql.com
70ee1c2c6e
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 00:23:59 -07:00
joerg@mysql.com
1cd78f7a2b
Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0
2006-06-08 19:57:26 +02:00
joerg@mysql.com
a26c9c31a1
mysql-test/mysql-test-run.pl : Output the usage error if one is given. (Found when fixing bug#20303)
2006-06-08 19:55:22 +02:00
joerg@mysql.com
47f37f4d45
Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0
2006-06-08 19:32:25 +02:00
cmiller@zippy.(none)
4bb358924c
Bug#19904: UDF: not initialized *is_null per row
...
The is_null value was initialized once and thereafter only set to indicate
NULL, and never unset to indicate not-NULL.
Now set is_null to false, in addition to only setting it to true when the value
in question is null.
2006-06-08 13:25:28 -04:00
mskold@mysql.com
597e1444aa
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked
2006-06-08 16:12:38 +02:00
joerg@mysql.com
5091df1333
mysql-test/mysql-test-run.pl : A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument"
2006-06-08 14:52:33 +02:00
gkodinov@mysql.com
c9bb9413ab
Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
...
into mysql.com:/home/kgeorge/mysql/5.0/B15355
2006-06-08 14:26:02 +03:00
gkodinov@mysql.com
395affb8e9
Bug #15355 : Common natural join column not resolved in prepared statement nested
...
query
Problem:
There was a wrong context assigned to the columns that were added in insert_fields()
when expanding a '*'. When this is done in a prepared statement it causes
fix_fields() to fail to find the table that these columns reference.
Actually the right context is set in setup_natural_join_row_types() called at the
end of setup_tables(). However when executed in a context of a prepared statement
setup_tables() resets the context, but setup_natural_join_row_types() was not
setting it to the correct value assuming it has already done so.
Solution:
The top-most, left-most NATURAL/USING join must be set as a
first_name_resolution_table in context even when operating on prepared statements.
2006-06-08 13:34:03 +03:00
evgen@moonbone.local
9743628758
Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
...
The st_lex::which_check_option_applicable() function controls for which
statements WITH CHECK OPTION clause should be taken into account. REPLACE and
REPLACE_SELECT wasn't in the list which results in allowing REPLACE to insert
wrong rows in a such view.
The st_lex::which_check_option_applicable() now includes REPLACE and
REPLACE_SELECT in the list of statements for which WITH CHECK OPTION clause is
applicable.
2006-06-07 16:17:56 +04:00
ramil@mysql.com
fe01874613
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b6880
2006-06-07 14:40:33 +05:00
ramil@mysql.com
0bdae38efb
Fix for bug #6880 : LAST_INSERT_ID() within a statement
2006-06-07 14:01:10 +05:00
evgen@moonbone.local
d027dd7c0d
Fixed bug#15962: CONCAT() in UNION may lead to a data trucation.
...
To calculate its max_length the CONCAT() function is simply sums max_lengths
of its arguments but when the collation of an argument differs from the
collation of the CONCAT() max_length will be wrong. This may lead to a data
truncation when a tmp table is used, in UNIONS for example.
The Item_func_concat::fix_length_and_dec() function now recalculates the
max_length of an argument when the mbmaxlen of the argument differs from the
mbmaxlen of the CONCAT().
2006-06-07 01:10:23 +04:00
kent@mysql.com
c73ca30d71
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/mysqldev/my/mysql-5.0
2006-06-06 22:12:14 +02:00
aivanov@mysql.com
b6d1fcd00a
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss609
2006-06-06 23:56:48 +04:00
aivanov@mysql.com
c46b17a731
Applied innodb-5.0-ss609 snapshot.
...
Fixed BUG#19727 "InnoDB crashed server and crashed tables
are not recoverable".
2006-06-06 23:37:42 +04:00