mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51126 commits 2793 branches 343 tags 1.7 GiB
Commit graph

15974 commits

Author SHA1 Message Date
holyfoot/hf@hfmain.(none)
0a570643eb Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/31158/my51-31158
 2007-11-17 17:16:32 +04:00
holyfoot/hf@hfmain.(none)
e400b54447 Merge mysql.com:/home/hf/work/31158/my50-31158 
into  mysql.com:/home/hf/work/31158/my51-31158
 2007-11-17 17:12:18 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
67ce52fd66 merging 2007-11-17 17:11:05 +04:00
holyfoot/hf@hfmain.(none)
7588fa52b6 Merge mysql.com:/home/hf/work/31158/my41-31158 
into  mysql.com:/home/hf/work/31158/my50-31158
 2007-11-17 16:48:57 +04:00
kaa@polly.(none)
6733c292a8 Merge polly.(none):/home/kaa/src/opt/bug32241/my51-bug29131 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-16 14:30:25 +03:00
kaa@polly.(none)
7b38492a4c Merge polly.(none):/home/kaa/src/opt/bug32241/my50-bug29131 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-11-16 14:24:06 +03:00
kaa@polly.(none)
d9e48751d1 Merge polly.(none):/home/kaa/src/opt/bug32241/my50-bug29131 
into  polly.(none):/home/kaa/src/opt/bug32241/my51-bug29131
 2007-11-16 14:00:57 +03:00
kaa@polly.(none)
82125f281f Fix for bug #32241: memory corruption due to large index map in 'Range 
checked for each record'

The problem was in incorrectly calculated length of the buffer used to
store a hexadecimal representation of an index map in
select_describe(). This could result in buffer overrun and stack
corruption under some circumstances.

Fixed by correcting the calculation.
 2007-11-16 13:58:09 +03:00
gkodinov/kgeorge@magare.gmz
f7876a2cfc Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31928-5.1-opt
 2007-11-15 17:32:25 +02:00
gkodinov/kgeorge@magare.gmz
85fab707c5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31928-5.0-opt
 2007-11-15 17:30:08 +02:00
gkodinov/kgeorge@magare.gmz
092e7803c9 merge of bug 31928 to 5.1-opt 2007-11-15 14:12:59 +02:00
tnurnberg@white.intern.koehntopp.de
074a1dbd02 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31700/51-31700
 2007-11-15 12:31:40 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
f1adcf9d75 Bug#31700: thd->examined_row_count not incremented for 'const' type queries 
tests adjusted for Windows
 2007-11-15 12:30:35 +01:00
gkodinov/kgeorge@magare.gmz
9c06883a42 Merge magare.gmz:/home/kgeorge/mysql/work/B31928-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31928-5.1-opt
 2007-11-15 12:00:08 +02:00
gluh@eagle.(none)
58336411c9 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-11-14 17:30:16 +04:00
gluh@eagle.(none)
246c6c35a9 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-11-14 17:26:22 +04:00
gluh@mysql.com/eagle.(none)
ea3bfdb26d Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-11-14 17:22:03 +04:00
gshchepa/uchum@gleb.loc
95e7cccfee Merge gleb.loc:/home/uchum/work/bk/5.1-opt-32034 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-11-14 15:49:57 +04:00
gkodinov/kgeorge@magare.gmz
82ce901ded Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.1-opt
 2007-11-14 12:03:28 +02:00
gshchepa/uchum@gleb.loc
70f36562bc Fixed bug #32034: On 64bit platforms assigning values of 
storage engine system variables was not validated and
unexpected value was assigned.

The check_func_enum function used subtraction from the uint
value with the probably negative result. That result of
type uint was compared with 0 after casting to signed long
type. On architectures where long type is longer than int
type the result of comparison was unexpected.
 2007-11-14 13:48:21 +04:00
holyfoot/hf@hfmain.(none)
19c3bd89f8 Merge mysql.com:/home/hf/work/32067/my51-32067 
into  mysql.com:/home/hf/work/31305/my51-31305
 2007-11-13 23:16:48 +04:00
holyfoot/hf@hfmain.(none)
acd198d5fa Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/31305/my50-31305
 2007-11-13 23:13:59 +04:00
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
holyfoot/hf@mysql.com/hfmain.(none)
7d111abf0e Bug #31158 Spatial, Union, LONGBLOB vs BLOB bug (crops data) 
max_length parameter for BLOB-returning functions must be big enough
for any possible content. Otherwise the field created for a table
will be too small.
 2007-11-13 10:51:47 +04: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
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
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
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
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
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
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