ramil/ram@myoffice.izhnet.ru
8445f3e3de
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/usr/home/ram/work/mysql-5.1-maint
2006-09-15 14:15:09 +05:00
dlenev@mockturtle.local
5ba1b83c98
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
2006-09-14 23:53:35 +04:00
tsmith/tim@siva.hindu.god
52c01e88d4
Post-merge fixes:
...
- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc
2006-09-13 15:37:35 -06:00
tsmith@maint2.mysql.com
6a31ec2cad
Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50
...
into maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51
2006-09-13 09:03:52 +02:00
ahristov@bk-internal.mysql.com
75eeececb1
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
2006-09-06 14:35:27 +02:00
guilhem@gbichot3.local
e4d3595b18
Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".
...
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
only NDB wanted that. Users and trainers complained that it affected
InnoDB and was a change compared to 4.1 where only NDB autocommitted.
To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
ha_ndbcluster::external_lock().
The result is that LOAD DATA INFILE commits all uncommitted changes
of NDB if this is an NDB table, its own changes if this is an NDB
table, but does not affect other engines.
Note: even though there is no "commit the full transaction at end"
anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
problems per a comment of Pem).
Note: ha_ndbcluster::has_transactions() does not give reliable results
because it says "yes" even if transactions are disabled in this engine...
2006-09-05 16:52:05 +02:00
mskold/marty@linux.site
04a62eb684
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 15:26:03 +02:00
mskold/marty@mysql.com/linux.site
8fdc781d39
Fixed ndbapi-examples, and added tests for mysql-test-run.pl
2006-09-01 15:14:50 +02:00
kostja@bodhi.local
ebb7070430
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-30 03:00:19 +04:00
anozdrin/alik@alik.
1a7cb4153c
Preliminary patch for the following bugs:
...
- BUG#15934: Instance manager fails to work;
- BUG#18020: IM connect problem;
- BUG#18027: IM: Server_ID differs;
- BUG#18033: IM: Server_ID not reported;
- BUG#21331: Instance Manager: Connect problems in tests;
The only test suite has been changed
(server codebase has not been modified).
2006-08-29 15:46:40 +04:00
brian@zim.(none)
41f920b013
Merge zim.(none):/home/brian/mysql/dep-5.1
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-14 21:26:33 -07:00
andrey@example.com
53089a19d9
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337
...
into example.com:/work/mysql-5.1-runtime-wl3337
2006-08-14 15:26:59 +02:00
kostja@bodhi.local
04c97488f9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
baker/brian@zim.(none)
5a466cc48c
Removed bdb test cases.
2006-08-10 18:29:25 -07:00
kostja@bodhi.local
4bfc67fc3c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
2006-08-02 14:13:01 +04:00
msvensson@neptunus.(none)
c40e953db5
Bug#19535 mysql-test-run cannot handle crashing test cases
...
- Make mysql-test-run.pl restart a crashed/stopped process if it was expected it should crash.
- Added testcase for "crash_commit_before", which tests behaviour when server crashes just before commit.
* The testcase first write a small var/tmp/master0.expect file indicating expected crash
* Then sets "DEBUG" variable to for example "d,crash_commit_before" and then executes a commit.
* The server will crash and be brought back up by mysql-test-run.pl
* Test case will then wait for the process to come back online before continuing.
2006-07-20 13:23:45 +02:00
anozdrin/alik@booka.site
bf10578fde
Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.
...
Fix for the bug in mysql-test-run.pl which prevents other tests succeed
after IM-test failure.
The idea of the fix of BUG#20716 is to:
1. Check each SHOW INSTANCES statement, add necessary "sleep" instruction before;
2. Move all environment checkings into the one file and include it everywhere.
2006-07-20 13:24:12 +04:00
msvensson@neptunus.(none)
a9572e07e9
Update 'abort_not_supported_test' to print a reason why the test was aborted
...
and use it in mysql-test-run.pl
Use standard defines as last argument to 'fn_format'
2006-07-19 14:25:52 +02:00
andrey@lmy004.
0404763d81
WL#3337 (Events new architecture)
...
Small updates before patch submit.
2006-07-17 16:52:45 +02:00
igreenhoe/greenman@anubis.greendragongames.com
abb75129f8
4.1 -> 5.0 merge
2006-07-13 16:35:25 -07:00
cmiller@zippy.(none)
9be1c70404
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-07-10 13:38:22 -04:00
tomas@poseidon.ndb.mysql.com
1db0b2c6a6
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 19:02:38 +02:00
tomas@poseidon.ndb.mysql.com
4199719438
Bug #20820 auto inc table not handled correctly when restored from cluster backup
2006-07-06 18:50:44 +02:00
cmiller@zippy.(none)
91b8b26411
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-07-05 16:16:09 -04:00
monty@mysql.com
649157954b
Fixed failure with rpl_truncate_7ndb.test when using statement based replication.
...
is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
(Faster and easier to understand)
Allow cluster_binlogging also in mixed replication mode.
2006-06-22 22:44:21 +03:00
lars@mysql.com
5f37fc4a76
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-16 01:15:19 +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
monty@mysql.com
37d7bbb335
Added --pipe option for faster compile
...
Changed error to be more descriptive when you are refering to a not existing key
Fixed core dump in view test and changed to better error message
2006-06-06 20:21:36 +03:00
igor@rurik.mysql.com
d350bd9050
Post-merge fixes
2006-05-31 22:55:45 -07:00
msvensson@shellback.(none)
3970e560a6
Cleanup testcases
...
- Add missing drop(s)
- Reset changed variables
NOTE! These kind of problems are easily found with --check-testcases options to mysql-test-run.pl
2006-05-31 23:34:28 +02:00
mats@mysql.com
4092292c90
Bug#19995 (Extreneous table maps generated for statements that do not generate rows):
...
Switched to writing out table maps for tables that are locked when
the first row in a statement is seen.
2006-05-31 19:21:52 +02:00
bar@mysql.com
51eec5cf9b
Bugs#17647: Trouble with "create database"
...
Problem:
if a user was granted privileges on database "d1",
it also was able to act on "D1" (i.e. in upper case),
even on Unix with case sensitive file system.
Fix:
Initialize grant hash to use binary comparison
if lower_case_file_system is not set (on most unixes),
and case insensitive comparison otherwise (Windows, MacOSX).
2006-05-04 11:55:09 +05:00
monty@mysql.com
86b2be8d35
After merge fixes
...
Remove compiler warnings
Fix some broken tests
Workaround for syncronization bug in NDB (Bug #16445 )
2006-05-04 06:28:24 +03:00
jimw@mysql.com
f21c110d13
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 13:27:38 -07:00
msvensson@shellback.(none)
0e5113aead
Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
...
Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library.
2006-04-27 16:32:40 +02:00
tomas@poseidon.ndb.mysql.com
fc387e73c0
ndb: break out ndb backup compatability test, so that it can be disabled on mac
2006-04-26 01:11:40 +02:00
msvensson@neptunus.(none)
b30df055af
Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT"
2006-04-24 12:01:16 +02:00
msvensson@neptunus.(none)
d1536ba0c9
Make have_ndb.in portable
2006-04-24 12:00:11 +02:00
msvensson@neptunus.(none)
d59a0f4840
Bug#17002 mysql-test-run as root user
...
- Add test to see if tests are running with root permissions
- Disables tests that uses chmod if that is the case
2006-04-24 10:21:09 +02:00
pekka@mysql.com
a272f257c2
ndb/repl - bug#19004 rpl_ndb_2myisam ok, rpl_ndb_2innodb new bug(number)19227
2006-04-20 18:53:23 +02:00
mats@mysql.com
04fc2d9eb8
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-19 10:58:44 +02:00
tomas@poseidon.ndb.mysql.com
07753c59a0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-13 10:48:24 +02:00
mats@mysql.com
405ebbf231
Bug#17400 (Cluster Replication: Delete and update of row w/o PK fails):
...
Restarting scan after call to delete_row().
2006-04-12 21:19:24 +02:00
tomas@poseidon.ndb.mysql.com
7c91110609
new files
2006-04-12 15:56:29 +02:00
msvensson@neptunus.(none)
9cdd78078e
Bug#18564 Test failure due to test not checking preconditions
...
- Add variable "have_dynamic_loading" and use it to check if the udf test should be run.
2006-04-12 15:13:16 +02:00
kent@mysql.com
8476262472
Merge
2006-04-11 02:48:17 +02:00
aelkin@mysql.com
5b6708e3ba
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-09 19:38:59 +03:00
aelkin@mysql.com
cbee6eca95
BUG#18906 Test case rpl_temporary fails when using --vardir option
...
env variable name is fixed.
2006-04-09 13:27:53 +03:00
aelkin@mysql.com
9cc16ddb1e
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-08 18:51:29 +03:00
aelkin@mysql.com
010a8a5728
#18906 : bushbuild reports rpl_temporary fails on solaris, AIX, QNX
...
Removing the problematic line from include test file.
2006-04-08 16:29:11 +03:00