1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-23 01:19:30 +02:00
Commit graph

55078 commits

Author SHA1 Message Date
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
Georgi Kodinov
0a61c6d7c9 Bug : Multiple conditions on timestamp column crashes server
The fix for bug 31887 was incomplete : it assumes that all the 
field types returned by the IS_NUM macro are descendants of 
Item_num and tries to zero-fill the values before doing constant
substitution with such fields when they are compared to constant string
values.
The only exception to this is Field_timestamp : it's in the IS_NUM
macro, but is not a descendant of Field_num.
Fixed by excluding timestamp fields (Field_timestamp) when zero-filling
when converting the constant to compare with to a string.
Note that this will not exclude the timestamp columns from const 
propagation.
2008-09-18 15:55:36 +03:00
Gleb Shchepa
cb8a39e78c Post-push fix for bug : User-Defined Variables are not consistence with columns data types.
--ps-protocol problem has been fixed.
2008-09-18 17:24:09 +05: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
Mattias Jonsson
fbd8f03dc2 Bug#37803: Test "partition_alter2_innodb" exhausts resources (time and/or memory)
It is a very big test and as such it takes a lot of time.

Solution is to divide the test in two parts, one for testing increasing
column size and one for decreasing size.

The innodb branch does extended tests (that myisam is not) due to the
$do_pk_tests variabel, that is the reason why the innodb branch takes
longer.

No increase of memory usage in innodb was found when analyzing, (tested
with looping some millions time of create/drop and alter commands)

The memory exhaust discovered in the test is due to mysqltest which
stores the result in memory (result-file) and this was the biggest
result file in the test framework, so by dividing the test into two
parts also cuts the memory usage of mysqltest.
2008-09-18 12:02:48 +03:00
Gleb Shchepa
db1d38c910 Bug#26020: User-Defined Variables are not consistent with
columns data types

The "SELECT @lastId, @lastId := Id FROM t" query returns
different result sets depending on the type of the Id column
(INT or BIGINT).

Note: this fix doesn't cover the case when a select query
references an user variable and stored function that
updates a value of that variable, in this case a result
is indeterminate.


The server uses incorrect assumption about a constantness of
an user variable value as a select list item: 

The server caches a last query number where that variable
was changed and compares this number with a current query
number. If these numbers are different, the server guesses,
that the variable is not updating in the current query, so
a respective select list item is a constant. However, in some
common cases the server updates cached query number too late.


The server has been modified to memorize user variable
assignments during the parse phase to take them into account
on the next (query preparation) phase independently of the
order of user variable references/assignments in a select
item list.
2008-09-18 13:38:44 +05: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
Tatiana A. Nurnberg
70f15e4d54 auto-merge 2008-09-16 06:38:52 +02:00
Tatiana A. Nurnberg
e7c2a13bca auto-merge 2008-09-16 05:59:36 +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 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
Tatiana A. Nurnberg
5de76e39e7 Bug#35981: ALTER EVENT causes the server to change the PRESERVE option.
If [NOT] PRESERVE was not given, parser always defaulted to NOT
PRESERVE, making it impossible for the "not given = no change"
rule to work in ALTER EVENT. Leaving out the PRESERVE-clause
defaults to NOT PRESERVE on CREATE now, and to "no change" in
ALTER.
2008-09-11 09:51:02 +02:00
Tatiana A. Nurnberg
4b0ab1e0dc Bug#31434 mysqldump dumps view as table
mysqldump creates stand-in tables before dumping the actual view.
Those tables were of the default type; if the view had more columns
than that (a pathological case, arguably), loading the dump would
fail. We now make the temporary stand-ins MyISAM tables to prevent
this.
2008-09-11 08:14:19 +02:00
Tatiana A. Nurnberg
743149bccf Bug#31434 mysqldump dumps view as table
mysqldump creates stand-in tables before dumping the actual view.
Those tables were of the default type; if the view had more columns
than that (a pathological case, arguably), loading the dump would
fail. We now make the temporary stand-ins MyISAM tables to prevent
this.
2008-09-11 07:46:43 +02: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