Commit graph

54819 commits

Author SHA1 Message Date
Patrick Crews
9a86c50092 merge of changes 2008-09-22 15:33:38 -04:00
Patrick Crews
92a3b67393 Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust
Trimmed some error-prone and variable portions of the test and added 'flush status' to ensure deterministic test
2008-09-22 15:15:52 -04:00
Magnus Svensson
773fbd9543 Bug #37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust 2008-09-22 12:03:00 +03:00
Matthias Leich
ba93a357cf Merge 5.0 -> 5.1
no conflicts, no real code changes
2008-09-18 15:46:27 +02:00
Matthias Leich
47ba1e8196 Merge actual tree -> local tree
no conflicts
2008-09-18 15:32:06 +02:00
Matthias Leich
336acaf7b7 Merge actual bugteam tree -> local tree 2008-09-18 15:05:19 +02:00
Tatiana A. Nurnberg
3f966ec74b auto-merge 2008-09-18 13:15:19 +02:00
Tatiana A. Nurnberg
4661508601 manual merge 2008-09-18 11:32:54 +02:00
Tatiana A. Nurnberg
86775b103f Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE
tweaked test to make embedded server happy
2008-09-18 11:24:50 +02:00
Chad MILLER
edf10751ef Merge Bug#37312. 2008-09-18 03:57:59 -04:00
Tatiana A. Nurnberg
7d19a76a7b auto-merge 2008-09-17 18:12:23 +02:00
Tatiana A. Nurnberg
d9e0a4b78e auto-merge 2008-09-17 17:44:15 +02:00
Tatiana A. Nurnberg
f90e4c3758 auto-merge 2008-09-17 14:54:50 +02:00
Tatiana A. Nurnberg
a89d13a7f0 Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE
NO_BACKSLASH_ESCAPES was not heeded in LOAD DATA INFILE
and SELECT INTO OUTFILE.  It is now.
2008-09-17 08:34:00 +02:00
Matthias Leich
5c58d35305 Upmerge 5.0 -> 5.1 of fix for Bug#38184 2008-09-16 19:26:54 +02:00
Matthias Leich
2130b894a2 Fix for Bug#38184 : main.federated fails sporadically
Details:
- backport of some improvements which prevent sporadic
  failures from 5.1 to 5.0
- @@GLOBAL.CONCURRENT_INSERT= 0 also for slave server
- --sorted_result before all selects which have result
  sets with more than one row
- Replace error numbers by error names
2008-09-16 19:05:30 +02:00
Narayanan V
56e02ea2b2 updated tree with mysql-5.1-bugteam 2008-09-16 19:50:44 +05:30
Vladislav Vaintroub
c8b858967e merge fix from 5.0-bugteam 2008-09-16 15:23:07 +02:00
Narayanan V
83ef8f3427 Bug#38338: REPLACE causes last_insert_id() to return an incorrect value
Fix the write_record function to record auto increment
values in a consistent way.
2008-09-16 18:37:59 +05:30
Vladislav Vaintroub
fd70d5e904 Bug#35987 - post-review fix
Correct usage of strncat() in get_symbol_path()

3rd parameter to strncat is changed to be count of 
remaining bytes in the output buffer minus 1.
2008-09-16 13:16:41 +02:00
Kristofer Pettersson
a7bc87b39c Automerge 2008-09-15 23:44:58 +02:00
Patrick Crews
66e14f2236 merge of bug fix from parent 2008-09-15 16:44:34 -04:00
Patrick Crews
d1bb214b3a Bug#37938 Test "mysqldump" lacks various INSERT statements / values
Merge of fixes from 5.0 -> 5.1
Moved restoration of concurrent_insert's original value to the end of the 5.1 tests
Re-recorded .result file to account for changes to test file.
2008-09-15 16:26:45 -04:00
Patrick Crews
ef1d6cca00 Bug#37938 Test "mysqldump" lacks various INSERT statements / values
Moved fix for this bug to 5.0 as other mysqldump bugs seem tied to concurrent_insert being on
Setting concurrent_insert off during this test as INSERTs weren't being 
completely processed before the calls to mysqldump, resulting in failing tests.

Altered .test file to turn concurrent_insert off during the test and to restore it
to whatever the value was at the start of the test when complete.

Re-recorded .result file to account for changes to variables in the test.
2008-09-15 15:34:39 -04:00
Patrick Crews
03b16815a7 Bug#39803 Test rpl.rpl_truncate_7ndb_2 failing
Fixed bad path in .test file
Moved test to suite/rpl_ndb (per Cluster QA)
Re-recorded .result file to updated expected results.
2008-09-15 15:13:43 -04:00
Vladislav Vaintroub
031dabd200 merge fix for 35987 2008-09-15 17:11:41 +02:00
Vladislav Vaintroub
95af27541e Bug#35987 - crash report on windows doesn't resolve stack traces.
The problem here is that symbols can not be loaded, because symbol
path is not set and  default path does not include the directory
where PDB is located.

The problem is _not_ reproducible on the same machine where
mysqld.exe is built - if PDB is not found in the symbol path,
dbghelp would fallback to fully qualified PDB path as given in the
executable header and on the build host this will succeed.

The solution is to calculate symbol path and pass it to SymInitialize()
call.
2008-09-15 14:58:32 +02:00
Alexander Barkov
4bf1aa826a Bug#35720 ucs2 + pad_char_to_full_length = failure
Problem: with @@sql_mode=pad_char_to_full_length
a CHAR column returned additional garbage
after trailing space characters due to
incorrect my_charpos() call.
Fix: call my_charpos() with correct arguments.
2008-09-15 15:29:31 +05:00
Martin Skold
9e5b67c525 bug #31231 mysql_alter_table() tries to drop a non-existing table
bug#31233 mysql_alter_table() fails to drop UNIQUE KEY
2008-09-15 11:19:56 +02:00
Kristofer Pettersson
58a4beef17 Auto merge. 2008-09-11 13:23:12 +02:00
Timothy Smith
95b7ad8972 Auto merge 5.0-bugteam -> 5.1-bugteam (empty, no changes) 2008-09-11 02:08:29 -06:00
Timothy Smith
fb2c9d8232 Auto merge 5.1-build -> 5.1-bugteam 2008-09-10 19:35:11 -06:00
Timothy Smith
0582ba50a5 Auto merge 5.0-build -> 5.0-bugteam 2008-09-10 19:34:17 -06:00
Timothy Smith
09ea0a5b24 Auto-merge 5.0-build -> 5.1-build (no changes) 2008-09-10 19:01:11 -06:00
Joerg Bruehe
c12f351215 Merge main 5.0 into 5.0-build. 2008-09-10 21:11:22 +02:00
Kristofer Pettersson
c01aeb1083 Bug#38692 concurrent inserts cause valgrind errors in Query_cache::invalidate
If a delayed insert thread was aborted by a concurrent 'truncate table'
statement, then the diagnostic area would fail with an assert in a debug build
because no actual error message was pushed on the stack despite a thread
being killed.
      
This patch adds an error message to the stack.
2008-09-10 16:58:03 +02:00
Joerg Bruehe
24ec9a3dc5 Merge main 5.1 tree into 5.1-build team tree. 2008-09-10 15:11:28 +02:00
Georgi Kodinov
772cdf0000 merged 5.0-bugteam to 5.1-bugteam 2008-09-10 12:55:38 +03:00
Georgi Kodinov
7f1734eb22 merged 5.1.29-rc into 5.1-bugteam 2008-09-10 12:44:21 +03:00
Georgi Kodinov
674d57be85 merged 5.0-5.1.29-rc -> 5.0-bugteam 2008-09-10 12:40:58 +03:00
Evgeny Potemkin
969ea5ed32 Merge 2008-09-10 12:44:38 +04:00
Ramil Kalimullin
237b86818c Merge 2008-09-09 21:24:33 +05:00
Ramil Kalimullin
12b953578c Merge 2008-09-09 20:52:38 +05:00
Martin Hansson
06e4f25fdc Bug#35600: Auto merged. 2008-09-09 17:30:36 +02:00
Ramil Kalimullin
707e676c58 Fix for bug#37526: asymertic operator <=> in trigger
Problem: <=> operator may return wrong results 
comparing NULL and a DATE/DATETIME/TIME value.

Fix: properly check NULLs.
2008-09-09 20:05:27 +05:00
Mats Kindahl
1aee4d9e3b Merging with 5.1-5.1.29-rc 2008-09-09 14:46:18 +02:00
Martin Hansson
0abc0eade2 Bug#35600: Security breach via view, I_S table and prepared
statement/stored procedure

View privileges are properly checked after the fix for bug no 
36086, so the method TABLE_LIST::get_db_name() must be used 
instead of field TABLE_LIST::db, as this only works for tables.
Bug appears when accessing views in prepared statements.
2008-09-09 12:49:08 +02:00
Mats Kindahl
69a8281c41 Bug #39106:
SUPER is not required to change binlog format for session

A user without SUPER privileges can change the value of the
session variable BINLOG_FORMAT, causing problems for a DBA.

This changeset requires a user to have SUPER privileges to
change the value of the session variable BINLOG_FORMAT, and
not only the global variable BINLOG_FORMAT.
2008-09-09 12:19:31 +02:00
Chad MILLER
60cca234e2 Bug#37312: Make test binlog_{row,stm}_innodb_stat more robust
The size of the Innodb_buffer_pool_pages differs by one byte on row versus statement
log, so neuter the last position of the stringified decimal representation.  Innobase
says the size isn't very important in any case.

Also, split out the "mixed" format to its own file, as mtr seems to dislike having only 
stm and row but not mix.
2008-09-08 16:23:55 -04:00
Georgi Kodinov
f81c25e8b1 merge 5.1-5.1.29-rc to B38701 working tree 2008-09-08 14:51:09 +03:00