1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

22318 Commits

Author SHA1 Message Date
malff@lambda.hsd1.co.comcast.net.
ee3e6d8171 Manual merge of 5.0-runtime to 5.1-runtime 2007-10-16 20:47:08 -06:00
malff@lambda.hsd1.co.comcast.net.
a4c66084a8 Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-16 15:43:16 -06:00
skozlov/ksm@mysql.com/virtop.localdomain
253bb96e79 Fix for non-deterministic behavior of SELECTs and VIEWs 2007-10-16 23:19:39 +04:00
thek@adventure.(none)
9388592a21 Fixed query_cache_notembedded test program failure because of dependencies between
test programs.
2007-10-16 19:32:38 +02:00
malff@lambda.hsd1.co.comcast.net.
a9c6ed46e2 Implementing code review comments 2007-10-16 11:16:31 -06:00
davi@moksha.com.br
c3447cef35 Bug#31608 missing mysqltest change_user command
The problem is that currently there is no way to test the behavior
of the mysql_change_user() function using the mysqltest suite because
there is no internal command for it.

The solution is to introduce a change_user command that can be used
to test aspects of the MySQL client function mysql_change_user().
2007-10-16 12:29:22 -03:00
kaa@polly.(none)
a9184873cf Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-16 19:25:04 +04:00
kaa@polly.(none)
5cb0d70646 Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-16 19:20:00 +04:00
kaa@polly.(none)
18250925bc Merge polly.(none):/home/kaa/src/maint/bug31174/my41-bug31174
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
2007-10-16 19:17:00 +04:00
thek@adventure.(none)
b6c7a4b6b2 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-10-16 14:45:52 +02:00
thek@adventure.(none)
8c86e79aa3 Bug#30710 query_cache.test fails on embedded - per-column privs test
The embedded version of the server doesn't use column level grants, and 
the compile directive NO_EMBEDDED_ACCESS_CHECKS should be checked instead of
the redundant HAVE_QUERY_CACHE (which is always the case) to determine if 
column level grants should be compiled or not.
2007-10-16 14:42:42 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
3d2f493fb4 Fix bug #31604: server crash when setting slow_query_log_file/global general_log_file variable
Problem: we don't evaluate given expression checking values of the
slow_query_log_file/general_log_file, don't check it for NULL.

Fix: evaluate the expression, check result returned.
2007-10-16 17:19:07 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
73834a4a86 After merge fix:
Adjusting SHOW CREATE TABLE output from 5.0 to 5.1 format
2007-10-16 15:22:44 +05:00
bar@bar.myoffice.izhnet.ru
37ee3f8990 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b31081
2007-10-16 15:04:04 +05:00
bar@bar.myoffice.izhnet.ru
35b20797d9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
2007-10-16 14:58:59 +05:00
gluh@eagle.(none)
97ce1f8cf1 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-16 14:10:07 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
0dfe3a8dfb Fix for bug #31285: main.status test fails with different Table_locks_waited
Problem: Table_locks_waited value may depend on general logging.

Fix: switch general logging off.
2007-10-16 13:43:16 +05:00
gluh@eagle.(none)
20baa313b5 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-16 13:19:01 +05:00
malff@lambda.hsd1.co.comcast.net.
99a270ba0f Bug#28318 (CREATE FUNCTION (UDF) requires a schema) -- part II
The root cause of the issue was that the CREATE FUNCTION grammar,
for User Defined Functions, was using the sp_name rule.
The sp_name rule is intended for fully qualified stored procedure names,
like either ident.ident, or just ident but with a default database
implicitly selected.

A UDF does not have a fully qualified name, only a name (ident), and should
not use the sp_name grammar fragment during parsing.

The fix is to re-organize the CREATE FUNCTION grammar, to better separate:
- creating UDF (no definer, can have AGGREGATE, simple ident)
- creating Stored Functions (definer, no AGGREGATE, fully qualified name)

With the test case provided, another issue was exposed which is also fixed:
the DROP FUNCTION statement was using sp_name and also failing when no database
is implicitly selected, when droping UDF functions.
The fix is also to change the grammar so that DROP FUNCTION works with
both the ident.ident syntax (to drop a stored function), or just the ident
syntax (to drop either a UDF or a Stored Function, in the current database)
2007-10-15 19:15:38 -06:00
gkodinov/kgeorge@magare.gmz
ba03c12b24 Bug #27099: system_mysql fail in pushbuild windows
On Windows the debug log was doing freopen () instead of
fflush() and that was slowing the logging down that much 
that some tests timed out.
Fixed by replacing the freopen() with an syncing-to-disk
flag to fopen() and fflush().
Also increased the timeout of the tests running with --debug
on windows : seems to slow down as much as valgrind on linux.
2007-10-15 19:56:24 +03:00
mleich@four.local.lan
714e2091c5 Fix for
Bug#31169 Test case does not check whether configuration contains feature tested
2007-10-15 17:04:43 +02:00
gluh@mysql.com/eagle.(none)
55a7338f39 Bug#30986 Character set introducer followed by a HEX string can return bad result(addon)
issue an error if string has illegal characters
2007-10-15 18:40:58 +05:00
serg@janus.mylan
b64215d653 merged 2007-10-15 15:27:00 +02:00
gshchepa/uchum@gleb.loc
88aa7b0a6e Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019
into  gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-15 14:18:26 +05:00
msvensson@pilot.mysql.com
a152ff1672 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-15 10:59:01 +02:00
gshchepa/uchum@gleb.loc
18ecc5bb5a Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-10-15 13:34:58 +05:00
msvensson@pilot.mysql.com
cecc37d8b4 Merge pilot.mysql.com:/data/msvensson/mysql/bug11589/my50-test_latest
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-15 09:22:11 +02:00
jonas@perch.ndb.mysql.com
69cce99bb6 ndb - reenable disabled testcases
ndb_load
  ndb_dd_sql_features
2007-10-15 09:17:15 +02:00
mskold/marty@linux.site
f92959dea5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-10-15 08:51:35 +02:00
kaa@polly.(none)
e0691da0c1 Fix for bug #30453: String not cast to int correctly.
Problem:

my_strntoull10rnd_8bit() handled incorrectly cases when the input
string contains a decimal point and is long enough to overrun the
'unsigned long long' type. The position of the decimal point was not
taken into account which resulted in miscalculated numbers and
truncation to appropriate SQL data type limits.

Solution:

Fix my_strntoull10rnd_8bit() to take the position of a decimal point
into account in such cases.
2007-10-15 10:34:34 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
3286de1d91 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31154/b31154.5.1
2007-10-15 10:41:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
583f5080c4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b31154/b31154.5.0
2007-10-15 10:40:28 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
71775c2432 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b31154/b31154.5.0
2007-10-15 10:28:58 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
4c94aaa3b4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b31154/b31154.5.1
2007-10-15 10:21:22 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d2251a8fe3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b30885/b30885.5.0
2007-10-15 09:57:11 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
b3d7188639 Merge mysql.com:/home/ram/work/b31154/b31154.5.0
into  mysql.com:/home/ram/work/b31154/b31154.5.1
2007-10-15 09:44:22 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d8d0f7f226 Merge mysql.com:/home/ram/work/mysql-5.1-maint
into  mysql.com:/home/ram/work/b30885/b30885.5.1
2007-10-15 09:43:31 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
981ebebf4e Merge mysql.com:/home/ram/work/b30885/b30885.5.0
into  mysql.com:/home/ram/work/b30885/b30885.5.1
2007-10-15 09:41:30 +05:00
aelkin/elkin@koti.dsl.inet.fi
8f7550ecad manual merge for bug_29136, bug#29309. 2007-10-13 23:12:50 +03:00
aelkin/elkin@koti.dsl.inet.fi
a7b1a823a5 Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug29136-mdelete
into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
2007-10-13 16:51:16 +03:00
aelkin/elkin@koti.dsl.inet.fi
ed0ab76e28 Bug #29136 erred multi-delete on trans table does not rollback the statement
similar to bug_27716, but it was stressed on in the synopsis on that there is another
side of the artifact affecting behaviour in transaction.

Fixed with deploying multi_delete::send_error() - otherwise never called - and refining its logic
to perform binlogging job if needed.

The changeset includes the following side effects:
- added tests to check bug_23333's scenarios on the mixture of tables for multi_update;
- fixes bug@30763 with two-liner patch and a test coinciding to one added for bug_23333.
2007-10-13 15:49:42 +03:00
gkodinov/kgeorge@magare.gmz
3c0ca8259f Merge magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31156-5.1-opt
2007-10-13 09:22:37 +03:00
gkodinov/kgeorge@magare.gmz
a4da332ea5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31156-5.0-opt
2007-10-13 09:20:23 +03:00
gkodinov/kgeorge@magare.gmz
ce1ce20e73 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.1-opt
2007-10-13 09:13:00 +03:00
gkodinov/kgeorge@magare.gmz
737dd70435 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
2007-10-13 09:12:15 +03:00
mats@kindahl-laptop.dnsalias.net
d32c1d616e Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
2007-10-12 13:24:28 +02:00
gkodinov/kgeorge@magare.gmz
df422f7c3f Merge magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31440-5.1-opt
2007-10-12 14:14:27 +03:00
gkodinov/kgeorge@magare.gmz
d330469f10 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.0-opt
2007-10-12 14:11:27 +03:00
tnurnberg@sin.intern.azundris.com
3d230dda77 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
2007-10-12 11:56:51 +02:00
tnurnberg@sin.intern.azundris.com
7754e54bd0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
2007-10-12 11:54:44 +02:00