0a0f1aa386
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-23 12:13:30 -07:00
60e178bb73
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.1
2006-09-23 08:45:26 +02:00
97d1b44fc4
Merge zim.(none):/home/brian/mysql/merge-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-09-22 23:35:43 -07:00
48381342d8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-22 23:33:08 -07:00
4a3bf4ae84
Required file for next tests (taken from work by JimW in Falcon)
2006-09-22 23:32:47 -07:00
b8556c82a9
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-23 06:06:06 +02:00
5e60232da9
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-22 21:14:58 +02:00
4f5e3b3dee
After merge fixes
2006-09-21 14:19:17 +02:00
2ec2300759
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-21 13:54:57 +02:00
738cd74b52
After merge fixes
2006-09-21 13:38:01 +02:00
2c5dc57e27
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 13:28:16 +02:00
9538acf5dc
Adding proper setup phase for test case rpl_insert_id
2006-09-21 13:19:52 +02:00
c34601adec
If mysqlslap schema does not exists, it should be an error, so no need for IF EXISTS
...
Setting default database back to 'test', so that next test case don't use the wrong database
2006-09-21 13:04:33 +02:00
fe782f92d6
Vertical printout in test to make easier to read
2006-09-21 03:32:42 +02:00
00ba129e51
Version 5.1 needs one connection less
2006-09-21 02:44:58 +02:00
bc8207c9b8
Result file fixes after merge
2006-09-21 02:39:47 +02:00
a397c1805c
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-21 01:15:28 +02:00
6aded45614
Fix of result files from merge
2006-09-21 00:59:48 +02:00
0f85f6f760
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-21 00:53:47 +02:00
57a74ea4af
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-21 00:23:20 +02:00
d20e326504
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 00:05:56 +02:00
9707d43cc3
bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated reslt file
2006-09-20 20:04:58 +02:00
d6d0208dfb
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-20 16:49:06 +02:00
99a4f96535
Bug#18976 CRBR: multiple binlog, second binlog may miss schema log events:Change test back to verify again
2006-09-20 16:46:54 +02:00
77d610c2b4
Merge chilla.local:/home/mydev/mysql-5.1--team
...
into chilla.local:/home/mydev/mysql-5.1-tomain
2006-09-20 14:36:32 +02:00
63d78a7659
Removed ifdef need.
...
Cleaned up test to no longer need have_
2006-09-19 13:58:12 -07:00
0d019e0380
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
2006-09-19 13:47:15 +02:00
6ff9664d46
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
2006-09-19 18:36:18 +10:00
844df8f085
post merge fixes
2006-09-18 15:52:16 -07:00
424857e0e4
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/engines-merge
2006-09-18 12:16:03 -07:00
78ad0eee91
Fixing and checking result for mysqldump test.
2006-09-18 21:09:48 +02:00
49eb41e09d
BUG#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,
...
Change things around so that we add a row for each log file group that lists
the free space for that log file group.
2006-09-19 01:44:32 +10:00
36be4318da
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-09-18 20:43:36 +05:00
cf9d1c9152
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 19:01:07 +04:00
5f5d1507ec
1. Cumulated fix for Bug#22398, #22404 and #22405
...
2. Correct some logical bugs within the tests, which were caused by
automatic resolve of BitKeeper
2006-09-18 16:55:56 +02:00
419a51c5a5
Merge april.(none):/home/svoj/devel/bk/mysql-5.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-09-18 19:43:33 +05:00
f1100c007d
merge fixes
2006-09-18 18:30:51 +04:00
f21eadfc74
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-18 16:23:45 +05:00
dd1c43ba2a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-18 13:11:03 +02:00
d1fd23b1c9
Bug #21378 Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone
2006-09-18 13:00:21 +02:00
ce8ed889d7
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1
2006-09-18 12:57:20 +02:00
2ec485f06e
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:20:20 +02:00
fae596aafd
merge fixes
2006-09-18 12:14:27 +02:00
522823b5d3
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 11:19:40 +02:00
e2d15b16d2
BUG#19419: VIEW: View that the column name is different
...
by master and slave is made.
2006-09-18 03:21:00 +04:00
d3d3cef88c
Fixed bug #21493 : crash for the second execution of a function
...
containing a select statement that uses an aggregating IN subquery.
Added a parameter to the function fix_prepare_information
to restore correctly the having clause for the second execution.
Saved andor structure of the having conditions at the proper moment
before any calls of split_sum_func2 that could modify the having structure
adding new Item_ref objects. (These additions, are produced not with
the statement mem_root, but rather with the execution mem_root.)
2006-09-16 09:50:48 -07:00
1963d68a08
Test case fixes
2006-09-16 13:20:06 +02:00
c73d2318a3
Merge bk-internal:/home/bk/mysql-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B21180-4.1-opt
2006-09-15 18:56:05 +03:00
cb2fa1d715
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkigw8-fe00f800-98.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
2006-09-15 17:55:05 +03:00
6055e8a9f7
Bug#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage
...
A query SET @@GLOBAL.binlog_format = ... returns an error when NDB is the
default storage. This fails some tests invoking the set binlog_format explicitly.
because the var turns to be read-only.
In the following are files and method to fix if needed.
t/
ndb_binlog_basic2.test # here the failure is benign
rpl_rbr_to_sbr.test # does not check any ndb features =>
. # => not_ndb_default is enough
rpl_row_basic_8partition.test # set binlog_format can be replaced
rpl_switch_stm_row_mixed.test # does not check any ndb features =>
. # => not_ndb_default is enough
two more invoking invoke extra/rpl_truncate_helper.test
rpl_truncate_2myisam # to be fixed with not_ndb_default
rpl_truncate_3innodb # same as above
. # because there is a dedicated to ndb .
. # rpl_truncate_7ndb* suit.
Adapting/testing a new implement
--source include/safe_set_to_maybe_ro_var.inc
to avoid abort due to the error using binlog_format as application.
2006-09-15 17:25:13 +03:00
