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

35752 commits

This branch
This branch
All branches
Author SHA1 Message Date
pekka@clam.ndb.mysql.com
7f9bfc2058 ndb - add test_event_merge to daily-devel-tests.txt 2006-06-21 17:17:12 +02:00
cmiller@zippy.(none)
1dd674ef8a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
 2006-06-21 11:07:34 -04:00
mikael@dator5.(none)
de9eb496af BUG#19309: Problem with calling proecdures twice 
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure
 2006-06-21 10:57:30 -04:00
tomas@poseidon.ndb.mysql.com
ebb8ac0221 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-21 16:44:40 +02:00
svoj@may.pils.ru
ffd8ea244d Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-5.0
 2006-06-21 19:41:09 +05:00
svoj@may.pils.ru
fedbbf4865 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
 2006-06-21 19:41:08 +05:00
tomas@poseidon.ndb.mysql.com
5f46cb7e1a added missing MYSQLTEST_VARDIR declaration 2006-06-21 16:41:07 +02:00
pekka@clam.ndb.mysql.com
6ba2b1845c ndb - bug#18102: fixes on NDB API level 2006-06-21 16:15:04 +02:00
ramil@myoffice.izhnet.ru
3228ce7f9e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1
 2006-06-21 19:14:59 +05:00
jonas@perch.ndb.mysql.com
8e198f577f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-06-21 16:03:10 +02:00
jonas@perch.ndb.mysql.com
a32d815a25 ndb - bug#19275 
make sure tablename is release in case of alter table
 2006-06-21 16:01:23 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
143648c35e Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
 2006-06-21 16:55:47 +03:00
rburnett@bk-internal.mysql.com
5a558eaf89 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-21 15:33:22 +02:00
lars@mysql.com
207c0baf45 After merge fix 2006-06-21 15:30:26 +02:00
ramil@mysql.com
db2acfc926 Fix for bug #20601: rpl_ndb_log.test failure 2006-06-21 18:16:07 +05:00
svoj@may.pils.ru
e560564cfa Merge april:devel/BitKeeper/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1
 2006-06-21 17:51:16 +05:00
jonas@perch.ndb.mysql.com
a75c1eadde Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-06-21 14:39:28 +02:00
jonas@perch.ndb.mysql.com
e166a5e6be Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-06-21 14:36:50 +02:00
svoj@may.pils.ru
8b98be2844 BUG#20357 - Got error 124 from storage engine using MIN and MAX 
functions in queries

Using MAX()/MIN() on table with disabled indexes (by ALTER TABLE)
results in error 124 (wrong index) from storage engine.

The problem was that optimizer use disabled index to optimize
MAX()/MIN(). Normally it must skip disabled index and perform
table scan.

This patch skips disabled indexes for min/max optimization.
 2006-06-21 17:30:59 +05:00
anozdrin@mysql.com
6ed2ec688d Merge mysql.com:/mnt/raid/alik/MySQL/devel/5.1-tree 
into  mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294
 2006-06-21 16:17:51 +04:00
lars@mysql.com
6b8c196584 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-21 14:14:37 +02:00
jonas@perch.ndb.mysql.com
9db4c3dfac Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-06-21 14:08:39 +02:00
anozdrin@mysql.com
ce8734699b Fix for BUG#20294: Instance manager test im_instance_conf 
fails randomly.

The problem is that the test was affected by other running
test-suites on the same box. The fix affects the test only,
no code touched.
 2006-06-21 16:02:51 +04:00
jonas@perch.ndb.mysql.com
fd818ae205 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-06-21 14:02:10 +02:00
jonas@perch.ndb.mysql.com
8f06aae041 ndb - bug#20197 
also close scan which are in "delivered" state, as it's impossible to release locks afterwards

  backport from 5.1
 2006-06-21 14:00:26 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
d3773117a5 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.0
 2006-06-21 14:52:02 +03:00
lars@dl145j.mysql.com
ed0e98529c Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-06-21 13:51:28 +02:00
lars@mysql.com
6839e64298 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-21 13:42:02 +02:00
jonas@perch.ndb.mysql.com
14ba65ff64 ndb - bug#20007 
varpages did not get freed on drop table
 2006-06-21 13:39:04 +02:00
knielsen@mysql.com
66bdb6de02 Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0 
into  mysql.com:/data0/knielsen/mysql-5.0
 2006-06-21 12:59:19 +02:00
knielsen@mysql.com
8167b2c8ef BUG#20578 
Backport Valgrind suppression from mysql-5.1:

D 1.4 05/11/23 22:44:54+02:00 monty@mysql.com 5 4 12/0/154
P mysql-test/valgrind.supp
C Remove warning that may happens becasue threads dies in different order
 2006-06-21 12:52:59 +02:00
joerg@mysql.com
e9fda5b23e Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M50/autopush-5.0 2006-06-21 12:29:30 +02:00
knielsen@mysql.com
b70da9a23f BUG#20598 
Fix race between cleanup and thread kill at server shutdown that would
sometimes prevent proper cleanup, leading to Valgrind warnings.
 2006-06-21 12:27:24 +02:00
monty@narttu.mysql.fi
20c00662eb Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-21 13:24:56 +03:00
monty@mysql.com
f93d85ea22 Fixed typo that was forgot in last changeset. 2006-06-21 13:24:06 +03:00
gkodinov@mysql.com
bca6492927 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18080
 2006-06-21 13:06:32 +03:00
mskold@mysql.com
22334907fc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-21 12:03:08 +02:00
tomas@poseidon.ndb.mysql.com
0b247f8092 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-06-21 12:03:07 +02:00
gkodinov@mysql.com
f327a8c536 merge of the changes for bug #18080 2006-06-21 13:03:06 +03:00
mskold@linux.site
a2fad11caa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-21 12:02:03 +02:00
tomas@poseidon.ndb.mysql.com
c360810ddb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-06-21 12:02:02 +02:00
gkodinov@mysql.com
4f8f4cd51a manual merge 2006-06-21 13:01:00 +03:00
gkodinov@mysql.com
bee985af35 Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean 
into  mysql.com:/home/kgeorge/mysql/5.0/B20482
 2006-06-21 12:59:34 +03:00
gluh@eagle.intranet.mysql.r18.ru
8097ba2046 after merge fixes 2006-06-21 14:53:40 +05:00
gkodinov@mysql.com
75ca055493 Bug #20482: failure on Create join view with sources views/tables in different 
schemas
The function check_one_table_access() called to check access to tables in 
SELECT/INSERT/UPDATE was doing additional checks/modifications that don't hold
in the context of setup_tables_and_check_access().
That's why the check_one_table() was split into two : the functionality needed by
setup_tables_and_check_access() into check_single_table_access() and the rest of 
the functionality stays in check_one_table_access() that is made to call the new
check_single_table_access() function.
 2006-06-21 12:12:46 +03:00
mskold@linux.site
7704d973d4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-06-21 10:10:01 +02:00
bar@mysql.com
bfae7303d7 Bug#20086: Can't get data from key partitioned tables with VARCHAR key 
The problem appeared because the same values produced different hash
during INSERT and SELECT for VARCHAR data type.
Fix:
VARCHAR required special treatment to avoid hashing of length bytes
(leftmost one or two bytes) as well as trailing bytes beyond real length,
which could contain garbage. Fix is done by introducing hash() - new method
in the Field class.
 2006-06-21 13:00:19 +05:00
mskold@mysql.com
7fdf6f1633 Fixed failed automerge 2006-06-21 09:51:08 +02:00
mskold@mysql.com
f0bd8a7cd9 Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed 
into  mysql.com:/home/marty/MySQL/mysql-5.0
 2006-06-21 09:50:41 +02:00
anozdrin@mysql.com
5ce56c1cdc Disable IM tests. 2006-06-21 11:44:54 +04:00