1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Commit Graph

54551 Commits

Author SHA1 Message Date
Kristofer Pettersson
f0dfb82fcb Bug#37781 mysql_drop_user calls get_current_user() twice for no reason
Fixed typo and removed duplicate call to get_current_user.
2008-07-29 15:37:09 +02:00
Kristofer Pettersson
0b918cfd7d auto merge 2008-07-29 15:15:04 +02:00
Alexander Barkov
686ced5367 Bug#35808 utf8 hungarian collation not part of the utf8 charset?
config/ac-macros/character_sets.m4 didn't mention hungarian collations
in the UTF8 and UCS2 lists.
2008-07-29 08:25:46 +05:00
Igor Babaev
7f615b2c14 Merge 2008-07-28 01:24:56 -07:00
Igor Babaev
b6e3a9e28c Fixed bug #38191.
Calling List<Cached_item>::delete_elements for the same list twice
caused a crash of the server in the function JOIN::cleaunup.
Ensured that delete_elements() in JOIN::cleanup would be called only once.


mysql-test/r/subselect.result:
  Added a test case for bug #38191.
mysql-test/t/subselect.test:
  Added a test case for bug #38191.
sql/sql_select.cc:
  Fixed bug #38191.
  Ensured that delete_elements() in JOIN::cleanup would be called only once.
2008-07-26 13:44:07 -07:00
Patrick Crews
e195149b43 Bug#38383 - Certain funcs_1 trig tests are failing on Pushbuild.
Removing duplicate 'setup' portions of these include files.  Likely an editor error created dupe lines.
This is causing many Pushbuild errors
2008-07-25 13:14:52 -04:00
Georgi Kodinov
c7fc78c3b2 merge of 5.1-main to 5.1-bugteam 2008-07-25 18:06:47 +03:00
Davi Arnaut
d09b5ab227 Null merge of mysql-5.0-bugteam into mysql-5.1-bugteam. 2008-07-25 12:12:47 -03:00
Georgi Kodinov
e113042588 Disabled 5.1 tests (and reported bugs)
mysql-test/suite/ndb/t/disabled.def:
  disabled failing test in 5.1-bzr
mysql-test/suite/rpl_ndb/t/disabled.def:
  disabled failing test in 5.1-bzr
2008-07-25 13:32:05 +03:00
Kristofer Pettersson
0a91049cfc auto merged 2008-07-24 22:50:47 +02:00
Kristofer Pettersson
548413824b Bug#38002 table_cache consumes too much memory with blobs
Tables in the table definition cache are keeping a cache buffer for blob
fields which can consume a lot of memory.
    
This patch introduces a maximum size threshold for these buffers.


sql/sql_base.cc:
  Added function free_field_buffers_larger_than to reclaim memory from blob
  field buffers too large to be cached.
sql/table.cc:
  Added function free_field_buffers_larger_than
2008-07-24 22:38:44 +02:00
Chad MILLER
f6f6d81b82 Make community features (including profiling) on by default. 2008-07-24 13:43:14 -04:00
Davi Arnaut
14887bb2ab Cherry-pick Bug#33362 from mysql-5.1 2008-07-24 11:14:34 -03:00
Horst Hunger
94ba5b8914 Merge from parent. 2008-07-24 09:49:29 +02:00
Sven Sandberg
d8c838c27a BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild
BUG#37884: rpl_row_basic_2myisam and rpl_row_basic_3innodb fail sporadically in pushbuild
These have been fixed in 5.1-rpl. Re-applying fix for BUG#37884
in 5.1-bugteam, and disabling rpl_flushlog_loop for BUG#37733 in
5.1-bugteam.


mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Missing sync_slave_with_master added.
mysql-test/suite/rpl/t/disabled.def:
  Disabling rpl_flushlog_loop until the fixed version gets
  merged from 5.1-rpl
2008-07-23 16:34:02 +02:00
Horst Hunger
ea4b396303 Final fix for bug#36522 in 5.1. This new fix was necessary due to fix of bug 37708. 2008-07-23 16:06:44 +02:00
Georgi Kodinov
dd85aa78ba Bug#37830 : ORDER BY ASC/DESC - no difference
Range scan in descending order for c <= <col> <= c type of
ranges was ignoring the DESC flag.
However some engines like InnoDB have the primary key parts 
as a suffix for every secondary key.
When such primary key suffix is used for ordering ignoring 
the DESC is not valid.
But we generally would like to do this because it's faster.
            
Fixed by performing only reverse scan if the primary key is used.
Removed some dead code in the process.

mysql-test/r/innodb_mysql.result:
  Bug#37830 : test case
mysql-test/t/innodb_mysql.test:
  Bug#37830 : test case
sql/opt_range.cc:
  Bug#37830 : 
  - preserve and use used_key_parts to
    distinguish when a primary key suffix is used
  - removed some dead code
sql/opt_range.h:
  Bug#37830 : 
  - preserve used_key_parts
  - dead code removed
sql/sql_select.cc:
  Bug#37830 : Do only reverse order traversal
  if the primary key suffix is used.
2008-07-23 14:25:00 +03:00
Horst Hunger
cbbe2afdda fix of bug#37708: removed a forgotten include file. 2008-07-23 08:51:04 +02:00
Horst Hunger
75258f31bf merge from parent 2008-07-23 08:49:41 +02:00
Davi Arnaut
afeab2052f Merge 5.1-bugteam into main. 2008-07-22 15:24:31 -03:00
Davi Arnaut
a555716d44 Silence warning due to unused function.
sql/field.cc:
  Function is only used if replication is compiled in.
2008-07-22 14:53:36 -03:00
Davi Arnaut
2f22ef15e3 Merge from mysql-5.1.27 release tree. 2008-07-22 14:41:26 -03:00
Horst Hunger
2017e5f944 Fix for bug#37708:
Deleted the removed tests.
2008-07-22 19:00:27 +02:00
Horst Hunger
56729a758c 2008-07-22 18:56:50 +02:00
Horst Hunger
ec7b92d7a0 Fix for bug#37708:The result files of the removed 64 bit tests. 2008-07-22 18:50:36 +02:00
Horst Hunger
5d938a8dbe Fix for bug#37708: Result files of removed 32 bit tests. 2008-07-22 18:48:47 +02:00
Horst Hunger
235f9bb6c2 Fix for bug#37708:The allocation of very large buffer must not be done in the pushbuild.
hhunger.
2008-07-22 18:45:55 +02:00
Horst Hunger
7200c5bad0 merge from parent. 2008-07-22 18:39:56 +02:00
Sergei Golubchik
233e216209 merge 2008-07-22 16:42:03 +02:00
Horst Hunger
2d83978f13 Fix for bug#37708:The allocation of very large buffer must not be done in the pushbuild. 2008-07-22 15:58:21 +02:00
Kristofer Pettersson
daa884375c auto merge 2008-07-22 13:33:37 +02:00
Kristofer Pettersson
3a3894d2ca Disabled two test cases in 5.1 because of random failures. 2008-07-22 13:04:32 +02:00
Kristofer Pettersson
14afcb436f merge 5.1->5.1-bugteam 2008-07-22 12:56:36 +02:00
Kristofer Pettersson
f5bbcba96f merge 5.0->5.0-bugteam 2008-07-22 12:55:15 +02:00
Kristofer Pettersson
3d3b04e06d sql/log.cc:
Auto merge
2008-07-22 12:41:55 +02:00
Tatiana A. Nurnberg
d78158f471 auto-merge 2008-07-22 08:54:07 +02:00
Sven Sandberg
6334196bd7 BUG#38269: pushbuild gives valgrind error in ha_statistic_increment for rpl_temporary
This does not fix the bug. It only disables the failing test.


mysql-test/suite/rpl/t/disabled.def:
  disable rpl_temporary
2008-07-21 21:05:06 +02:00
Kristofer Pettersson
8544ee54e2 Corrected merge misstake. 2008-07-21 16:41:17 +02:00
Kristofer Pettersson
60a21d5159 Auto merge 2008-07-21 14:00:13 +02:00
Kristofer Pettersson
6da6bbc75e Auto merge 2008-07-21 12:24:31 +02:00
Kristofer Pettersson
b7d4c76a54 Bug#37027 expire_logs_days and missing binlogs cause a crash !
If the server failed to expired log files during start up it could crash.

sql/log.cc:
  Added predicate to protect againt cases when current_thd might be NULL.
2008-07-24 14:28:21 +02:00
Sergei Golubchik
6077ebea1c Bug#34409 LOCK_plugin contention via ha_release_temporary_latches/plugin_foreach
use thread-local data structures in ha_release_temporary_latches()
2008-07-21 12:01:22 +02:00
Tatiana A. Nurnberg
bb827398ab auto-merge + post-merge fixies 2008-07-21 11:20:03 +02:00
Kristofer Pettersson
ace7798e7d Manual merge 2008-07-21 11:18:35 +02:00
Kristofer Pettersson
c137f3d450 Null merge 2008-07-24 15:41:55 +02:00
Timothy Smith
9115320342 Up-merge latest changes from 5.0-build 2008-07-20 22:01:25 -06:00
Timothy Smith
6825ffd153 Merge latest changes from 5.0-build 2008-07-20 21:59:47 -06:00
Timothy Smith
9e6621b861 Up-merge of merges, some criss-cross resolved with --weave. 2008-07-19 02:31:33 -06:00
Timothy Smith
92ba017b2c Merge in changes from 5.0.66a (via mysql-5.0) 2008-07-18 21:48:18 -06:00
Timothy Smith
100d417ec2 Merge 5.0.66a-release changes 2008-07-18 21:46:03 -06:00