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

31152 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
tomas@poseidon.ndb.mysql.com
e68194dcc0 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 15:23:35 +02:00
tomas@poseidon.ndb.mysql.com
9944e41f6e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-07-06 15:20:22 +02:00
tomas@poseidon.ndb.mysql.com
ec8771af69 backport of ndb DictCache fix 
- don't invalidate tables that are in state RETRIEVING
 2006-07-06 15:18:00 +02:00
dlenev@mysql.com
b429748fab Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg18437-3
 2006-07-06 14:31:32 +04:00
jonas@perch.ndb.mysql.com
72bdce708c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-07-06 09:47:59 +02:00
jonas@perch.ndb.mysql.com
52a28cfa5b Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-07-06 09:41:25 +02:00
jonas@perch.ndb.mysql.com
f5ec695c18 ndb - revert bug fix for bug#20442 2006-07-06 09:38:18 +02:00
acurtis@xiphis.org
4eee50de16 Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/p2-bug8706.3-merge-5.0
 2006-07-05 17:26:16 -07:00
acurtis@xiphis.org
86132d5d8f Bug#8706 
"temporary table with data directory option fails"
  myisam should not use user-specified table name when creating
  temporary tables and use generated connection specific real name.
  Test included.
 2006-07-05 17:18:59 -07:00
tomas@poseidon.ndb.mysql.com
f413bc2fe8 ndbd: added missing jamEntry(); 2006-07-05 20:24:12 +02:00
tomas@poseidon.ndb.mysql.com
aacb705613 Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails 
- updated error message to more correctly reflect the issue
 2006-07-05 20:20:39 +02:00
joerg@mysql.com
c9dc1184fd Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does). 2006-07-05 20:17:04 +02:00
tomas@poseidon.ndb.mysql.com
8b57568a5f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-05 16:40:24 +02:00
tomas@poseidon.ndb.mysql.com
a0ab5ae09f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-05 16:34:34 +02:00
tomas@poseidon.ndb.mysql.com
04ae971576 Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it. 
- remove some event code to get rid of some bugs
 2006-07-05 16:26:08 +02:00
ingo@mysql.com
b21acbe089 After merge fix 2006-07-05 16:23:18 +02:00
ingo@mysql.com
4c00805951 Merge mysql.com:/home/mydev/mysql-4.1-bug19835 
into  mysql.com:/home/mydev/mysql-5.0-ateam
 2006-07-05 11:24:50 +02:00
ingo@mysql.com
5025bf32b2 Merge mysql.com:/home/mydev/mysql-4.1-bug17877 
into  mysql.com:/home/mydev/mysql-5.0-ateam
 2006-07-05 11:23:21 +02:00
ingo@mysql.com
a21071d912 Merge mysql.com:/home/mydev/mysql-4.1-bug14400 
into  mysql.com:/home/mydev/mysql-5.0-ateam
 2006-07-05 11:20:10 +02:00
ingo@mysql.com
20a152d5c3 Merge mysql.com:/home/mydev/mysql-4.1-bug11824 
into  mysql.com:/home/mydev/mysql-5.0-ateam
 2006-07-05 11:11:40 +02:00
joerg@mysql.com
dbc1ca22a0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/bug20216-4.1
 2006-07-05 10:42:49 +02:00
kroki@mysql.com
acf47bdc37 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20570
 2006-07-05 12:04:04 +04:00
kroki@mysql.com
821b540f2e Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20570
 2006-07-04 23:55:52 +04:00
konstantin@mysql.com
b99e11c8bd A fix and a test case for Bug#17843 "Certain stored procedures fail to 
run at startup"

The server returned an error when trying to execute init-file with a 
stored procedure that could return multiple result sets to the client. 
A stored procedure can return multiple result sets if it contains 
PREPARE, SELECT, SHOW and similar statements.
   
The fix is to set client_capabilites|=CLIENT_MULTI_RESULTS in
sql_parse.cc:handle_bootstrap(). There is no "client" really, so 
nothing is ever sent. This makes init-file feature behave consistently: 
the prepared statements that can be called directly in the init-file 
can be used in a stored procedure too.

Re-committed the patch originally submitted by Per-Erik after review.
 2006-07-04 23:46:15 +04:00
ingo@mysql.com
40c103478d Merge mysql.com:/home/mydev/mysql-4.0-bug14400 
into  mysql.com:/home/mydev/mysql-4.1-bug14400
 2006-07-04 19:10:13 +02:00
knielsen@mysql.com
ff0041e8a6 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/knielsen/tmp-5.0
 2006-07-04 19:10:08 +02:00
jonas@mc01.ndb.mysql.com
d0146162e5 ndb - ps_7ndb as discovered by pb 
fix race in scan close
 2006-07-04 16:54:07 +02:00
bar@mysql.com
3855520138 WL#2928 Date Translation NRE 
(implemented by by Josh Chamas)
 2006-07-04 17:40:40 +05:00
knielsen@mysql.com
7892dca173 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/knielsen/tmp-5.0
 2006-07-04 14:10:53 +02:00
jonas@perch.ndb.mysql.com
795eafbce3 Merge tomas@poseidon:mysql-5.0-main 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-07-04 12:47:08 +02:00
tomas@poseidon.ndb.mysql.com
0b2024ac88 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-04 12:47:07 +02:00
knielsen@rt.int.sifira.dk
7062993817 Merge mysqldev@production:my/mysql-5.0-release 
into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
 2006-07-04 12:08:58 +02:00
tomas@poseidon.ndb.mysql.com
1e4ccec835 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-release
 2006-07-04 12:08:57 +02:00