Chad MILLER
297593c5d3
Better fix of build-tags, merged from local 5.0-bugteam .
2008-08-06 16:45:15 -04:00
Chad MILLER
b94519a154
Bug#37201: make tags doesn't work in bazaar server trees
...
Fall back to "find" if bzr is unavailable.
Don't fail for paths that have spaces in them.
2008-08-06 16:25:25 -04:00
Chad MILLER
17badbd9a5
Merge from local 5.0-bugteam.
2008-08-06 15:29:41 -04:00
Chad MILLER
15beb38f9f
Bug#37201: make tags doesn't work in bazaar server trees
...
bk sfiles -> bzr ls
2008-08-06 15:27:28 -04:00
Kristofer Pettersson
6b2bd29ac8
Manual merge 5.0->5.1
2008-08-06 16:20:41 +02:00
Kristofer Pettersson
27a17b251d
automerge
2008-08-04 14:37:28 +02:00
Davi Arnaut
9f550e6fbd
Bug#37003: Tests sporadically crashes with embedded server
...
Post-merge fix: Alter linking order so that the thread linking
flags appear last in the list. This needs to be done this way
because some linkers will not search the thread archive again
if a undefined symbol (pthread_kill in this case) appears later.
2008-08-01 12:10:06 -03:00
Georgi Kodinov
3d215551bb
merged 34159 and 37662 5.0-bugteam->5.1-bugteam
2008-07-31 12:50:24 +03:00
Georgi Kodinov
a0768d32c2
Bug#34159: mysql_install_db fails with sql_mode=TRADITIONAL
...
Reset session sql_mode before creating system tables as it
is done in the mysql_fix_privilege_tables.sql script.
2008-07-31 12:28:04 +03:00
Georgi Kodinov
425abb4904
Bug#37662 nested if() inside sum() is parsed in exponential time
...
min() and max() functions are implemented in MySQL as macros.
This means that max(a,b) is expanded to: ((a) > (b) ? (a) : (b))
Note how 'a' is quoted two times.
Now imagine 'a' is a recursive function call that's several 10s of levels deep.
And the recursive function does max() with a function arg as well to dive into
recursion.
This means that simple function call can take most of the clock time.
Identified and fixed several such calls to max()/min() : including the IF()
sql function implementation.
2008-07-30 14:07:37 +03:00
Kristofer Pettersson
7b244002a3
Bug#29738 Error message not properly translated to Serbian
...
Community contribution fix for Serbian translation in error message list.
2008-07-29 15:58:15 +02:00
Kristofer Pettersson
d298e107f7
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
6033db3671
auto merge
2008-07-29 15:15:04 +02:00
Alexander Barkov
08162d8c3b
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
47cd6462fd
Merge
2008-07-28 01:24:56 -07:00
Igor Babaev
da156dde08
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.
2008-07-26 13:44:07 -07:00
Patrick Crews
44be24542a
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
f6d66bd6f1
merge of 5.1-main to 5.1-bugteam
2008-07-25 18:06:47 +03:00
Davi Arnaut
ca4698274f
Null merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
2008-07-25 12:12:47 -03:00
Georgi Kodinov
b467c15e36
Disabled 5.1 tests (and reported bugs)
2008-07-25 13:32:05 +03:00
Kristofer Pettersson
874a38c6b7
auto merged
2008-07-24 22:50:47 +02:00
Kristofer Pettersson
5c1f8d1836
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.
2008-07-24 22:38:44 +02:00
Chad MILLER
27699fac9c
Make community features (including profiling) on by default.
2008-07-24 13:43:14 -04:00
Davi Arnaut
8ce74569f7
Cherry-pick Bug#33362 from mysql-5.1
2008-07-24 11:14:34 -03:00
Horst Hunger
5f3c15c2fe
Merge from parent.
2008-07-24 09:49:29 +02:00
Sven Sandberg
7750753312
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.
2008-07-23 16:34:02 +02:00
Horst Hunger
c199b9d51d
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
436f1dc49c
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.
2008-07-23 14:25:00 +03:00
Horst Hunger
62b41dddd9
fix of bug#37708: removed a forgotten include file.
2008-07-23 08:51:04 +02:00
Horst Hunger
1259663d77
merge from parent
2008-07-23 08:49:41 +02:00
Davi Arnaut
cf586451df
Merge 5.1-bugteam into main.
2008-07-22 15:24:31 -03:00
Davi Arnaut
58daa8d50a
Silence warning due to unused function.
2008-07-22 14:53:36 -03:00
Davi Arnaut
aa21daf60a
Merge from mysql-5.1.27 release tree.
2008-07-22 14:41:26 -03:00
Horst Hunger
7a6d7491b5
Fix for bug#37708:
...
Deleted the removed tests.
2008-07-22 19:00:27 +02:00
Horst Hunger
497c97905e
2008-07-22 18:56:50 +02:00
Horst Hunger
d9fc253c47
Fix for bug#37708:The result files of the removed 64 bit tests.
2008-07-22 18:50:36 +02:00
Horst Hunger
cb7d9b27d4
Fix for bug#37708: Result files of removed 32 bit tests.
2008-07-22 18:48:47 +02:00
Horst Hunger
ac73d3b48b
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
83231398d0
merge from parent.
2008-07-22 18:39:56 +02:00
Sergei Golubchik
821683a19c
merge
2008-07-22 16:42:03 +02:00
Horst Hunger
bb6e6e3bb9
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
597fe73cb8
auto merge
2008-07-22 13:33:37 +02:00
Kristofer Pettersson
906f061c76
Disabled two test cases in 5.1 because of random failures.
2008-07-22 13:04:32 +02:00
Kristofer Pettersson
9d83bfb469
merge 5.1->5.1-bugteam
2008-07-22 12:56:36 +02:00
Kristofer Pettersson
25dd8b33d7
merge 5.0->5.0-bugteam
2008-07-22 12:55:15 +02:00
Kristofer Pettersson
de4d31f2ac
2008-07-22 12:41:55 +02:00
Tatiana A. Nurnberg
0fc2eeb67d
auto-merge
2008-07-22 08:54:07 +02:00
Sven Sandberg
5ca789693b
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.
2008-07-21 21:05:06 +02:00
Kristofer Pettersson
f5668bc865
Corrected merge misstake.
2008-07-21 16:41:17 +02:00
Kristofer Pettersson
3f332ceae5
Auto merge
2008-07-21 14:00:13 +02:00