Commit graph

51460 commits

Author SHA1 Message Date
holyfoot/hf@mysql.com/hfmain.(none)
0c15068ff8 Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/31305/my41-31305
2007-11-13 23:12:55 +04:00
holyfoot/hf@hfmain.(none)
b10c63646c Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/31305/my51-31305
2007-11-13 23:12:45 +04:00
gkodinov/kgeorge@magare.gmz
7f571c68cf merge bug 31562 to 5.1 : changed SHOW CREATE VIEW format 2007-11-13 19:32:12 +02:00
gkodinov/kgeorge@magare.gmz
70f9ec3c8d Merge magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31562-5.1-opt
2007-11-13 19:15:49 +02:00
gkodinov/kgeorge@magare.gmz
eea70871f1 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.0-opt
2007-11-13 19:00:45 +02:00
evgen@moonbone.local
c406150f34 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  moonbone.local:/work/30081-bug-5.1-opt-mysql
2007-11-13 13:29:42 +00:00
evgen@moonbone.local
4fa7ee92e6 Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS
command and reported to a client.

The fact that a timestamp field will be set to NO on UPDATE wasn't shown 
by the SHOW COMMAND and reported to a client through connectors. This led to
problems in the ODBC connector and might lead to a user confusion.

A new filed flag called ON_UPDATE_NOW_FLAG is added. 
Constructors of the Field_timestamp set it when a field should be set to NOW
on UPDATE.

The get_schema_column_record function now reports whether a timestamp field
will be set to NOW on UPDATE.
2007-11-13 13:24:48 +00:00
istruewing@stella.local
6223deb694 Bug#32091: Security breach via directory changes
Post pushbuild fix

Disabled test on windows due to bug#30459
(DATA/INDEX DIR for partitions not working on windows)

Patch from Mattias Jonsson.
2007-11-13 11:12:53 +01:00
gkodinov/kgeorge@magare.gmz
3384d3e96c Bug #31562: HAVING and lower case
The columns in HAVING can reference the GROUP BY and 
SELECT columns. There can be "table" prefixes when
referencing these columns. And these "table" prefixes
in HAVING use the table alias if available.
This means that table aliases are subject to the same
storage rules as table names and are dependent on 
lower_case_table_names in the same way as the table 
names are.
Fixed by :
1. Treating table aliases as table names
and make them lowercase when printing out the SQL
statement for view persistence.
2. Using case insensitive comparison for table 
aliases when requested by lower_case_table_names
2007-11-13 11:39:52 +02:00
istruewing@stella.local
5f206cb372 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  stella.local:/home2/mydev/mysql-5.1-bug31210
2007-11-13 10:33:50 +01:00
istruewing@stella.local
edce8a63e2 Bug#32078 - Excessive warnings: One can only use the --user switch
if running as root

Every start of a server in the test suite raised that warning.

The cause was an unconditionla add of the --user option to the
server command line. Only the "root" user (effective user id == 0)
must use that option.

Added check for effective user id == 0 before adding --user.

Thanks to Magnus Svensson for the patch.
2007-11-13 10:25:22 +01:00
mats@kindahl-laptop.dnsalias.net
6e1f5f6eed Elimination of warning for unused function code_name() in non-debug mode. 2007-11-13 09:43:29 +01:00
mats@kindahl-laptop.dnsalias.net
0cf6e38cb5 Fixes to eliminate warnings. 2007-11-13 09:01:42 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
bc08ff0421 test fixed 2007-11-13 09:41:59 +04:00
mattiasj@mattiasj-laptop.(none)
7491e15f21 Merge mattiasj@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
2007-11-12 22:47:48 +01:00
mattiasj@mattiasj-laptop.(none)
f5d1d682bc Merge mattiasj@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-last_with_main
2007-11-12 22:40:43 +01:00
mats@kindahl-laptop.dnsalias.net
0f42488cb4 BUG#31793 (log event corruption causes crash):
Corrections to get_str_len_and_pointer().
2007-11-12 22:02:12 +01:00
mattiasj@mattiasj-laptop.(none)
f4c100135b Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-main
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.0-engines_with_main
2007-11-12 21:42:27 +01:00
mattiasj@mattiasj-laptop.(none)
32d7dd8679 Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-main
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-last_with_main
2007-11-12 21:09:48 +01:00
kent@mysql.com/kent-amd64.(none)
b94de5d1d6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
2007-11-12 18:57:50 +01:00
svoj@june.mysql.com
d03491e8f9 Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.1-engines
2007-11-12 21:55:53 +04:00
kent@kent-amd64.(none)
c667dc61dd Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/bug30069/mysql-5.1-build
2007-11-12 18:54:17 +01:00
svoj@june.mysql.com
9799d6c479 Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
2007-11-12 21:54:04 +04:00
svoj@mysql.com/june.mysql.com
ed8f506d29 symlink.test, symlink.result:
Use proper variable for test.
2007-11-12 21:52:30 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
8085bed591 Bug #32067 Partitions: crash with timestamp column.
Partition handler fails updating tables with partitioning
based on timestamp field, as it calculates the timestamp field
AFTER it calculates the number of partition of a record.

Fixed by adding timestamp_field->set_time() call and disabling
such consequent calls
2007-11-12 21:11:31 +04:00
istruewing@stella.local
235af69299 Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-12 17:22:58 +01:00
istruewing@stella.local
c887bd6a01 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-12 17:22:20 +01:00
istruewing@stella.local
0eec7df922 Merge stella.local:/home2/mydev/mysql-5.1-ateam
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-12 17:21:31 +01:00
istruewing@stella.local
83a9db9a30 Merge stella.local:/home2/mydev/mysql-5.0-ateam
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-12 16:44:05 +01:00
istruewing@stella.local
6a4a920b0c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  stella.local:/home2/mydev/mysql-5.1-bug31210
2007-11-12 15:55:40 +01:00
anozdrin/alik@station.
99d33cd67a A patch for BUG#32172: information_schema test fails with
wait_condition timeout.

The problem was that the event thread didn't manage to execute
the event in 30 seconds on highly-loaded box. The fix is to
increase timeout.

This is a fix for the test suite.
2007-11-12 17:26:32 +03:00
mattiasj@mattiasj-laptop.(none)
c22c91ecde Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-fixtopush
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-lastfinaltopush
2007-11-12 15:04:48 +01:00
mattiasj@mattiasj-laptop.(none)
75fea7f6d9 Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug29368
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-lastfinaltopush
2007-11-12 14:58:20 +01:00
mattiasj@mattiasj-laptop.(none)
bb31a28990 Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug31705
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-lastfinaltopush
2007-11-12 14:57:00 +01:00
mattiasj@mattiasj-laptop.(none)
232a1ec01d Merge mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug32091
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-lastfinaltopush
2007-11-12 14:55:50 +01:00
mattiasj@mattiasj-laptop.(none)
43578c9097 Bug#31705 Partitions: crash if varchar length > 65530
Buffer overflow due to wrong key length in partitioning

Changed to the correct key_length function.
2007-11-12 14:51:14 +01:00
svoj@mysql.com/june.mysql.com
417669f9e8 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0
2007-11-12 17:28:02 +04:00
kent@kent-amd64.(none)
aee02b2a2c Merge mysql.com:/home/kent/bk/bug30069/mysql-5.0-build
into  mysql.com:/home/kent/bk/bug30069/mysql-5.1-build
2007-11-12 14:09:57 +01:00
kent@kent-amd64.(none)
1979c915f9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/bug30069/mysql-5.1-build
2007-11-12 13:50:37 +01:00
mattiasj@mattiasj-laptop.(none)
9c05d109aa Bug#32091: Security breach via directory changes
Merge fix

partition_mgm did not require have_symlink.

Moved the test case to partition_symlink, which
require have_symlink, and should work on both *nix and
Windows
2007-11-12 13:23:45 +01:00
aelkin/elkin@koti.dsl.inet.fi
66cb03195c Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug31170-rpl_innodb_bug28430_fails
2007-11-12 14:14:15 +02:00
kent@kent-amd64.(none)
af7d3963b2 Merge mysql.com:/home/kent/bk/bug30069/mysql-4.1-build
into  mysql.com:/home/kent/bk/bug30069/mysql-5.0-build
2007-11-12 13:13:43 +01:00
istruewing@stella.local
b05471de73 Bug#31210 - INSERT DELAYED crashes server when used on
partitioned table
    
Post-pushbuild fix
    
Pushbuild detected yet another need for lex initialization in
embedded server.
2007-11-12 13:07:54 +01:00
kent@mysql.com/kent-amd64.(none)
3bb7cac84b bigint.test, bigint.result:
Test case for Bug#30069
2007-11-12 12:52:03 +01:00
anozdrin/alik@station.
5f33524d24 Fix for a BUG#31898: 16M memory allocations for user variables
in stored procedure.

The problem was that MySQL used unnecessarily large amounts of
memory if user variables were used as an argument to CONCAT or
CONCAT_WS -- 16M per each user variable used.

Technically, it happened because MySQL used the following
allocation strategy for string functions to avoid multiple
realloc() calls: in the virtual operation fix_length_and_dec()
the attribute max_length was calculated as a sum of max_length
values for each argument.

Although this approach worked well for small (or fixed) data types,
there could be a problem if there as a user variable among
the arguments of a string function -- max_length of the function
would be 16M (as the max_length of a user variable is 16M).

Both CONCAT() and CONCAT_WS() functions suffer from this problem.

The fix is to do not use meta-data for allocating memory.
The following strategy is proposed instead: allocate the exact
length of the result string at the first record, double the amount
of memory allocated when it is required.

No test case for this bug because there is no way to test memory
consumption in a robust way with our test suite.
2007-11-12 14:44:17 +03:00
svoj@june.mysql.com
162d70cb02 Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.1-engines
2007-11-12 15:26:37 +04:00
svoj@june.mysql.com
5e44309422 Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-5.0-engines
2007-11-12 15:16:00 +04:00
svoj@mysql.com/june.mysql.com
40a78cd390 After merge fix. 2007-11-12 15:15:16 +04:00
svoj@mysql.com/june.mysql.com
a6def1f4ab Merge mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.0
into  mysql.com:/home/svoj/devel/mysql/BUG32111/mysql-4.1-engines
2007-11-12 15:02:42 +04:00
mats@kindahl-laptop.dnsalias.net
e4e8cb3a90 BUG#31611 (Security risk with BINLOG statement):
Adding missing drop of user created for test case.
2007-11-12 11:29:55 +01:00