mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
14014 commits 2784 branches 343 tags 1.6 GiB
Commit graph

14014 commits

This branch
This branch
All branches
Author SHA1 Message Date
konstantin@mysql.com
75454b0a1d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/work/mysql-4.1-4912
 2004-08-21 02:08:20 +04:00
konstantin@mysql.com
568c6e8526 Fix for bug#4912 "mysqld crashs in case a statement is executed 
a second time". The bug was caused by incompatibility of
negations elimination algorithm and PS: during first statement 
execute a subtree with negation was replaced with equivalent 
subtree without NOTs.
The problem was that although this transformation was permanent, 
items of the new subtree were created in execute-local memory.
The patch adds means to check if it is the first execute of a
prepared statement, and if this is the case, to allocate items
in memory of the prepared statement.
The implementation:
- backports Item_arena from 5.0
- adds Item_arena::is_stmt_prepare(), 
  Item_arena::is_first_stmt_execute().
- deletes THD::allocate_temporary_pool_for_ps_preparing(),
  THD::free_temporary_pool_for_ps_preparing(); they
  were redundant.
and adds a few invariants:
- thd->free_list never contains junk (= freed items)
- thd->current_arena is never null. If there is no
  prepared statement, it points at the thd. 
The rest of the patch contains mainly mechanical changes and
cleanups.
 2004-08-21 02:02:46 +04:00
mysqldev@mysql.com
325ea1b991 mysql-copyright: 
Fixed it to work, added function to fix include/mysql_version.h LICENSE tag from GPL to Commercial
 2004-08-21 00:02:45 +02:00
serg@serg.mylan
949348f576 after merge fix 2004-08-20 22:54:42 +02:00
serg@serg.mylan
f401650290 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-20 22:37:19 +02:00
joreland@mysql.com
8c938872a2 variable scoop, compile fix 2004-08-20 22:18:39 +02:00
serg@serg.mylan
050bf6a89f merged 2004-08-20 21:56:29 +02:00
joreland@mysql.com
9d44e240bd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-20 21:56:15 +02:00
rburnett@build.mysql.com
69ec557494 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into build.mysql.com:/users/rburnett/mysql-4.1
 2004-08-20 21:48:16 +02:00
joreland@mysql.com
3145031ae1 removed debug printout 2004-08-20 21:07:08 +02:00
joreland@mysql.com
c7f311c450 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-20 20:58:55 +02:00
serg@serg.mylan
b267ce4bb4 sql_select.cc: compilation failure fixed 2004-08-20 20:10:49 +02:00
bar@mysql.com
7a27f2ce8c Bug#4594 "column index make = failed for gbk, but like works" 
Fix for MyISAM. Tests for MyISAM and HASH+BTREE.
 2004-08-20 21:29:36 +05:00
joreland@mysql.com
ae522cc19c Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-08-20 18:29:36 +02:00
tomas@poseidon.(none)
64fc12f3d2 compile error fixes for some platforms 2004-08-20 16:29:35 +00:00
dlenev@brandersnatch.localdomain
8bea792b14 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
 2004-08-20 20:04:49 +04:00
tomas@poseidon.(none)
d9b266d2da Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-20 16:04:48 +00:00
tomas@poseidon.(none)
b4c8431c18 fix compile error on some platforms 2004-08-20 16:04:06 +00:00
dlenev@brandersnatch.localdomain
b4105df897 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
 2004-08-20 19:30:45 +04:00
lenz@mysql.com
bc8228b6fc Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-08-20 17:30:45 +02:00
tomas@poseidon.(none)
a71f1894d0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-20 15:30:44 +00:00
tomas@poseidon.(none)
90fde3f48d small helptext fix 2004-08-20 15:29:54 +00:00
guilhem@mysql.com
02e93b5758 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-08-20 17:16:03 +02:00
guilhem@mysql.com
5db56a106b Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions, 
in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.
 2004-08-20 16:35:23 +02:00
joreland@mysql.com
f02ebd6fcc bug#5128 - remove need of unique fs-path 
bug#4761 - more validation of hosts
bug#4511 - only non depricated should be saved in config
         - fix ConfigInfo::BOOL w.r.t deprication
 2004-08-20 15:58:30 +02:00
dlenev@brandersnatch.localdomain
c8882165f3 Fix for bug#4302 "ambiguos order by when renamed column is identical to another in result" 
When in find_item_in_list() we are looking for item we should take into account unaliased 
names of the fields but only if item with such aliased name is not found.
Also we should ignore aliases when looking for fully specified field.
 2004-08-20 17:53:46 +04:00
lenz@mysql.com
fd25d80e9e - do not link statically on our IA64 and AMD64 build hosts, as 
static linking against an unpatched glibc 2.3 is causing trouble
 - add "glibc23" to the release suffix in this case
 - re-ordered the Changelog that was messed up by a BK merge
   (RPM is picky about this)
 2004-08-20 15:52:16 +02:00
mronstrom@mysql.com
2f859587b8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/mikron/mysql-4.1
 2004-08-20 14:47:41 +02:00
mronstrom@mysql.com
4234a57f3f Compile fixes for Mac OS X 2004-08-20 14:43:23 +02:00
pem@mysql.com
6c84b4e237 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/pem/work/mysql-4.1
 2004-08-20 14:04:30 +02:00
mskold@mysql.com
b4357f8381 Bugfix for bug#5072, removed table version in BLOB table name since this is incremented at alter table 2004-08-20 14:04:29 +02:00
pem@mysql.com
ed4f183b68 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/pem/work/mysql-4.1
 2004-08-20 13:25:48 +02:00
hf@deer.(none)
833baf6f9c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb
 2004-08-20 16:25:47 +05:00
tomas@poseidon.(none)
4ec4e2662b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-clean
 2004-08-20 11:25:46 +00:00
tomas@poseidon.(none)
b2af364f71 fixed some help tests for ndb executables 2004-08-20 11:24:41 +00:00
pem@mysql.comhem.se
ccad8307ba Fixed compiler warnings in sql/field.h. 2004-08-20 13:11:14 +02:00
hf@deer.(none)
ce65325320 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-08-20 15:39:26 +05:00
tomas@poseidon.(none)
f3a3399e58 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-20 10:39:25 +00:00
gluh@gluh.mysql.r18.ru
71a4f92cdc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
 2004-08-20 13:39:00 +04:00
hf@deer.(none)
833d285c67 Fix to make range.test work smoothly --without-innidb 2004-08-20 14:29:28 +05:00
ram@gw.mysql.r18.ru
c40f3a2c97 A fix (bug #5115: Erronious Syntax Error when comment placed inside of "create table") 2004-08-20 13:37:58 +05:00
gluh@gluh.mysql.r18.ru
83f78fd5d5 Resolving merging conflict 2004-08-20 12:33:52 +04:00
mskold@mysql.com
6a054ce26e Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-20 09:00:13 +02:00
hf@deer.(none)
0bda11b695 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb
 2004-08-20 10:50:23 +05:00
mskold@mysql.com
a3c99571a7 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-08-20 06:53:23 +02:00
mskold@mysql.com
6f8ebb4798 Merge mskold@build.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-20 06:51:02 +02:00
serg@serg.mylan
43826f0974 merged 2004-08-20 01:38:20 +02:00
serg@serg.mylan
4f57cee99f typo in libedit fixed - possible buffer overflow - bug#4696 2004-08-20 01:34:34 +02:00
serg@serg.mylan
62722e7b05 merged 2004-08-20 00:52:43 +02:00
guilhem@mysql.com
54d43b7b19 sql_class.h: 
removing unneeded var left from 4.0
 2004-08-20 00:01:00 +02:00