mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
59140 commits 2788 branches 343 tags 1.7 GiB
Commit graph

59140 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Nozdrin
112d9fd9db Auto-merge from mysql-trunk-merge. 2009-11-06 12:37:00 +03:00
Alexander Nozdrin
d9d3271da3 Auto-merge from mysql-trunk-merge. 2009-11-06 12:17:01 +03:00
Alexander Nozdrin
ab2450efd5 Manual merge from mysql-trunk-merge. 
Fix partition_column.test.
 2009-11-06 11:56:48 +03:00
Alexander Nozdrin
ef862653af Manual merge from mysql-trunk-merge. 2009-11-05 23:48:01 +03:00
Alexander Nozdrin
f620cae974 Manual merge from mysql-trunk-merge. 2009-11-05 23:28:35 +03:00
Alexander Nozdrin
09ff80f2a0 Manual merge from mysql-5.1. 2009-11-05 11:48:06 +03:00
Alexander Nozdrin
85f3e8ce24 Manual merge from mysql-5.1. 2009-11-05 11:40:01 +03:00
Mikael Ronstrom
06bfaf21f2 Fixed a use of non-initialised variable, cannot use NULL flags if RANGE == NO_MAX_RANGE or NO_MIN_RANGE, so need to check NULL flags after checking the RANGE isn't NO_MAX_RANGE 2009-11-04 09:30:52 +01:00
Mikael Ronstrom
fc863ba96f Merge 2009-11-03 12:37:02 +01:00
Alexander Nozdrin
76256e8875 Fix default.conf. 2009-11-03 11:36:16 +03:00
Mikael Ronstrom
1daca0f9d7 Fixed test failure 2009-11-02 21:19:56 +01:00
Alexander Barkov
9d13264835 Merging a postfix for Bug#46633 Obsolete Serbian locale 
from mysql-next-mr-bar
 2009-11-02 21:21:37 +04:00
Alexander Nozdrin
ee15f23ca6 Backport a patch from 6.0: 
------------------------------------------------------------
revno: 2599.178.12
revision-id: alik@mysql.com-20080812161845-we7cx9f22yrghob1
committer: Alexander Nozdrin <alik@mysql.com>
branch nick: 6.0-rt-build
timestamp: Tue 2008-08-12 20:18:45 +0400
message:
  Fix memory leak.
------------------------------------------------------------
 2009-11-02 17:17:14 +03:00
Mikael Ronstrom
296a0fdcca Fixed a few bugs in hex string generation, in call to val_str for partition expressions, also made code reusable for DEFAULT handling to fix BUG#48464 by introducing function get_cs_converted_string_value, added partition_utf8 test case for UTF8 outputs 2009-11-02 14:49:26 +01:00
Alexander Nozdrin
8c95f3c53b Manual merge from mysql-next-mr. 2009-11-02 14:10:04 +03:00
Mikael Ronstrom
3a2d15730b Merge to latest mysql-next-mr 2009-11-02 11:09:15 +01:00
Mikael Ronstrom
e4549b4d99 Added test case for UTF8 strings in partition constants 2009-11-02 11:03:40 +01:00
Mikael Ronstrom
889e0a519f Fixed a test error 2009-10-31 10:54:28 +01:00
Mikael Ronstrom
8ec940646d Fixed a test error 2009-10-31 10:48:18 +01:00
Alexander Nozdrin
b9014b95b4 Merge from mysql-trunk. 2009-10-31 11:11:58 +03:00
Alexander Nozdrin
55a28d6ff4 Fix default.conf. 2009-10-31 11:11:10 +03:00
Mikael Ronstrom
84638df046 Added more comments and a safer error check 2009-10-30 22:35:20 +01:00
Mikael Ronstrom
9498a53953 Fixed such that we fail if using integer constants for character set fields, now need to have correct constant types 2009-10-30 21:44:41 +01:00
Mikael Ronstrom
c897c59ceb Fixed so that character set constants are encoded as hex strings in frm file, but as utf8 strings in the same manner as default values in show create table and information schema tables 2009-10-30 21:08:34 +01:00
Mikael Ronstrom
66b37d318b Ensuring character set constants are safe, first step fix 2009-10-30 17:34:11 +01:00
Mikael Ronstrom
40496deb70 Changed COLUMN_LIST to COLUMNS after arch review 2009-10-29 18:04:23 +01:00
Marc Alff
6a67daaa5a Bug#33637 SHOW PROCEDURE CODE/SHOW FUNCTION CODE sp_name gives a syntax error. 
Backport for 5.5

In non debug builds, the statements:
- SHOW PROCEDURE CODE
- SHOW FUNCTION CODE
used to fail with a "syntax error", which is misleading.

These statements have been changed to return the following error for non
debug builds:
ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you
need MySQL built with '--with-debug' to have it working

For debug builds (./configure --with-debug), nothing is changed.
 2009-10-29 10:51:04 -06:00
Kristofer Pettersson
94e70aff64 post commit fix: missing result file. 2009-10-29 17:18:09 +01:00
Marc Alff
2497093ad4 Bug#38968 Unused mutex LOCK_bytes_sent, LOCK_bytes_received 
Backport for 5.5
 2009-10-29 09:21:16 -06:00
Marc Alff
28270dc6ab Local merge 2009-10-29 09:10:31 -06:00
Marc Alff
8826df67a3 Bug#38967 Unused mutex LOCK_Acl 
Backport to 5.5
 2009-10-29 09:07:29 -06:00
Alexander Nozdrin
9ac8feeea0 Automerge from mysql-next-mr. 2009-10-29 18:03:30 +03:00
Mikael Ronstrom
840d7eb4f8 BUG#48397, set key_part->length to key_part->store_length isn't correct, store_length is a bit longer 2009-10-29 13:08:35 +01:00
Kristofer Pettersson
2d6a356abf Bug#38551 query cache can still consume [very little] cpu time even when it is off. 
When the query cache is disabled, the server shouldn't attempt to take the 
query cache mutex.
                             
By using the command line option --query_cache_type=0, the user can disable
   
(backport from mysql-pe)
 2009-10-29 12:19:36 +01:00
Alexander Barkov
59ccc26197 A postfix for Bug#46633 Obsolete Serbian locale name 
Re-Allowing sr_YU with a "deprecated" warning.
 2009-10-29 15:10:36 +04:00
Alexey Botchkov
96f31b3637 mysql_upgrade test fixed 
per-file comments:
  mysql-test/r/mysql_upgrade.result
     result updated
  mysql-test/t/mysql_upgrade.test
     --skip-verbose option added to the call
 2009-10-29 10:03:16 +04:00
Mikael Ronstrom
8e31ec1deb Fixed code review change to ensure that VALUES constants are of the same result type as the field they are constants for 2009-10-28 19:20:32 +01:00
Mikael Ronstrom
2d1c1f8280 Merge 2009-10-28 18:32:48 +01:00
Mikael Ronstrom
d9e05040f4 Merged WL#3352 into mysql-next-mr 2009-10-28 18:22:36 +01:00
Mikael Ronstrom
136ce37141 Merge 2009-10-28 17:52:55 +01:00
Mattias Jonsson
07f9da5d5d merge 2009-10-28 17:30:58 +01:00
Tor Didriksen
ca543fc899 update .bzrignore to ignore libmysqld/rpl_handler.cc link 2009-10-28 15:46:11 +01:00
Tor Didriksen
dc2e363e57 Bug#48060 Memory leak - Item::val_bool() (item.cc:184) from optimizer_subquery grammar 
Item_sum::set_aggregator() may be called multiple times during query preparation.
On subsequent calls: verify that the aggregator type is the same,
and re-use the existing Aggregator.
 2009-10-28 11:07:30 +01:00
Alexey Botchkov
05ddc34be8 WL#4991 mysql_upgrade --fix-privilege-tables 
(backport)
   mysql_upgrade script accepts --upgrade-system-tables option,
   fixing only system tables in this case.

per-file comments:
  client/mysql_upgrade.c
WL#4991 mysql_upgrade --fix-privilege-tables
    --upgrade-system-tables option added.
   if it is set, the tool won't look for the mysqlcheck then
   run_mysqlcheck_fixnames() and run_mysqlcheck_upgrade won't be called.
  mysql-test/r/mysql_upgrade.result
WL#4991 mysql_upgrade --fix-privilege-tables
    test result added
  mysql-test/t/mysql_upgrade.test
WL#4991 mysql_upgrade --fix-privilege-tables
    test case added
 2009-10-28 14:02:00 +04:00
Alexander Nozdrin
800ba382d9 Fix automerge: s/hash_search/my_hash_search/. 2009-10-28 11:42:18 +03:00
Alexander Nozdrin
ac7ba1bcaa Merge from mysql-next-mr. 2009-10-28 10:55:44 +03:00
Alexander Nozdrin
48c15f0fb0 Automerge from mysql-next-mr. 2009-10-28 10:48:53 +03:00
Mikael Ronstrom
b572e51c30 BUG#48165, needed to introduce length restrictions on partitioning fields to ensure that no stack overruns occur 2009-10-28 01:11:17 +01:00
Mikael Ronstrom
59cc518990 Fixed sql_mode issue in BUG#48164, will ignore sql_mode when generating constants, also warnings will not be tolerated 2009-10-28 00:06:11 +01:00
Vladislav Vaintroub
804e9d30ca merge 2009-10-27 13:51:59 +01:00