unknown
a754f1befd
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 15:41:13 +04:00
unknown
41e110f777
fix test in --ps-protocol mode
...
mysql-test/t/csv.test:
fix test. In --ps-protocol mode warnings are eaten by the test suite.
Disable ps-protocol mode for the statements, which throw the warnings
we look for.
2006-03-29 15:37:42 +04:00
unknown
af74454572
Added more debugging printouts
2006-03-29 13:13:39 +02:00
unknown
734eda5f25
Manual merge
...
mysql-test/mysql-test-run.pl:
Merge
sql/mysqld.cc:
Merge
2006-03-29 12:09:37 +02:00
unknown
077b4888c3
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 13:46:06 +04:00
unknown
7c1c4c7167
Move "start-from" into section "Control what tests to run"
2006-03-29 09:59:16 +02:00
unknown
29ca093e60
Use default value variable when printing out the default timeouts
2006-03-29 09:39:18 +02:00
unknown
1ae58ddfa4
Remove "restart-cleanup" not needed any more as a snapshot of the db will be restored after a failed test case
2006-03-29 09:30:07 +02:00
unknown
5eef76cfed
"ndbcluster_port" => "ndbcluster-port"
...
"ndbcluster_port_slave" => "ndbcluster-port-slave"
2006-03-29 09:15:29 +02:00
unknown
c603c5acc4
"ndbconnectstring" => "ndb-connectstring"
2006-03-29 09:00:48 +02:00
unknown
9d682d54d9
Add comments for "--big-test" aka "--big" and move it to the section "Control what tests to run"
2006-03-29 08:55:29 +02:00
unknown
34c59c2453
GIS test for NDB is failing sporatically.
...
mysql-test/t/disabled.def:
Disabling GIS test
2006-03-28 19:25:26 -08:00
unknown
c2f5dfef93
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/cps/mysql/devel/5.1-repair-csv
storage/csv/ha_tina.cc:
Auto merged
2006-03-29 06:34:12 +04:00
unknown
2a67aecd1a
Post-review fixes for WL#3154 "Enable REPAIR for CSV tables"
...
mysql-test/r/csv.result:
update result file
mysql-test/t/csv.test:
add more tests
storage/csv/ha_tina.cc:
post-review fixes & cleanup
storage/csv/ha_tina.h:
post-review fixes
2006-03-29 06:28:57 +04:00
unknown
a78f66971b
Two additional disabled tests, trying to clear pushbuild.
...
mysql-test/t/disabled.def:
Two more disabled tests
2006-03-28 18:18:27 -08:00
unknown
b924ee8d81
Behavior change to preserve schema unless you specify autogenerated SQL or create values.
...
client/mysqlslap.c:
Behavior change
2006-03-28 17:59:11 -08:00
unknown
dac2f8893b
Creating bugs, disabling tests. Trying to get the 5.1 tree clean under pushbuild.
...
mysql-test/t/disabled.def:
Adding tests
2006-03-28 15:10:06 -08:00
unknown
caeb6e274e
Remove unused variable
2006-03-28 19:34:44 +02:00
unknown
bc609ffbd0
Add new paths where to look for mysql_client_test
2006-03-28 19:32:50 +02:00
unknown
d02b57ceb8
Remove duplicate declaration of stress_basdir
2006-03-28 19:30:08 +02:00
unknown
35c5732630
Declare innobase "srv_*" variables as extern "C"
...
sql/mysqld.cc:
Declare variables using "extern C" just as they are declared in srv0srv.c and set_var.cc
2006-03-28 19:27:38 +02:00
unknown
a0067d7f61
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1
2006-03-28 11:12:59 -06:00
unknown
253289fe43
some simple CMAKE updates
...
cmakelists.txt:
restored the /wd4996 flag for vs8 compiles
broke lines to be <= 79 chars in length
sql/cmakelists.txt:
broke lines to make them not more than 79 chars long
storage/csv/cmakelists.txt:
New BitKeeper file ``storage/csv/cmakelists.txt''
2006-03-28 10:05:25 -06:00
unknown
e4637759ca
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-28 20:51:50 +05:00
unknown
4638ea25b7
Fix files not removed from make dist when deleted.
2006-03-28 17:34:35 +02:00
unknown
3a60c1b389
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-28 20:09:07 +05:00
unknown
567ded2d9b
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1
2006-03-28 09:09:06 -06:00
unknown
2de71f3fa5
restored handlerton-win.cc that I mistakenly deleted.
...
sql/handlerton-win.cc:
Rename: BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df -> sql/handlerton-win.cc
2006-03-28 09:05:23 -06:00
unknown
cdd75b46c1
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmpbuild
2006-03-28 16:35:50 +02:00
unknown
8cf93ac629
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
mysql-test/r/cast.result:
Auto merged
sql/field.cc:
Auto merged
2006-03-28 18:24:04 +05:00
unknown
17d2b065f4
cast.result:
...
After merge fix.
mysql-test/r/cast.result:
After merge fix.
2006-03-28 18:21:19 +05:00
unknown
27000fb555
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-03-28 17:26:45 +05:00
unknown
44517ca040
Bug#18053 Partitions: crash if null
...
Bug#18070 Partitions: wrong result on WHERE ... IS NULL
removed unnecessary code
added handling of NULL values
mysql-test/r/partition.result:
Bug#18053 Partitions: crash if null
Bug#18070 Partitions: wrong result on WHERE ... IS NULL
test case
mysql-test/t/partition.test:
Bug#18053 Partitions: crash if null
Bug#18070 Partitions: wrong result on WHERE ... IS NULL
test case
sql/opt_range.cc:
Bug#18053 Partitions: crash if null
Bug#18070 Partitions: wrong result on WHERE ... IS NULL
initialisation of part_iter.has_null_value
sql/sql_partition.h:
Bug#18053 Partitions: crash if null
Bug#18070 Partitions: wrong result on WHERE ... IS NULL
added has_null_value
2006-03-28 17:25:19 +05:00
unknown
e1cd462ea6
Merge mysql.com:/usr/home/bar/mysql-4.1.b15098
...
into mysql.com:/usr/home/bar/mysql-5.0
Bug#15098
mysql-test/t/cast.test:
Auto merged
mysql-test/r/cast.result:
After merge fix
sql/field.cc:
After merge fix
2006-03-28 17:07:26 +05:00
unknown
c2ed6be20c
Merge mysqldev@win2003-x86:my/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/mysql-5.1-win-src
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
2006-03-28 13:53:22 +02:00
unknown
645f285391
Clean up CMake configuration following review.
...
BitKeeper/deleted/.del-config-version.js~b31bb5a8:
Delete: win/config-version.js
BitKeeper/deleted/.del-config-handlerton.js~553d3402:
Delete: win/config-handlerton.js
cmakelists.txt:
Clean up configuration, better integration with CMake.
sql/cmakelists.txt:
Only build ha_xxx.cc for configured storage engines.
Only link with configured storage engine projects.
win/configure.js:
Move the task of config-version.js into configure.js.
2006-03-28 13:49:29 +02:00
unknown
c5515cc6ab
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-28 13:28:36 +02:00
unknown
e0fffb52e0
update result
2006-03-28 13:28:35 +02:00
unknown
58ad72d68a
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/r/ndb_insert.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
2006-03-28 13:28:34 +02:00
unknown
920e356248
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug14356
2006-03-28 13:28:34 +02:00
unknown
fb17414ba1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
Auto merged
2006-03-28 13:28:33 +02:00
unknown
13b3d0ac61
ndb test: remove not needed setting causing compile error
2006-03-28 11:51:22 +02:00
unknown
530cd1575a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
mysql-test/t/disabled.def:
manual merge
2006-03-28 11:47:49 +02:00
unknown
5d621a1b97
Post review fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text)
2006-03-28 11:46:35 +02:00
unknown
8f7990e0c0
Merge bk-internal:/home/bk/mysql-5.1-new
...
into shellback.:C:/mysql/mysql-5.1-new
2006-03-28 11:17:23 +02:00
unknown
fd1303ead7
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug14356
mysql-test/r/events.result:
Auto merged
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/t/events.test:
Auto merged
mysql-test/t/events_bugs.test:
Auto merged
2006-03-28 10:42:46 +02:00
unknown
76e64db211
Only run test if support partitions
...
mysql-test/t/partition_mgm_err2.test:
Need support for partitions
2006-03-28 10:42:28 +02:00
unknown
16f5ad561b
Filed bugs against two tests, and then disabled them.
...
mysql-test/t/disabled.def:
Adding two more failing tests to the def file.
2006-03-28 00:24:13 -08:00
unknown
fa780d44c6
Manual merge.
...
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
2006-03-28 10:07:03 +02:00
unknown
e39256f8f4
Added tests with IGNORE and NULL values
2006-03-28 10:01:23 +02:00