mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27923 commits 2790 branches 343 tags 1.7 GiB
Commit graph

13339 commits

Author SHA1 Message Date
serg@serg.mylan
122b597fc3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-26 08:56:59 +01:00
serg@serg.mylan
10df921c96 documenting HA_STATUS_xxx flags 2005-11-26 08:54:13 +01:00
sergefp@mysql.com
e5592190e5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug15204
 2005-11-25 20:48:26 +03:00
sergefp@mysql.com
526a1d89c9 BUG#15024: get_best_covering_ror_intersect() tries to build ROR-intersection 
by starting with an empty index set and adding indexes to it until it
becomes covering. If the set becomes covering after adding the first index,
return NULL and don't try constructing ROR-intersection of one index (which
caused a crash)
 2005-11-25 20:47:22 +03:00
konstantin@mysql.com
c779c2c809 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-25 19:27:20 +03:00
konstantin@mysql.com
463175c4e8 Post-merge fixes. 2005-11-25 18:53:55 +03:00
konstantin@mysql.com
9fd6204ad1 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-25 13:57:13 +03:00
konstantin@mysql.com
f57dffe453 A fix and a test case for Bug#14410 "Crash in Enum or Set type in 
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are 
created in the statement memory root.
 2005-11-25 13:25:31 +03:00
mskold@mysql.com
6d5ef98adc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-25 10:56:01 +01:00
bar@mysql.com
e6708aa0df Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14146
 2005-11-25 10:08:00 +04:00
evgen@moonbone.local
7a21129691 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13293-bug-5.0-mysql
 2005-11-24 22:41:52 +03:00
pem@mysql.com
3fd3e277ff Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
 2005-11-24 19:45:36 +01:00
pem@mysql.com
7d232f01e3 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
 2005-11-24 19:14:11 +01:00
pem@mysql.com
23cab491e9 Some post-merge cleaning, and made assert THD::store_globals() work at all times. 2005-11-24 19:13:13 +01:00
serg@serg.mylan
8fb3b83805 don't call handler::info() in SHOW CREATE TABLE 2005-11-24 18:13:08 +01:00
evgen@moonbone.local
e093fb1fd7 Fix bug#13293 Wrongly used index results in endless loop. 
Loose index scan using only second part of multipart index was choosen, which
results in creating wrong keys and endless loop.

get_best_group_min_max() now allows loose index scan for distinct only if used
keyparts forms a prefix of the index.
 2005-11-24 19:54:02 +03:00
evgen@moonbone.local
e3cab037bf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14482-bug-4.1-mysql
 2005-11-24 19:17:31 +03:00
evgen@moonbone.local
a4a3215a44 Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused 
crash

resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.

resolve_const_item() now substitutes constants for items with 
result_type == ROW_RESULT only for Item_rows.
 2005-11-24 19:16:51 +03:00
mskold@mysql.com
f27dc1c232 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-24 16:21:49 +01:00
mskold@mysql.com
70d447c1f1 Moved check of wrong schema version earlier 2005-11-24 16:21:07 +01:00
pem@mysql.com
c5475706f9 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
 2005-11-24 12:12:49 +01:00
ramil@mysql.com
c0cdfe8599 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b15047
 2005-11-24 13:42:47 +04:00
monty@mysql.com
f5804869e3 Don't use PATH_MAX for FN_REFLEN as this uses too much stack space 
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk
 2005-11-24 02:36:28 +02:00
konstantin@mysql.com
6fab184f30 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-23 21:20:31 +03:00
konstantin@mysql.com
b1d951d462 Always initialize THD::thread_stack: it's used in 
check_stack_overrun().
 2005-11-23 21:18:10 +03:00
serg@serg.mylan
d50e8ea227 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-23 13:02:50 +01:00
pem@mysql.com
0411412403 Fixed BUG#13729 Stored procedures: packet error after exception handled 
Don't set thd->is_fatal_error in sql_update for duplicate key errors.
 2005-11-23 11:56:53 +01:00
bell@sanja.is.com.ua
1343975dda A name of macro is fixed. 2005-11-23 12:26:07 +02:00
serg@serg.mylan
151d75c241 merged 2005-11-23 09:52:18 +01:00
bell@sanja.is.com.ua
83d692da88 postmerge fix 2005-11-23 02:49:44 +02:00
bell@sanja.is.com.ua
e6b04edbb1 merge 2005-11-23 01:29:25 +02:00
bell@sanja.is.com.ua
db8f03ebe8 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-23 01:28:32 +02:00
bell@sanja.is.com.ua
7bd691f11e Recursion support made for SP (BUG#10100). 2005-11-23 01:11:19 +02:00
bell@sanja.is.com.ua
7d2442a160 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-23 00:58:13 +02:00
bell@sanja.is.com.ua
2bcd68973b Fix for BUG#13549 "Server crash with nested stored procedures 
if inner routine has more local variables than outer one, and
one of its last variables was used as argument to NOT operator".

THD::spcont was non-0 when we were parsing stored routine/trigger
definition during execution of another stored routine. This confused
methods of Item_splocal and forced them use wrong runtime context.
Fix ensures that we always have THD::spcont equal to zero during
routine/trigger body parsing. This also allows to avoid problems
with errors which occur during parsing and SQL exception handlers.
 2005-11-23 00:50:37 +02:00
serg@serg.mylan
419d82f8c2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-22 21:16:11 +01:00
serg@serg.mylan
39cc20a265 German error messages 2005-11-22 21:10:38 +01:00
pem@mysql.com
7827fec43e Set type and default correctly for local SP variables during parsing. 2005-11-22 16:01:04 +01:00
pem@mysql.com
6c2f6e29b9 Post-merge fixes in sp_head.cc (print methods). 2005-11-22 14:25:44 +01:00
pem@mysql.com
d71d1242ff Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/show-sp-code/mysql-5.0
 2005-11-22 13:24:53 +01:00
pem@mysql.com
962d2df6b0 Some final cleanup of the sp_instr print methods. 2005-11-22 13:06:52 +01:00
lars@mysql.com
a0487a8220 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-11-22 11:34:55 +01:00
lars@mysql.com
9851469d12 Added explicit casts, since on i686, the fprintf function does not cast my_off_t correctly. 
Changed wrong printf to fprintf.
 2005-11-22 02:40:08 +01:00
ingo@production.mysql.com
c2abd08da5 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-22 02:26:21 +01:00
kent@mysql.com
9b14ee2ebc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-22 01:17:06 +01:00
ingo@production.mysql.com
49ed3c589d Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-21 23:30:14 +01:00
bell@sanja.is.com.ua
7f162c7899 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-21 21:15:48 +02:00
bell@sanja.is.com.ua
fe44e364ca Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-21 21:14:36 +02:00
bell@sanja.is.com.ua
87a199fc2a Avoiding removing dummy TABLE allocated on the stack (BUG#14726). 2005-11-21 21:11:02 +02:00
bar@mysql.com
3d1c1d7f68 cast.result: 
Fixing test results accordingly.
item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.
 2005-11-21 21:11:28 +04:00