database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Code Activity
35,446 Commits 3,148 Branches 363 Tags
a04bfd8e2af7194b283d9c113ec85a8551e204b9
Commit Graph

12564 Commits

Author SHA1 Message Date
konstantin@mysql.com
a04bfd8e2a Merge mysql.com:/opt/local/work/tmp_merge 
into  mysql.com:/opt/local/work/mysql-5.1-runtime
 2006-06-26 18:49:20 +04:00
konstantin@mysql.com
5e0a692723 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/opt/local/work/mysql-5.1-runtime
 2006-06-26 18:45:46 +04:00
andrey@lmy004.
23340f3fdd Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into lmy004.:/work/mysql-5.1-runtime-bug16992
 2006-06-26 12:22:13 +02:00
andrey@lmy004.
d617241c3f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into lmy004.:/work/mysql-5.1-runtime-bug18897
 2006-06-26 08:55:49 +02:00
elliot@mysql.com
72e8a44d51 Post merge fix 2006-06-25 16:04:11 -04:00
elliot@mysql.com
bc2b96fee3 Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
 2006-06-25 09:59:34 -04:00
knielsen@rt.int.sifira.dk
7491454f78 Merge mysql.com:/usr/local/mysql/tmp-5.0 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-06-24 13:14:24 +02:00
knielsen@mysql.com
34cf139bd9 Fix race condition in test case wait_timeout. 
Sometimes the helper connection (that is watching for the main connection
to time out) would itself time out first, causing the test to fail.
 2006-06-24 13:11:09 +02:00
elliot@mysql.com
a5181fdcde Post merge fix. 2006-06-23 17:59:24 -04:00
elliot@mysql.com
d4796d9df6 Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
 2006-06-23 17:27:54 -04:00
andrey@lmy004.
e71ef73d53 Fix for bug #18897 "Events: unauthorized action possible with 
alter event rename".

ALTER EVENT ... RENAME statement hasn't checked privileges
for the target database. It also caused server crashes when
target database was not specified explicitly and there was
no current database.

This fix adds missing privilege check and check for the case
when target database is not specified explicitly or implicitly.
 2006-06-23 17:29:01 +02:00
monty@mysql.com
059c45d016 Suppress memory leak from 'kill_server' 
(Happens if main thread exists before kill_server thread, which is ok)
 2006-06-23 10:46:16 +03:00
andrey@lmy004.
ef5c261afe Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into lmy004.:/work/mysql-5.1-runtime-bug20624
 2006-06-23 09:42:11 +02:00
andrey@lmy004.
08f9d359d4 disable events tests in embedded 
(fix for bug#20290 Event mechanism incompatible with embedded server, but tests tried)
 2006-06-23 09:40:06 +02:00
monty@mysql.com
649157954b Fixed failure with rpl_truncate_7ndb.test when using statement based replication. 
is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
(Faster and easier to understand)
Allow cluster_binlogging also in mixed replication mode.
 2006-06-22 22:44:21 +03:00
konstantin@mysql.com
8a2bf1cc7d Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-06-22 21:06:09 +04:00
konstantin@mysql.com
e20898a507 A fix and a test case for Bug#15217 "Using a SP cursor on a table created 
with PREPARE fails with weird error".
More generally, re-executing a stored procedure with a complex SP cursor query
could lead to a crash.

The cause of the problem was that SP cursor queries were not optimized 
properly at first execution: their parse tree belongs to sp_instr_cpush,
not sp_instr_copen, and thus the tree was tagged "EXECUTED" when the
cursor was declared, not when it was opened. This led to loss of optimization
transformations performed at first execution, as sp_instr_copen saw that the
query is already "EXECUTED" and therefore either not ran first-execution 
related blocks or wrongly rolled back the transformations caused by 
first-execution code.
The fix is to update the state of the parsed tree only when the tree is
executed, as opposed to when the instruction containing the tree is executed.
Assignment if i->state is moved to reset_lex_and_exec_core.
 2006-06-22 19:29:48 +04:00
anozdrin@alik.
44de151e3c 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-22 18:59:57 +04:00
anozdrin@alik.
4653035e67 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294
 2006-06-22 18:58:15 +04:00
anozdrin@mysql.com
d5dca744cd Additional fix for BUG#20294: Instance manager test 
im_instance_conf fails randomly.
 2006-06-22 18:56:22 +04:00
andrey@lmy004.
50c7663dbc fix for bug#20624: events_logs_tests.test fails randomly 
(this is a change to a faulty test file)
 2006-06-22 16:13:18 +02:00
andrey@lmy004.
c59a58c4ba fix for bug#16992 (Events: Information_schema troubles) 
Introduced EVENTS.EVENT_DEFINITION, like ROUTINES.ROUTINE_DEFINITION
Hence, the contents of the current EVENTS.EVENT_BODY become the contents
of EVENT_DEFINITION. EVENT_BODY will contain always, for now, "SQL" (wo
quotes).
 2006-06-22 13:01:08 +02:00
monty@mysql.com
b8ab496057 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-06-22 12:21:41 +03:00
rburnett@bk-internal.mysql.com
d9fb74e40e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-22 01:25:57 +02:00
mikael@dator5.(none)
9543cae6cf Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19281
 2006-06-21 19:25:56 -04:00
mikael@dator5.(none)
cb5043199b mmanual merge 2006-06-21 19:08:30 -04:00
rburnett@bk-internal.mysql.com
8472ce9ff8 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-21 17:51:54 +02:00
mikael@dator5.(none)
eab0cfbc25 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug19281
 2006-06-21 11:41:06 -04:00
monty@mysql.com
bb02e07777 Change table_id's to # to make tests portable 2006-06-21 18:27:45 +03: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
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
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
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
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
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
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
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
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
gluh@eagle.intranet.mysql.r18.ru
8097ba2046 after merge fixes 2006-06-21 14:53:40 +05: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
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