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

3636 commits

Author SHA1 Message Date
hf@deer.(none)
b22a499d42 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.emb
 2004-08-24 16:29:05 +05:00
tomas@poseidon.(none)
c5bf129e9c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1-clean
 2004-08-24 11:29:04 +00:00
tomas@poseidon.(none)
5a24844551 some more printouts to SHOW command 2004-08-24 11:28:19 +00:00
hf@deer.(none)
cce03195dc Merging fix 2004-08-24 15:03:44 +05:00
hf@deer.(none)
43a853dd4d Merging 2004-08-24 12:58:21 +05:00
bell@sanja.is.com.ua
9d71f85121 subselect test split on two tests because gis extention can be absent 2004-08-24 10:15:39 +03:00
bell@sanja.is.com.ua
3b65ce7489 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
 2004-08-23 22:32:38 +03:00
bell@sanja.is.com.ua
6fcd27e9cd after review fixes: 
allowed parsing of table fields inside aggregate functions
 added new tests of fields resolving in grouping
 2004-08-23 22:31:01 +03:00
lenz@mysql.com
871625c5d5 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-08-23 21:03:16 +02:00
lenz@mysql.com
0479919884 - removed mysql-test/t/flush_block_commit-master.opt as it collided 
with the sleep value we use for the test suite run during the
   release builds
 2004-08-23 20:58:56 +02:00
mskold@mysql.com
9ad2448606 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-08-23 20:33:38 +02:00
gluh@gluh.mysql.r18.ru
b1847f471c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-08-23 20:18:24 +04:00
gluh@gluh.mysql.r18.ru
7b17daf21e Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results(for 4.1 tree) 2004-08-23 20:17:14 +04:00
mskold@mysql.com
c644595dac Fix for bug#5171 2004-08-23 17:24:03 +02:00
bar@mysql.com
1ffd4d6129 show_check.test, show_check.result: 
Don't do this test for now: it fails on Mac OSX.
 2004-08-23 20:12:40 +05:00
bar@mysql.com
0983295859 Bug#4594: column index make = failed for gbk, but like works 
Fix for HEAP+HASH prefix keys.
 2004-08-23 20:12:39 +05:00
tomas@poseidon.(none)
b8dfb7eaf1 reverted default setting of --ndbcluster if --ndb-connectstring is given 2004-08-23 15:12:38 +00:00
bell@sanja.is.com.ua
3ca433e332 merge 2004-08-23 15:50:59 +03:00
sergefp@mysql.com
a309f76128 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
 2004-08-23 13:15:43 +04:00
sergefp@mysql.com
263f2e3fe2 Fix for bug#5088: 
* When executing EXPLAIN, do the same as for the query: convert join type to JT_CONST if keyuse array covers all key parts and all of them are constants.
 * In remove_const, don't remove conditions that depend on some-const-table and current-table.
 2004-08-23 12:31:56 +04:00
bell@sanja.is.com.ua
74d7a092b2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-08-23 10:59:35 +03:00
tomas@poseidon.(none)
05853d95de Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-23 07:33:40 +00:00
serg@serg.mylan
326992430f check for mysql_bin_log.is_open() before my_b_tell(&thd->transaction.trans_log 
in ha_commit_trans - why it didn't crash earlier ?
 2004-08-22 14:23:52 +02:00
serg@serg.mylan
d0afecff15 merged 2004-08-22 12:47:11 +02:00
hf@deer.(none)
6c136f99bf Proposed fix for bug #5003 (subselect with MIN() and LIKE crashes server) 
We have next problem here:
active_index is wrong in the subselect's handler on the second val_int() call.
Optimizer sees that we can use index-read for that kind of condition,
and matching_cond() (sql/opt_sum.cc) doesn't. I suspect, proper solution is
to add appropriate code to the matching_cond() but now just added
missed initialization.
 2004-08-22 00:06:19 +05:00
konstantin@mysql.com
df1d90d12b Fix to skip flush_block_commit test if the server was compiled 
without InnoDB.
 2004-08-21 11:30:41 +04:00
igor@rurik.mysql.com
4b760fcb94 null.test, null.result: 
Added test case for bug #4256.
join_outer.result:
  Fixed bug #4256.
item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects.
  This inconsistency caused bug #4256.
 2004-08-20 23:48:30 -07:00
igor@rurik.mysql.com
02f9e068b9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-08-20 16:32:40 -07:00
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
igor@rurik.mysql.com
3862914416 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-08-20 14:09:50 -07: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
serg@serg.mylan
050bf6a89f merged 2004-08-20 21:56:29 +02:00
igor@rurik.mysql.com
433206c1f2 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-08-20 12:31:57 -07: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
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)
2aada533d4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.(none):/home/tomas/mysql-4.1
 2004-08-20 16:25:04 +00:00
tomas@poseidon.(none)
91b352377c added switch to mysqld to specify connectstring 2004-08-20 16:10:47 +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
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
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
hf@deer.(none)
833d285c67 Fix to make range.test work smoothly --without-innidb 2004-08-20 14:29:28 +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
62722e7b05 merged 2004-08-20 00:52:43 +02:00