1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-16 00:42:55 +03:00
Commit Graph

20681 Commits

Author SHA1 Message Date
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
3f2f3d84de Fix for a test failure on Solaris/x86/gcc introduced by the patch for bug #27483.
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
9221a3d8c2 merge 2008-12-10 10:33:01 +01:00
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
59c9168c77 updating with mysql-5.0-bugteam 2008-12-10 14:26:57 +05:30
9cb4c7209a merge 2008-12-10 09:06:58 +01:00
979974c53b backported the fix for bug #34773 to 5.0 2008-12-09 20:35:02 +02:00
5705e3abda merged 37936 to 5.1-bugteam 2008-12-09 19:58:50 +02:00
bd8657786a Bug #37936: 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 #37936: test case
mysql-test/t/select.test:
  Bug #37936: test case
sql/item_cmpfunc.cc:
  Bug #37936: don't save/restore twice if the read and write sets are the same
sql/opt_range.cc:
  Bug #37936: don't save/restore twice if the read and write sets are the same
sql/table.h:
  Bug #37936: 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
1da82b612a due to merge 2008-12-09 17:34:31 +01:00
8ad1fdefbe Merge of latest changes into GCA tree
no conflicts
2008-12-09 16:40:12 +01:00
b53c4d0bac due to merge 2008-12-09 16:15:07 +01:00
1e189e52d9 Merge of fix for Bug 40904 into GCA tree 2008-12-09 15:11:53 +01:00
87f395d1d9 5.0-bugteam->5.1-bugteam merge 2008-12-09 17:31:22 +04:00
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
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
dacd8066c0 automerge 2008-12-09 16:17:17 +04:00
d49d4298e9 automerge 2008-12-09 16:11:01 +04:00
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
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
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
0e62ee8e79 Merge. 2008-12-09 13:27:46 +04:00
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
34eff0a979 Merge. 2008-12-09 12:53:19 +04:00
459c6d184f Merge from mysql-5.0-bugteam to mysql-5.1-bugteam. 2008-12-09 11:11:52 +03:00
695a2fd90e Fixed type_float failures in --ps-protocol mode introduced by the test case for bug #27483.
The reason for the failures was bug #21205 (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 #21205 does not occur.
mysql-test/t/type_float.test:
  Modified the failing test case so that bug #21205 does not occur.
2008-12-09 11:05:36 +03:00
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
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
ebff4ea3a9 Pull from mysql-5.1-bugteam. 2008-12-08 15:19:08 +03:00
a10c3ff2b0 merged bug 37742 to 5.1-bugteam 2008-12-08 12:23:33 +02:00
6aa4125be3 Merge from mysql-5.0-bugteam to mysql-5.1-bugteam. 2008-12-07 17:51:22 +03:00
1bb6a0ba9f Disable wait_timeout_func and report bug #41255. 2008-12-05 13:24:19 +02:00
6d717c21e7 Bug #33420 Test 'rpl_packet' fails randomly with changed "Exec_Master_Log_Pos"
Bug #41173 rpl_packet fails sporadically on pushbuild: query 'DROP TABLE t1' failed


The both issues appeared to be a race between the SQL thread executing CREATE table t1
and the IO thread that is expected to stop at the consequent big size event.
The two events need serialization which is implemented.
The early bug required back-porting a part fixes for bug#38350 exclusively for 5.0 version.



mysql-test/r/rpl_packet.result:
  results changed due to bug#33420, bug#41173.
mysql-test/t/rpl_packet.test:
  adding synchronization for sql and io thread (bug#41173 problem).
  simplifying the output to show only a relevant info (5.0 sole problem bug#33420).
2008-12-04 18:36:45 +02:00
91f0c94c23 Fix for bug #27483: Casting 'scientific notation type' to 'unsigned
bigint' fails on windows.

Visual Studio does not take into account some x86 hardware limitations
which leads to incorrect results when converting large DOUBLE values
to BIGINT UNSIGNED ones.

Fixed by adding a workaround for double->ulonglong conversion on
Windows.


include/config-win.h:
  Added double2ulonglong(double) function implementing a workaround for
  broken double->ulonglong conversion on Windows/x86.
include/my_global.h:
  Define double2ulonglong() as a simple typecast for anything but
  Windows.
mysql-test/r/type_float.result:
  Added a test case for bug #27483.
mysql-test/t/type_float.test:
  Added a test case for bug #27483.
2008-12-03 19:15:39 +03:00
c75cd3d70f merging with mysql-5.0-bugteam tree. 2008-12-03 17:52:55 +05:30
4d63306d42 temporary fix for Bug#37780: A short analysis of the test shows that it needs a replacement of the sleeps and as "In most cases, it might take some time for the thread to die, because the kill flag is checked only at specific intervals" (user manual) to carfully check that and insert waiting for that event. 2008-12-03 10:39:31 +01:00
35ab3efe30 auto-merge 2008-12-03 07:39:39 +01:00
3edacb4f6d auto-merge 2008-12-03 07:38:26 +01:00
1f7fff2ff3 auto-merge 2008-12-03 07:21:04 +01:00
085262146e auto-merge 2008-12-03 07:19:26 +01:00
0456662539 BUG#41018: innodb_max_dirty_pages_pct_func fails sporadically: error 28 from storage engine
BUG#39382: innodb_max_dirty_pages_pct_func failed with timeout on pushbuild
Disabled innodb_max_dirty_pages_pct_func.
Please re-enable if the test gets fixed.


mysql-test/t/disabled.def:
  Disabled innodb_max_dirty_pages_pct_func.
2008-12-02 20:07:18 +01:00
6538f19f9a Bug#40389: REORGANIZE PARTITION crashes when only using one partition
The non documented command 'ALTER PARTITION t REORGANIZE PARTITION'
(without any partitions!) which only make sense for nativly
partitioned engines, such as NDB, crashes the server if there was
no change of number of partitions.

The problem was wrong usage of fast_end_partition function,
which led to usage of a non initialized variable.

mysql-test/r/partition_mgm.result:
  Bug#40389: REORGANIZE PARTITION crashes when only using one partition
  
  Updated test result.
mysql-test/t/partition_mgm.test:
  Bug#40389: REORGANIZE PARTITION crashes when only using one partition
  
  Added new test case.
sql/partition_info.cc:
  Bug#40389: REORGANIZE PARTITION crashes when only using one partition
  
  Added DBUG_ASSERT to easier catch similar problems.
sql/sql_partition.cc:
  Bug#40389: REORGANIZE PARTITION crashes when only using one partition
  
  fast_end_partitions is called later in mysql_alter_table if
  variable fast_alter_partition is set.
2008-12-02 11:18:01 +01:00
6afd8123a3 merged bug 39920 and 5.1-main to 5.1-bugteam 2008-12-01 17:22:16 +02:00
7114fde7c0 merged bug 39920 to 5.0-bugteam 2008-12-01 16:41:22 +02:00
f56e43ce52 Bug #39920: MySQL cannot deal with Leap Second expression in string literal.
Updated MySQL time handling code to react correctly on UTC leap second additions.
MySQL functions that return the OS current time, like e.g. CURDATE(), NOW() etc
will return :59:59 instead of :59:60 or 59:61.
As a result the reader will receive :59:59 for 2 or 3 consecutive seconds 
during the leap second.
This fix will not affect the values returned by UNIX_TIMESTAMP() for leap seconds.
But note that when converting the value returned by UNIX_TIMESTAMP() to broken 
down time the correction of leap seconds will still be applied.
Note that this fix will make a difference *only* if the OS is specially configured
to return leap seconds from the OS time calls or when using a MySQL time zone 
defintion that has leap seconds.
Even after this change date/time literals (or other broken down time 
representations) with leap seconds (ending on :59:60 or 59:61) will still be 
considered illegal and discarded by the server with an error or 
a warning depending on the sql mode.
Added a test case to demonstrate the effect of the fix.

mysql-test/r/timezone3.result:
  Bug #39920: test case
mysql-test/std_data/Moscow_leap:
  Bug #39920: updated the Moscow time zone to Dr. Olson's tzdata 2008i 
  to accomodate for the 2008 leap second
mysql-test/t/timezone3.test:
  Bug #39920: test case
sql/tztime.cc:
  Bug #39920: adjust leap seconds (:60 or :61) to :59
sql/tztime.h:
  Bug #39920: adjust leap seconds (:60 or :61) to :59
2008-12-01 16:18:35 +02:00
5f109f4882 merge of the addenum for bug 37339 to 5.1-bugteam 2008-12-01 15:15:33 +02:00
a1e9b6ba1e Addendum to bug #37339 : make the test case portable to windows
by using and taking out a full path.

mysql-test/r/ctype_filesystem.result:
  Bug #37399: use MYSQL_TEST_DIR rooted test
mysql-test/t/ctype_filesystem-master.opt:
  Bug #37399: use MYSQL_TEST_DIR rooted test
mysql-test/t/ctype_filesystem.test:
  Bug #37399: use MYSQL_TEST_DIR rooted test
2008-12-01 13:34:53 +02:00
d6f4b89b5a manual merge
mysql-test/r/strict.result:
  DEFAULT is now uppercase in SHOW CREATE TABLE
mysql-test/t/strict.test:
  as in 5.0
sql/unireg.cc:
  add explanations, remove obsolete debug code
2008-12-01 05:17:52 +01:00
ab4d8812f4 Bug #37742: HA_EXTRA_KEYREAD flag is set when key contains only prefix of requested
column
      
When the storage engine uses secondary keys clustered with the primary key MySQL was
adding the primary key parts to each secondary key.
In doing so it was not checking whether the index was on full columns and this
resulted in the secondary keys being added to the list of covering keys even if 
they have partial columns.
Fixed by not adding a primary key part to the list of columns that can be used 
for index read of the secondary keys when the primary key part is a partial key part.

mysql-test/r/innodb_mysql.result:
  Bug #37742: test case
mysql-test/t/innodb_mysql.test:
  Bug #37742: test case
sql/table.cc:
  Bug #37742: don't add the primary key part to the list of covering key parts
  of a secondary key if it's a partial key part.
2008-11-29 15:36:17 +02:00
622db26040 auto-merge 2008-11-28 21:55:52 +01:00