mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42620 commits 2785 branches 343 tags 1.6 GiB
Commit graph

42620 commits

This branch
This branch
All branches
Author SHA1 Message Date
svoj@june.mysql.com
a6de0419d4 Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
 2007-01-24 11:56:18 +04:00
svoj@june.mysql.com
77515e27f7 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
 2007-01-24 11:54:38 +04:00
svoj@mysql.com/june.mysql.com
0e5aa80e8a After merge fix. 2007-01-24 11:53:09 +04:00
dlenev@mockturtle.local
a1376aa01b Fixed test case after merging fix for bug#24491 "using alias from source 
table in insert ... on duplicate key" in 5.1 tree.
 2007-01-24 10:46:25 +03:00
dlenev@mockturtle.local
282501df21 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg24491
 2007-01-24 10:42:57 +03:00
svoj@mysql.com/june.mysql.com
603dcb4d3f Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
 2007-01-24 11:41:13 +04:00
svoj@mysql.com/june.mysql.com
94d834c7b6 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
 2007-01-24 11:40:45 +04:00
svoj@mysql.com/june.mysql.com
02212e6ace Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
 2007-01-24 11:38:23 +04:00
stewart@willster.(none)
b0d94e9d35 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
 2007-01-24 16:24:21 +11:00
stewart@willster.(none)
76d4191379 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
 2007-01-24 16:16:16 +11:00
stewart@willster.(none)
4889ea2321 fix hpux build problem and some ndb connect errors being missed 2007-01-24 16:12:39 +11:00
tomas@poseidon.mysql.com
292ba83f40 Bug#25668 mysqld may core if cluster disconnected 
- recommit in 4.1
 2007-01-24 09:41:40 +07:00
tomas@poseidon.mysql.com
f869a0d605 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-01-24 09:13:47 +07:00
igor@olga.mysql.com
459f3cf18a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-01-23 17:04:01 -08:00
istruewing@chilla.local
26153490ec Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug24607
 2007-01-23 22:27:03 +01:00
mjorgensen@production.mysql.com
2e174533f0 Merge bk-internal:/home/bk/mysql-5.1 
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
 2007-01-23 20:38:00 +01:00
istruewing@chilla.local
b381fd87bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug24607
 2007-01-23 20:19:19 +01:00
igor@olga.mysql.com
20279c1a7b Post-merge fix. 2007-01-23 10:11:53 -08:00
igor@olga.mysql.com
ed3c1741d4 Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-01-23 09:56:06 -08:00
gkodinov/kgeorge@rakia.gmz
ac25a49ff4 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B6172-5.1-opt
 2007-01-23 19:48:53 +02:00
gkodinov/kgeorge@macbook.gmz
450e9b6b30 Bug #6172: RAND(a) should only accept constant values as arguments 
RAND() must accept scalar expressions regardless of their kind.
 That includes both constant expressions and expressions that 
 depend on column values.
 When the expression is constant the random seed can be initialized
 at compile time.
 However when the expression is not constant the random seed must be
 initialized at each invocation (while it still can be allocated at
 compile time).
 Implemented the above rules by extending Item_func_rand::val_real()
 to initialize the random seed at the correct place.
 2007-01-23 19:45:58 +02:00
acurtis/antony@ltamd64.xiphis.org
37f76ab496 Merge xiphis.org:/home/antony/work2/p1-bug25396.4 
into  xiphis.org:/home/antony/work2/p1-bug25396.5
 2007-01-23 08:34:50 -08:00
istruewing@chilla.local
45178e6677 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug24607
 2007-01-23 15:59:49 +01:00
pekka@clam.ndb.mysql.com/clam.(none)
d3462b9af1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
 2007-01-23 15:20:50 +01:00
pekka@clam.(none)
f2157aed18 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
 2007-01-23 14:59:05 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
e916f08a85 Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build 
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-build
 2007-01-23 14:53:59 +01:00
stewart@willster.(none)
a1a7816161 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
 2007-01-24 00:44:11 +11:00
stewart@willster.(none)
6d267551a3 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
 2007-01-24 00:37:11 +11:00
stewart@willster.(none)
dbaab7f474 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
 2007-01-24 00:34:12 +11:00
stewart@willster.(none)
adf40be13b Bug#25567 records() call performs scan in NDB, performance bug 2007-01-24 00:27:19 +11:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
fddb97da98 Bug#25396 
"Valgrind leak in closecon_handlerton"
  plugin_shutdown() calls plugin_deinitialize() which calls ha_finalize_handlerton().
  ndbcluster_end() fails to wait for the ndb utility thread to exit which results in
  the handlerton struct being freed before the ndb utility thread has destroyed it's THD
  but before the plugin has been marked as UNINITIALIZED

Bug is caused by misuse of abort_loops variable and not locking mutex during calls to
pthread condition variable functions causing a race in valgrind's pthread_cond_wait
implementation.
 2007-01-23 05:09:14 -08:00
dlenev@mockturtle.local
6562df201a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491
 2007-01-23 15:57:46 +03:00
svoj@june.mysql.com
0b0dfe6f64 Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
 2007-01-23 16:36:29 +04:00
svoj@mysql.com/june.mysql.com
fb2172d20b Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
 2007-01-23 16:35:17 +04:00
pekka@clam.(none)
0bdb9dc809 Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
 2007-01-23 13:22:48 +01:00
dlenev@mockturtle.local
2b63f10601 Proposed fix for bug#24491 "using alias from source table in insert ... 
on duplicate key".

INSERT ... SELECT ... ON DUPLICATE KEY UPDATE which was used in
stored routine or as prepared statement and which in its ON DUPLICATE
KEY clause erroneously tried to assign value to a column mentioned only
in its SELECT part was properly emitting error on the first execution
but succeeded on the second and following executions.

Code which is responsible for name resolution of fields mentioned in
UPDATE clause (e.g. see select_insert::prepare()) modifies table list
and Name_resolution_context used in this process. It uses
Name_resolution_context_state::save_state/restore_state() to revert
these modifications. Unfortunately those two methods failed to revert
properly modifications to TABLE_LIST::next_name_resolution_table
and this broke name resolution process for successive executions.

This patch fixes Name_resolution_context_state::save_state/restore_state()
in such way that it properly handles TABLE_LIST::next_name_resolution_table.
 2007-01-23 15:03:48 +03:00
pekka@clam.ndb.mysql.com/clam.(none)
56e2d4ffcb ndb - bug#25562 use byte-size max_data_length() when setting blob part size 2007-01-23 12:58:10 +01:00
acurtis/antony@ltamd64.xiphis.org
a9183720c2 Merge xiphis.org:/home/antony/work2/p2-bug24270.2 
into  xiphis.org:/home/antony/work2/p2-bug24270.3
 2007-01-23 03:34:09 -08:00
gkodinov/kgeorge@macbook.gmz
17a0207ece Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
 2007-01-23 12:34:50 +02:00
istruewing@chilla.local
786063e30c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug24607
 2007-01-23 11:09:58 +01:00
gluh@mysql.com/eagle.(none)
e34b0056f2 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-01-23 14:08:58 +04:00
joerg@trift2.
e40ce2e081 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-23 11:05:44 +01:00
joerg@trift2.
021d31180c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-23 10:47:21 +01:00
stewart@willster.(none)
5b886fa358 round up Transporter connect timeout 2007-01-23 17:19:27 +11:00
stewart@willster.(none)
4984af30ec Bug #25487 deleting ndb_cluster_connection object takes long time 
aim is to:
  a) if set_connect_timeout called, timeout connect attempt (for retry on
  next call) after timeout period
  b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
  
  Related to customer issue with long time deleting ndb_cluster_connection
  object. believe we're hanging on the connect(2) call until timeout (when
  we then realise we should exit the thread).
 2007-01-23 17:07:09 +11:00
tomas@poseidon.mysql.com
9a85d74e2a Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-01-23 11:46:13 +07:00
tomas@poseidon.mysql.com
6825593df8 ndb - bug#22013 
Fix bug in event handling wrt early node shutdown
 2007-01-23 11:44:42 +07:00
tomas@poseidon.mysql.com
a9193743a2 correct manual merge 2007-01-23 09:52:13 +07:00
tomas@poseidon.mysql.com
cd5f9b2f3e Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-01-23 07:25:24 +07:00
tomas@poseidon.mysql.com
12911bb5c0 bug#25746 ndb: 4209 error with 2 VARCHAR primary keys 
- post review changes
 2007-01-23 07:12:03 +07:00