Commit graph

55061 commits

Author SHA1 Message Date
Chad MILLER
cf43a69a39 null-merge of backported changes. 2008-08-11 11:30:29 -04:00
Chad MILLER
fe39a901bb Backport compiler warning fix from 5.1-bugteam. 2008-08-11 11:28:35 -04:00
Mattias Jonsson
854e230707 merge into an updated 5.1-bugteam tree 2008-08-11 16:15:39 +02:00
Davi Arnaut
44a162597f Post-merge fix: Remove Remove unused variable. 2008-08-11 10:13:12 -03:00
Davi Arnaut
bafa07b2c4 Post-merge fix: Silence warning due to type mismatch. 2008-08-11 10:08:21 -03:00
Kristofer Pettersson
f9e90f188b Null merging 5.0->5.1; Changeset is a back port. 2008-08-11 13:06:16 +02:00
Kristofer Pettersson
a3b0b7bbdb Automerge 2008-08-11 13:00:48 +02:00
Kristofer Pettersson
9fc39adfda Bug#38486 Crash when using cursor protocol
Server side cursors were not initialized properly and this caused a reference to
uninitialized memory.
2008-08-11 11:40:54 +02:00
Magnus Svensson
788362de81 Debug printouts 2008-08-11 10:41:23 +02:00
Magnus Svensson
3a72c5bf61 Don't use slots 200-249 since they are also used by PB 2008-08-11 10:41:12 +02:00
Magnus Svensson
6244c476f5 fix distcheck 2008-08-10 20:52:49 +02:00
Magnus Svensson
c431b23bae Fixup mtr_unique. Remove usage of ps and grep. Make it a module. Move _process_alive to Platform.pm. Rename opt_baseport to baseport, it's not an option 2008-08-10 19:46:43 +02:00
Magnus Svensson
552d514d0b Fix VS8 build error 2008-08-09 14:59:57 +02:00
Magnus Svensson
4202897da7 Open result file in binary moe to avoid CR/LF problems 2008-08-09 14:52:39 +02:00
Magnus Svensson
00560ac3d4 Add analyze-timeout.test 2008-08-09 11:33:59 +02:00
Magnus Svensson
06a2f92bac Ad missing ) to CmakeLists.txt 2008-08-09 11:31:17 +02:00
Magnus Svensson
aceba783f8 Improve printout for 'found warnings' and add an exit to please mysqltest 2008-08-09 11:29:35 +02:00
Magnus Svensson
66b42a13f2 Make events_restart more stable by waiting for the server to be stopped before starting it again 2008-08-09 11:16:12 +02:00
Magnus Svensson
02e48e886f Fix warnings in mysqltest 2008-08-09 10:52:50 +02:00
Magnus Svensson
69f9ec281d Merge 2008-08-08 20:10:43 +02:00
Magnus Svensson
36459fb6dc Make opt_big_test a global variable 2008-08-08 19:09:13 +02:00
Timothy Smith
8ddc42db21 Up-merge test case for bug 35220 from 5.0 (no real code changes). 2008-08-07 18:33:12 -06:00
Timothy Smith
4ea036f4cb Cherry-pick fix for Bug#35220 from innodb-5.0-ss2475 snapshot.
Bug#35220: ALTER TABLE too picky on reserved word "foreign"

In ALTER TABLE, change the internal parser to search for
``FOREIGN[[:space:]]'' instead of only ``FOREIGN'' when parsing
ALTER TABLE ... DROP FOREIGN KEY ...; otherwise it could be mistaken
with ALTER TABLE ... DROP foreign_col;

(This fix is already present in MySQL 5.1 and higher.)
2008-08-07 18:25:24 -06:00
Chad MILLER
42d878ab29 Merge from bugteam trunk. 2008-08-07 18:08:31 -04:00
Chad MILLER
01aa0a0cd9 merge from local 5.0 fix tree. 2008-08-07 16:27:05 -04:00
Chad MILLER
6c93f05a66 Bug#31605: mysql_upgrade relies on Linux /proc filesystem when not \
running on Windows

We used two OS-specific methods of looking up the executable 
name, which don't work outside of those two kinds of OSes 
(Linux+Solaris and Windows).

We assume that if the user ran this program with a certain 
name, we can run the other sibling programs with a similar name.

(re-patch in bzr)
2008-08-07 12:24:39 -04:00
Davi Arnaut
e01cac7d89 Bug#21226 FLUSH PRIVILEGES does not provided feedback when it fails.
Post-merge fix: remove spurious semicolon that caused the function
to return failure regardless of the outcome.
2008-08-06 23:23:58 -03:00
He Zhenxing
32f4018500 post push fix for BUG#37051 2008-08-07 09:33:01 +08:00
Chad MILLER
297593c5d3 Better fix of build-tags, merged from local 5.0-bugteam . 2008-08-06 16:45:15 -04:00
Chad MILLER
b94519a154 Bug#37201: make tags doesn't work in bazaar server trees
Fall back to "find" if bzr is unavailable.

Don't fail for paths that have spaces in them.
2008-08-06 16:25:25 -04:00
Chad MILLER
17badbd9a5 Merge from local 5.0-bugteam. 2008-08-06 15:29:41 -04:00
Chad MILLER
15beb38f9f Bug#37201: make tags doesn't work in bazaar server trees
bk sfiles -> bzr ls
2008-08-06 15:27:28 -04:00
Kristofer Pettersson
6b2bd29ac8 Manual merge 5.0->5.1 2008-08-06 16:20:41 +02:00
Sven Sandberg
2c6d9c62ca merged 5.1 main -> 5.1-rpl-testfixes
all files automerged without conflict
2008-08-06 15:49:03 +02:00
Chad MILLER
a308c9e3fa Bug#30129: mysql_install_db appears to run normally, but the databases \
are not created  {Netware}

The init and test sql files were not created at cross-compilation time.

Now, make them in the default build rule.  Additionally, remove the "fix" 
SQL instructions, which are unnecessary for newly initialized databases.
Also, clean up the english in an error message, and BZRify nwbootstrap.
2008-08-06 09:25:03 -04:00
He Zhenxing
2441ec8770 Wait for slave to stop before set skip counter 2008-08-06 18:52:15 +08:00
He Zhenxing
337029cae2 Auto merge 2008-08-06 18:41:27 +08:00
Magnus Svensson
ed8bc526ae Merge 2008-08-04 22:25:45 +02:00
Magnus Svensson
afbbe64aae Patch for combinations file using different --default-storage-engine= directives 2008-08-04 21:56:20 +02:00
Magnus Svensson
39ad2dc05a Bug #38181 Please print more debug info when tests fail 2008-08-04 21:54:44 +02:00
Kristofer Pettersson
27a17b251d automerge 2008-08-04 14:37:28 +02:00
Magnus Svensson
798590b798 Bug #32307 mysqltest - does not detect illegal if syntax 2008-08-04 12:38:50 +02:00
Sven Sandberg
73e253370b merged 5.1 main to 5.1-rpl
manually resolved conflicts:
Text conflict in client/mysqltest.c
Contents conflict in mysql-test/include/have_bug25714.inc
Text conflict in mysql-test/include/have_ndbapi_examples.inc
Text conflict in mysql-test/mysql-test-run.pl
Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result
Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def
Text conflict in mysql-test/t/disabled.def
2008-08-04 07:04:47 +02:00
Davi Arnaut
9f550e6fbd Bug#37003: Tests sporadically crashes with embedded server
Post-merge fix: Alter linking order so that the thread linking
flags appear last in the list. This needs to be done this way
because some linkers will not search the thread archive again
if a undefined symbol (pthread_kill in this case) appears later.
2008-08-01 12:10:06 -03:00
Magnus Svensson
27b37e45b0 Bug #32406 #ifdef LATER_HAVE_NDBCLUSTER_DB in client/mysqladmin.cc 2008-08-01 16:15:27 +02:00
Magnus Svensson
7e5752e27b Bug #33337 mysql-test-run.pl options --gdb and --ddd don't work with --embedded-server 2008-08-01 16:13:35 +02:00
Magnus Svensson
53e17da331 Bug #33810 mysql-test-run can't find testcase if it is in a non-default testsuite 2008-08-01 16:08:51 +02:00
Timothy Smith
004c642880 NULL MERGE of innodb-5.0-ss2475 snapshot cherry-pick (bugs: 34286, 35352, 36600)
These changes, where applicable, are available in 5.1-specific snapshots for MySQL 5.1+.
2008-07-31 16:39:03 -06:00
Timothy Smith
021d7d72f8 Cherry-pick InnoDB fixes for Bug#34286, Bug#35352, and Bug#36600 from snapshot
innodb-5.0-ss2475.

Bug #34286  Assertion failure in thread 2816 in file .\row\row0sel.c line 3500
Since autoinc init performs a MySQL SELECT query to determine the auto-inc
value, set prebuilt->sql_stat_start = TRUE so that it is performed like any
normal SELECT, regardless of the context in which it was invoked.


Bug #35352  If InnoDB crashes with UNDO slots full error the error persists on restart
We've added a heuristic that checks the size of the UNDO slots cache lists
(insert and upate). If either of cached lists has more than 500 entries then we
add any UNDO slots that are freed, to the common free list instead of the cache
list, this is to avoid the case where all the free slots end up in only one of
the lists on startup after a crash.

Tested with test case for 26590 and passes all mysql-test(s).

Bug #36600  SHOW STATUS takes a lot of CPU in buf_get_latched_pages_number
Fixed by removing the Innodb_buffer_pool_pages_latched variable from SHOW
STATUS output in non-UNIV_DEBUG compilation.
2008-07-31 15:47:57 -06:00
Georgi Kodinov
3d215551bb merged 34159 and 37662 5.0-bugteam->5.1-bugteam 2008-07-31 12:50:24 +03:00