mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
31195 commits 2781 branches 343 tags 1.6 GiB
Commit graph

31195 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.local
15a76619c7 Post-merge fixes for Bug#19399 "Stored Procedures 'Lost Connection' 
when dropping/creating tables"
 2006-07-11 23:39:51 +04:00
kostja@bodhi.local
e4598dae1f Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-11 21:19:57 +04:00
kostja@bodhi.local
fbf54f8d72 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-11 17:04:27 +04:00
ingo/mydev@chilla.local
50b630ba7c Merge chilla.local:/home/mydev/mysql-5.0-release 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-11 13:01:27 +02:00
joerg@trift2.
6b9e4ff960 Raise the version number. 2006-07-11 12:34:43 +02:00
joerg@trift2.
7027740d6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  trift2.:/M50/mysql-5.0
 2006-07-11 11:32:45 +02:00
kostja@bodhi.local
77285cb650 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-11 08:36:50 +04:00
kostja@bodhi.local
4f3636dd5a Fix yet another Windows build failure: "true" -> TRUE 2006-07-11 01:46:44 +04:00
joerg@trift2.
90d80ffd81 Merge trift2.:/M50/clone-5.0 
into  trift2.:/M50/mysql-5.0
 2006-07-10 22:40:57 +02:00
joerg@trift2.
cf2d51c3f7 Raise the version number. 2006-07-10 22:38:13 +02:00
kostja@bodhi.local
171bcbf339 Fix a Windows build failure. 2006-07-10 23:58:36 +04:00
ingo/mydev@chilla.local
dfaa3c78f6 Revoking patch for Bug#10952 on behalf of Brian. 2006-07-10 20:46:05 +02:00
kostja@bodhi.local
d7f5d73fc2 Fix test results to be vardir-independent. 2006-07-10 16:22:42 +04:00
pekka@orca.ndb.mysql.com
72fa4883cf Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
 2006-07-10 14:12:02 +02:00
pekka@orca.ndb.mysql.com
9f3b47e53c ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam) 2006-07-10 13:59:13 +02:00
pekka@orca.ndb.mysql.com
7c83e6d201 ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam) 2006-07-10 13:44:15 +02:00
kostja@bodhi.local
f183c08476 A post-merge fix (Bug#8706 "temporary table with data directory option 
fails"
 2006-07-10 14:53:49 +04:00
kostja@bodhi.local
746749ed75 Add sql_locale.cpp to our windows build scripts. 2006-07-10 14:30:17 +04:00
pekka@orca.ndb.mysql.com
023f44356f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
 2006-07-10 12:15:34 +02:00
pekka@orca.ndb.mysql.com
bdc7a14bba ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0) 2006-07-10 12:13:45 +02:00
joerg@trift2.
4fbf8f2fc0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  trift2.:/M50/mysql-5.0
 2006-07-10 12:08:55 +02:00
joerg@trift2.
6ec62524b3 support-files/mysql.spec.sh : Fix a typing error. 2006-07-10 12:03:44 +02:00
joerg@trift2.
94ef9ca9ca Merge trift2.:/M50/clone-5.0 
into  trift2.:/M50/back23-5.0
 2006-07-10 11:42:45 +02:00
pekka@orca.ndb.mysql.com
7433d5ccbe Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
 2006-07-10 11:31:37 +02:00
pekka@orca.ndb.mysql.com
79cc3bed10 mysql-test/Makefile.am: fix cp of mode 444 files (re-commit) 2006-07-10 11:09:32 +02:00
pekka@orca.ndb.mysql.com
71aa094c68 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
 2006-07-10 11:02:46 +02:00
kostja@bodhi.local
2ab1e065e4 Fix compiler warnings in sql_udf.h: ISO C++ forbids casting 
between pointer to function and pointer to object.
 2006-07-09 13:03:51 +04:00
kostja@bodhi.local
f1d949a856 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 21:45:02 +04:00
ingo/mydev@chilla.local
f631765a06 Merge chilla.local:/home/mydev/mysql-5.0--main 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-08 16:50:50 +02:00
kostja@bodhi.local
ff1947da1e A post-merge fix. 2006-07-08 04:07:43 +04:00
kostja@bodhi.local
a2c0cdd75b Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 02:30:07 +04:00
kostja@bodhi.local
96f4c10dde Cleanups: ignore more files. 2006-07-08 00:03:43 +04:00
kostja@bodhi.local
7bf73ac3e5 Merge bodhi.local:/opt/local/work/mysql-5.0-root 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-07-07 22:09:43 +04:00
pekka@mysql.com/orca.ndb.mysql.com
c9bc03c3cd Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847 
into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847
 2006-07-07 13:40:47 +02:00
pekka@mysql.com
7ed021f926 ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies 2006-07-07 10:57:22 +02:00
knielsen@ymer.(none)
31ddb04105 Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951 
into  ymer.(none):/usr/local/mysql/tmp-5.0
 2006-07-06 23:52:05 +02:00
knielsen@ymer.(none)
5ea51287d6 BUG#19951: Race conditions in test wait_timeout. 
Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.
 2006-07-06 23:49:09 +02:00
konstantin@bodhi.netgear
0db71aaf98 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.netgear:/opt/local/work/mysql-4.1-19399
 2006-07-07 00:01:05 +04:00
ingo@chilla.local
b900484346 Merge chilla.local:/home/mydev/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-06 21:59:48 +02:00
konstantin@bodhi.netgear
8e735d2c11 A fix and a test case for Bug#19399 "res 'Lost Connection' when 
dropping/creating tables".

The bug could lead to a crash when multi-delete statements were
prepared and used with temporary tables.

The bug was caused by lack of clean-up of multi-delete tables before
re-execution of a prepared statement. In a statement like
DELETE t1 FROM t1, t2 WHERE ... the first table list (t1) is
moved to lex->auxilliary_table_list and excluded from lex->query_tables
or select_lex->tables. Thus it was unaccessible to reinit_stmt_before_use
and not cleaned up before re-execution of a prepared statement.
 2006-07-06 23:59:04 +04:00
tomas@poseidon.ndb.mysql.com
73064141f6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 20:09:25 +02:00
ingo@chilla.local
f031de4f9e Merge chilla.local:/home/mydev/mysql-5.0-bug16218 
into  chilla.local:/home/mydev/mysql-5.0-ateam
 2006-07-06 19:38:10 +02:00
ingo@chilla.local
591d461d95 Merge chilla.local:/home/mydev/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-bug16218
 2006-07-06 19:36:07 +02:00
tomas@poseidon.ndb.mysql.com
8816f98036 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 19:03:33 +02:00
tomas@poseidon.ndb.mysql.com
4199719438 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 18:50:44 +02:00
tomas@poseidon.ndb.mysql.com
cf71457319 Merge jonas@perch:src/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-07-06 16:06:19 +02:00
tomas@poseidon.ndb.mysql.com
aea2a9c788 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-07-06 16:03:22 +02:00
joerg@trift2.
a873811ae8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into trift2.:/M50/merge-5.0
 2006-07-06 16:03:02 +02:00
tomas@poseidon.ndb.mysql.com
27a8cade86 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 16:03:01 +02:00
ingo@chilla.local
518fcc8f80 Merge chilla.local:/home/mydev/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-ateam
 2006-07-06 15:59:03 +02:00