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

20603 commits

Author SHA1 Message Date
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
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
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)
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
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
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
kent@mysql.com/kent-amd64.(none)
3bb7cac84b bigint.test, bigint.result: 
Test case for Bug#30069
 2007-11-12 12:52:03 +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
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
holyfoot/hf@hfmain.(none)
12a513f10d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/mysql-5.1-opt
 2007-11-12 14:27:19 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
2b3947a6a5 'no innodb engine' test failure fixed 2007-11-12 14:26:09 +04:00
tomas@whalegate.ndb.mysql.com
20e3804ea9 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-11-12 10:50:58 +01:00
kaa@polly.(none)
95ab749d6e Merge polly.(none):/home/kaa/src/opt/bug30666/my51-bug29131 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-12 12:35:42 +03:00
kaa@polly.(none)
bf2a90f14b Merge polly.(none):/home/kaa/src/opt/bug30666/my50-bug29131 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-11-12 12:29:20 +03:00
holyfoot/hf@hfmain.(none)
8240a3e868 Merge mysql.com:/home/hf/work/31305/my50-31305 
into  mysql.com:/home/hf/work/31305/my51-31305
 2007-11-12 13:07:30 +04:00
holyfoot/hf@hfmain.(none)
83a2781894 Merge mysql.com:/home/hf/work/31305/my41-31305 
into  mysql.com:/home/hf/work/31305/my50-31305
 2007-11-12 13:06:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
91e2f91897 Bug #31305 myisam tables crash when they are near capacity. 
When we insert a record into MYISAM table which is almost 'full',
we first write record data in the free space inside a file, and then
check if we have enough space after the end of the file.
So if we don't have the space, table will left corrupted.
Similar error also happens when we updata MYISAM tables.

Fixed by modifying write_dynamic_record and update_dynamic_record functions
to check for free space before writing parts of a record
 2007-11-12 13:00:22 +04:00
kaa@polly.(none)
7260dbdbd2 Merge polly.(none):/home/kaa/src/opt/bug30666/my50-bug29131 
into  polly.(none):/home/kaa/src/opt/bug30666/my51-bug29131
 2007-11-12 11:26:31 +03:00
istruewing@stella.local
e2cc172d35 Bug#31210 - INSERT DELAYED crashes server when used on 
partitioned table
  
Post-pushbuild fix
  
Pushbuild detected a new need for lex initialization in
embedded server.

Fixed test for INSERT DELAYED in partitions_hash.test so that
it works with embedded server.
 2007-11-11 20:38:28 +01:00
tnurnberg@white.intern.koehntopp.de
e3df319066 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31700/51-31700
 2007-11-11 03:07:39 +01:00
gshchepa/uchum@gleb.loc
f457080109 Merge gleb.loc:/home/uchum/5.0-opt 
into  gleb.loc:/home/uchum/5.1-opt
 2007-11-11 06:07:38 +04:00
tnurnberg@white.intern.koehntopp.de
4bd91d2b27 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/scratch/tnurnberg/31700/51-31700
 2007-11-10 21:52:18 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
7908e3b6c2 Bug#31700: thd->examined_row_count not incremented for 'const' type queries 
add 5.1-specific test showing that 'const' access increments 'examined'
counter in slow query log.
 2007-11-10 21:51:47 +01:00
mattiasj@mattiasj-laptop.(none)
f9c771b037 Bug#32091: Security breach via directory changes 
Changed test case from GRANT to CREATE USER
 2007-11-10 21:29:39 +01:00
gshchepa/uchum@gleb.loc
8b21045f9b Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-11-11 00:01:24 +04:00
gshchepa/uchum@gleb.loc
e5394523d3 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-28076 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-11-10 23:58:22 +04:00
kaa@polly.(none)
ed2ae869d9 Merge polly.(none):/home/kaa/src/opt/bug32202/my51-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
 2007-11-10 22:48:17 +03:00
kaa@polly.(none)
b745305b20 Merge polly.(none):/home/kaa/src/opt/bug32202/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
 2007-11-10 22:46:25 +03:00
gshchepa/uchum@gleb.loc
0aabb89ee1 Fixed bug #28076: inconsistent binary/varbinary comparison. 
After adding an index the <VARBINARY> IN (SELECT <BINARY> ...)
clause returned a wrong result: the VARBINARY value was illegally padded
with zero bytes to the length of the BINARY column for the index search.
(<VARBINARY>, ...) IN (SELECT <BINARY>, ... ) clauses are affected too.
 2007-11-10 23:44:48 +04:00
kaa@polly.(none)
9e829a56d4 Merge polly.(none):/home/kaa/src/opt/bug32202/my50-bug26215 
into  polly.(none):/home/kaa/src/opt/bug32202/my51-bug26215
 2007-11-10 22:27:34 +03:00
holyfoot/hf@hfmain.(none)
0fe103f90f Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/31893/my51-31893
 2007-11-10 23:17:39 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
4764ffa3be Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b32137/b32137.5.0
 2007-11-10 18:57:32 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2691d9b1a9 manual merge. 2007-11-10 18:57:09 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
c102112f09 Merge mysql.com:/home/ram/work/b32137/b32137.5.0 
into  mysql.com:/home/ram/work/b32137/b32137.5.1
 2007-11-10 18:43:44 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f3813c920e manual merge. 2007-11-10 18:27:57 +04:00
mattiasj@mattiasj-laptop.(none)
47a03ea321 Bug#32091: Security breach via directory changes 
small fix of test case (when running make test after
merge, it did not substitute MYSQLTEST_VARDIR in
the error)
 2007-11-10 14:56:21 +01:00