Commit graph

22713 commits

Author SHA1 Message Date
Mattias Jonsson
23d569edce post push fix for bug#40595
Addition of hander function was_semi_consistent_read

mysql-test/r/partition_innodb_semi_consistent.result:
  post push fix for bug#40595
  Addition of hander function was_semi_consistent_read
  
  Added test result
mysql-test/t/partition_innodb_semi_consistent-master.opt:
  post push fix for bug#40595
  Addition of hander function was_semi_consistent_read
  
  Added test opt file
mysql-test/t/partition_innodb_semi_consistent.test:
  post push fix for bug#40595
  Addition of hander function was_semi_consistent_read
  
  Added test case
sql/ha_partition.cc:
  post push fix for bug#40595
  Addition of hander function was_semi_consistent_read
  
  The lack of was_semi_consistent_read opened a regression
  for bug-31310 when useing a partitioned InnoDB table
2008-12-16 12:44:18 +01:00
Mattias Jonsson
207d519a08 post push fix for test case for bug#39084.
mysql-test/t/partition_innodb_stmt.test:
  post push fix for test case for bug#39084.
  
  (must have partitioning...)
2008-12-10 19:29:22 +01:00
Patrick Crews
7abb33a7c1 merge 2008-12-10 11:50:01 -05:00
Alexey Kopytov
80f01958e0 Merge mysql-5.0-bugteam->mysql-5.1-bugteam. 2008-12-10 19:17:58 +03:00
Alexey Kopytov
684218b004 Pull from mysql-5.0-bugteam. 2008-12-10 19:14:32 +03:00
Sergey Glukhov
52fffecb5b Bug#35275 INFORMATION_SCHEMA.TABLES.CREATE_OPTIONS omits KEY_BLOCK_SIZE
Added KEY_BLOCK_SIZE option to I_S.TABLES.CREATE_OPTIONS field


mysql-test/r/information_schema.result:
  test result
mysql-test/t/information_schema.test:
  test case
sql/sql_show.cc:
  Added KEY_BLOCK_SIZE option to I_S.TABLES.CREATE_OPTIONS field
2008-12-10 18:38:27 +04:00
Alexey Kopytov
3f2f3d84de Fix for a test failure on Solaris/x86/gcc introduced by the patch for bug .
Removed values with more than 15 significant digits from the test case. Results of 
reading/printing such values using system library functions depend on implementation 
and thus are not portable.

mysql-test/r/type_float.result:
  Removed values with more than 15 significant digits from the test case.
mysql-test/t/type_float.test:
  Removed values with more than 15 significant digits from the test case.
2008-12-10 16:07:32 +03:00
Luis Soares
a6be137556 push to 5.0-bugteam tree. 2008-12-10 10:53:22 +00:00
Luis Soares
83b1f54508 push to 5.1-buteam tree. 2008-12-10 10:51:43 +00:00
Mattias Jonsson
9221a3d8c2 merge 2008-12-10 10:33:01 +01:00
Alexander Barkov
8d4b41605b Bug#38227 EXTRACTVALUE doesn't work with DTD declarations
Problem:
 XML syntax parser allowed to use quoted strings as attribute names,
 and tried to put them into parser state stack instead of identifiers.
 After that parser failed, if quoted string contained some slash characters.
Fix:
 - Disallowing quoted strings in regular tags.
 - Allowing quoted string in DOCTYPE declararion, but
 don't push it into parse state stack (just skip it).
2008-12-10 13:05:57 +04:00
V Narayanan
59c9168c77 updating with mysql-5.0-bugteam 2008-12-10 14:26:57 +05:30
Mattias Jonsson
4721520cdf merge 2008-12-10 09:11:59 +01:00
Mattias Jonsson
9cb4c7209a merge 2008-12-10 09:06:58 +01:00
Georgi Kodinov
979974c53b backported the fix for bug to 5.0 2008-12-09 20:35:02 +02:00
Patrick Crews
c81b519a10 merge 2008-12-09 13:34:17 -05:00
Georgi Kodinov
5705e3abda merged 37936 to 5.1-bugteam 2008-12-09 19:58:50 +02:00
Georgi Kodinov
bd8657786a Bug : ASSERT_COLUMN_MARKED_FOR_WRITE in Field_datetime::store ,
Field_varstring::store
      
The code that temporary saved the bitmaps of the read set and the write set so that
it can set it to all columns for debug purposes was not expecting that the
table->read_set and table->write_set can be the same. And was always saving both in 
sequence.
As a result the original value was never restored.
Fixed by saving & restoring the original value only once if the two sets are the
same (in a special set of functions).

mysql-test/r/select.result:
  Bug : test case
mysql-test/t/select.test:
  Bug : test case
sql/item_cmpfunc.cc:
  Bug : don't save/restore twice if the read and write sets are the same
sql/opt_range.cc:
  Bug : don't save/restore twice if the read and write sets are the same
sql/table.h:
  Bug : Make a designated set of functions that save/restore
  both the read and the write sets in a single call.
2008-12-09 19:46:03 +02:00
Patrick Crews
c130d8cdc3 merge 2008-12-09 12:21:22 -05:00
Horst Hunger
1da82b612a due to merge 2008-12-09 17:34:31 +01:00
Patrick Crews
e23900e1c3 merge 2008-12-09 11:05:01 -05:00
Sergey Glukhov
79a047c555 automerge 2008-12-09 19:52:50 +04:00
Matthias Leich
8ad1fdefbe Merge of latest changes into GCA tree
no conflicts
2008-12-09 16:40:12 +01:00
Sergey Glukhov
6673677803 updated test results
mysql-test/suite/parts/r/partition_bit_innodb.result:
  updated test result
mysql-test/suite/parts/r/partition_bit_myisam.result:
  updated test result
2008-12-09 19:31:22 +04:00
Horst Hunger
b53c4d0bac due to merge 2008-12-09 16:15:07 +01:00
Patrick Crews
cbe1a8a0f9 merge 2008-12-09 10:08:52 -05:00
Matthias Leich
1e189e52d9 Merge of fix for Bug 40904 into GCA tree 2008-12-09 15:11:53 +01:00
Sergey Glukhov
87f395d1d9 5.0-bugteam->5.1-bugteam merge 2008-12-09 17:31:22 +04:00
Sergey Glukhov
4ce563e01c Bug#31399 Wrong query result when doing join buffering over BIT fields
if table has bit fields then uneven bits(if exist) are stored into null bits place.
So we need to copy null bits in case of uneven bit field presence.


mysql-test/r/type_bit.result:
  test result
mysql-test/t/type_bit.test:
  test case
sql/sql_select.cc:
  if table has bit fields then uneven bits(if exist) are stored into null bits place.
  So we need to copy null bits in case of uneven bit field presence.
2008-12-09 16:59:47 +04:00
Sergey Glukhov
419e053a41 Bug#31291 ALTER TABLE CONVERT TO CHARACTER SET does not change some data types
added ability for TINY[MEDIUM] text fields 
to be converted to greater subtype during
alter if necessary(altered charset)


mysql-test/r/alter_table.result:
  test result
mysql-test/t/alter_table.test:
  test case
sql/sql_table.cc:
  added ability for TINY[MEDIUM] text fields 
  to be converted to greater subtype during
  alter if necessary(altered charset)
2008-12-09 16:38:52 +04:00
Sergey Glukhov
dacd8066c0 automerge 2008-12-09 16:17:17 +04:00
Sergey Glukhov
d49d4298e9 automerge 2008-12-09 16:11:01 +04:00
Sergey Glukhov
82aedffa03 5.0-bugteam->5.1-bugteam merge
mysql-test/r/myisam_data_pointer_size_func.result:
  restore default value
mysql-test/r/partition_datatype.result:
  test case fix
mysql-test/t/myisam_data_pointer_size_func.test:
  restore default value
2008-12-09 15:16:39 +04:00
Sergey Glukhov
681a2d1a53 bug#35558 Wrong server metadata blows up the client
the problem: FORMAT func max_length value was calculated incorrectly
the fix: correct calculation of max_length


mysql-test/r/func_str.result:
  test result
mysql-test/t/func_str.test:
  test case
sql/item_strfunc.h:
  the problem: FORMAT func max_length value was calculated incorrectly
  the fix: correct calculation of max_length
2008-12-09 14:00:43 +04:00
Sergey Glukhov
cbb368aa88 Bug#35796 SHOW CREATE TABLE and default value for BIT field
show default value for BIT field in printable format


mysql-test/r/type_bit.result:
  Bug#35796 SHOW CREATE TABLE and default value for BIT field
  test result
mysql-test/t/type_bit.test:
  Bug#35796 SHOW CREATE TABLE and default value for BIT field
  test case
sql/item.cc:
  Bug#35796 SHOW CREATE TABLE and default value for BIT field
  issue an error if BIN|HEX deafult value is empty value
  (behaviour like for INT fields)
2008-12-09 13:53:23 +04:00
Sergey Vojtovich
0e62ee8e79 Merge. 2008-12-09 13:27:46 +04:00
Sergey Glukhov
0d2db9c020 Bug#40949 Debug version of MySQL server crashes when run OPTIMIZE on compressed table.
reset diagnostics area state after error message is sent


mysql-test/r/myisampack.result:
  test result
mysql-test/t/myisampack.test:
  test case
sql/sql_table.cc:
  reset diagnostics area state after error message is sent
2008-12-09 13:04:28 +04:00
Sergey Vojtovich
34eff0a979 Merge. 2008-12-09 12:53:19 +04:00
Alexey Kopytov
459c6d184f Merge from mysql-5.0-bugteam to mysql-5.1-bugteam. 2008-12-09 11:11:52 +03:00
Alexey Kopytov
695a2fd90e Fixed type_float failures in --ps-protocol mode introduced by the test case for bug .
The reason for the failures was bug  (fixed in 6.0 by dtoa, but still present in 5.0/5.1).

mysql-test/r/type_float.result:
  Modified the failing test case so that bug  does not occur.
mysql-test/t/type_float.test:
  Modified the failing test case so that bug  does not occur.
2008-12-09 11:05:36 +03:00
Patrick Crews
2aeeec5875 merge 2008-12-08 16:22:16 -05:00
Andrei Elkin
ed7b41d60e Bug Test 'rpl_packet' fails randomly with changed "Exec_Master_Log_Pos"
binlog_row_mix_innodb_myisam resutls are corrected.
The last operations prior the dup error is
TRUNCATE table t2;
Therefore after
--error ER_DUP_ENTRY
INSERT INTO t2 select * from t1;
table t2 must be empty, and that is what the updated results confirm.


mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  results changed due to Bug  fixing.
2008-12-08 21:40:25 +02:00
Andrei Elkin
6dec2c1f6a merging 5.1-bt to a local tree. 2008-12-08 21:26:32 +02:00
Andrei Elkin
255418d978 Bug Replication failure on RBR + UPDATE the primary key
Extending bug#40221 regression test: 1. include INSERT 2. convert prim key + autoinc to
unique.

mysql-test/suite/binlog/r/binlog_innodb_row.result:
  results changed.
mysql-test/suite/binlog/t/binlog_innodb_row.test:
  Extending bug#40221 regression test to include the INSERT  dup key errored-out case.
2008-12-08 17:07:08 +02:00
Andrei Elkin
3383003787 merge bug#33420, bug#41173 on bt 5.0 -> 5.1 2008-12-08 16:42:59 +02:00
Matthias Leich
ce942b3995 Fix for Bug#40904 20 tests in 5.1 are disabled in a bad manner
- remove totally wrong (syntax) entries from disabled.def
- remove entries belonging to deleted tests from disabled.def
- correct the comments (correct the bug mentioned) of entries in disabled.def
- remove never completed tests which were accidently pushed
2008-12-08 15:36:42 +01:00
Andrei Elkin
f3d347cfba merge 5.0->5.0-bugteam for a local tree containing bug#33420 Test 'rpl_packet' fails randomly. 2008-12-08 16:29:13 +02:00
Mats Kindahl
bf97e59352 Merging with 5.1-bugteam. 2008-12-08 14:40:57 +01:00
Alexey Kopytov
ebff4ea3a9 Pull from mysql-5.1-bugteam. 2008-12-08 15:19:08 +03:00
Mats Kindahl
b831d619bb Merging patch with 5.1-bugteam. 2008-12-08 11:32:24 +01:00