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
43146 commits 2793 branches 343 tags 1.7 GiB
Commit graph

16411 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
d52aee0c43 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2007-01-29 19:11:59 +01:00
msvensson@neptunus.(none)
d1a7949297 Add result file for ssl_connect.test 2007-01-29 19:09:30 +01:00
msvensson@pilot.mysql.com
d87ccc0c83 Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-29 18:38:12 +01:00
msvensson@neptunus.(none)
03b346fce3 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2007-01-29 18:33:23 +01:00
msvensson@neptunus.(none)
8c142aef3f Add test for making sure there are no spurious connect failures when using SSL 2007-01-29 18:32:45 +01:00
istruewing@chilla.local
79e099e8a6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-01-29 17:20:18 +01:00
mhansson/martin@linux-st28.site
3aad724315 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt 
into  linux-st28.site:/home/martin/mysql/src/5.1o-bug20604-tp
 2007-01-29 16:16:20 +01:00
monty@mysql.com/narttu.mysql.fi
1f6d91c5a6 after merge fixes 
Removed
 2007-01-29 16:13:18 +02:00
mhansson/martin@linux-st28.site
6d7a609742 BUG#20604: FORCE INDEX uses keys disabled by ALTER TABLE 
The function that checks whether we can use keys for aggregates,
find_key_for_maxmin(), assumes that keys disabled by ALTER TABLE
... DISABLE KEYS are not in the set table->keys_in_use_for_query.
I.E., if a key is in this set, the optimizer assumes it is free to 
use it.
  
The bug is that keys disabled with ALTER TABLE ... DISABLE KEYS still
appear in table->keys_in_use_for_query When the TABLE object has been 
initialized with setup_tables(). Before setup_tables is called, however, 
keys that are disabled in the aforementioned way are not included in
TABLE::keys_in_use_for_query. 
  
The provided patch changes the code that updates keys_is_use_for_query so 
that it assumes that keys_is_use_for_query already takes into account all 
disabled keys, and generally all keys that should be used by the query.
 2007-01-29 15:07:11 +01:00
monty@narttu.mysql.fi
bb464613ce Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-01-29 01:57:07 +02:00
monty@mysql.com/narttu.mysql.fi
410fc81a72 After merge fixes 
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
 2007-01-29 01:47:35 +02:00
baker@bk-internal.mysql.com
bf7efc3ce3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-28 00:48:11 +01:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
 2007-01-27 03:46:45 +02:00
igor@olga.mysql.com
e897780919 Fixed bug #24420. 
Objects of the classes Item_func_is_not_null_test and Item_func_trig_cond
must be transparent for the method Item::split_sum_func2 as these classes
are pure helpers. It means that the method Item::split_sum_func2 should
look at those objects as at pure wrappers.
 2007-01-26 17:10:45 -08:00
baker@bk-internal.mysql.com
b64060f70d Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-27 00:36:40 +01:00
brian@zim.(none)
08e93132c4 Two things: 
1) Two small windows cleanups for Archive.
2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world.
 2007-01-26 15:36:39 -08:00
brian@zim.(none)
8820333ec3 For performance reasons we remove the ability in unique indexes on autoincrements to remove the ability to insert key lower then the current autoincrement value. 2007-01-26 14:17:45 -08:00
brian@zim.(none)
24d9d866c2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/archive-newformat-5.1
 2007-01-26 12:49:20 -08:00
brian@zim.(none)
6829b2a5a6 This fixes a bug in show create table displaying auto_increment field when it should not. 
It also refactors the test case for Archive (removed two bad tests).
 2007-01-26 11:15:16 -08:00
igor@olga.mysql.com
1ad63bdfec Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24653
 2007-01-26 09:33:19 -08:00
gluh@eagle.(none)
67db27537b Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1
 2007-01-26 16:46:01 +04:00
gluh@mysql.com/eagle.(none)
45f61a06fb Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2007-01-26 16:36:50 +04:00
gluh@mysql.com/eagle.(none)
658777d808 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/4.1
 2007-01-26 16:28:32 +04:00
msvensson@shellback.(none)
2580c49f94 Bug#19209 Test 'rpl_openssl' hangs on Windows 
- Remove the hack to not run it on windows
 2007-01-26 11:34:56 +01:00
igor@olga.mysql.com
19f4fb2b4f Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug24653 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24653
 2007-01-25 21:01:28 -08:00
igor@olga.mysql.com
36df33d80a Fixed bug #24653. 
The bug report has demonstrated the following two problems.
1. If an ORDER/GROUP BY list includes a constant expression being 
optimized away and, at the same time, containing single-row
subselects that return more that one row, no error is reported.
Strictly speaking the standard allows to ignore error in this case.
Yet, now a corresponding fatal error is reported in this case.
2. If a query requires sorting by expressions containing single-row
subselects that, however, return more than one row, then the execution
of the query may cause a server crash. 
To fix this some code has been added that blocks execution of a subselect
item in case of a fatal error in the method Item_subselect::exec.
 2007-01-25 18:44:35 -08:00
dlenev@mockturtle.local
631d3c9c1f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
 2007-01-25 14:58:45 +03:00
jani/jamppa@bk-internal.mysql.com
dd6292d6d1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
 2007-01-25 12:28:00 +01:00
dlenev@mockturtle.local
8b69d169d4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
 2007-01-25 11:26:18 +03:00
dlenev@mockturtle.local
c06a385916 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
 2007-01-25 11:26:07 +03:00
sergefp@mysql.com
8a3592d4e2 BUG#24127: merge: update tests results 2007-01-25 10:00:09 +03:00
sergefp@mysql.com
4908cf0772 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
 2007-01-25 02:28:53 +03:00
svoj@april.(none)
3efc296508 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-01-25 01:44:30 +04:00
svoj@mysql.com/april.(none)
de1572d687 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-01-25 01:31:58 +04:00
svoj@mysql.com/april.(none)
ea7fe60fbc Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-01-25 01:26:57 +04:00
sergefp@pylon.mylan
5bc7d596cc Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 
into  mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
 2007-01-24 22:28:28 +03:00
sergefp@mysql.com
cced625508 BUG#24127: merge fixes: If subselect is a union, dont allocate several 
identical pushed_cond_guards arrays. Allocate only one always.
 2007-01-24 22:23:50 +03:00
dlenev@mockturtle.local
81c908f200 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
 2007-01-24 22:15:14 +03:00
dlenev@mockturtle.local
37110aad7f Disabling back im_daemon_life_cycle.test, which was temporarily enabled in 
the team tree for additional investigation.
 2007-01-24 22:11:27 +03:00
monty@narttu.mysql.fi
c022454e7c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-01-24 19:53:51 +02:00
dlenev@mockturtle.local
c762789096 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
 2007-01-24 19:33:06 +03:00
dlenev@mockturtle.local
86f36eb089 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
 2007-01-24 19:26:06 +03:00
sergefp@mysql.com
e2f0f4dbd3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
 2007-01-24 19:13:28 +03:00
gluh@eagle.(none)
0e949c6ada Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-01-24 20:12:32 +04:00
gluh@mysql.com/eagle.(none)
a548a54c61 after merge fix 2007-01-24 20:11:36 +04:00
gluh@eagle.(none)
7b291e36cf Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-01-24 19:54:40 +04:00
gluh@mysql.com/eagle.(none)
a7acea61de Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-01-24 19:24:16 +04:00
istruewing@chilla.local
0dc064536f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug24607
 2007-01-24 15:52:19 +01:00
istruewing@chilla.local
b9b3120580 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug24607
 2007-01-24 15:47:04 +01:00
istruewing@chilla.local
e74331b3f7 After merge fix 2007-01-24 15:45:41 +01:00