paul@kite-hub.kitebird.com
16e879e837
mysqld.cc:
...
Reorder out-of-order status variables
2005-08-30 13:16:40 -05:00
paul@kite-hub.kitebird.com
19af7f8973
Manual merge.
2005-08-30 12:12:12 -05:00
paul@frost.snake.net
351c59cb5f
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
2005-08-27 22:00:22 -05:00
paul@frost.snake.net
39e5dafb91
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
2005-08-27 21:52:26 -05:00
paul@frost.snake.net
848853ea5b
mysqld.cc:
...
Reorder out-of-order status variables.
2005-08-27 21:04:58 -05:00
paul@frost.snake.net
458bc88563
mysqld.cc:
...
Reorder out-of-order status variables.
2005-08-27 19:18:53 -05:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0
Several fixes for Netware.
2005-08-24 22:03:34 +03:00
tomas@poseidon.ndb.mysql.com
1e1a5762d6
posr review fixes of prev patch
2005-08-22 13:36:55 +02:00
tomas@poseidon.ndb.mysql.com
6f27675dfc
generalized option for specifying ndb distribution
2005-08-22 11:41:37 +02:00
monty@mishka.local
1c1f26d5e2
Fixes during review of new pushed code
...
Fixed new bug when running a SP without a default database
2005-08-20 11:00:00 +03:00
patg@radha.local
7a43a0f54d
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1.clean
2005-08-19 23:44:40 +02:00
patg@radha.local
d0767dfad3
BUG #12498 Fixed mispelling
2005-08-19 07:51:22 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c6ee26ab45
Some minor fixes for Netware. These were required after we started building
...
against a later version of libc.
2005-08-18 21:26:25 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3bfa514655
Changes for Netware. This is needed when building against newer Libc
...
than we've used before.
2005-08-18 21:22:35 +03:00
jimw@mysql.com
a3eaf4eec2
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:37:45 -07:00
jimw@mysql.com
df25928983
Merge mysql.com:/home/jimw/my/mysql-4.1-11796
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 09:59:11 -07:00
monty@mysql.com
1a6f16edd9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-08-15 18:35:48 +03:00
serg@sergbook.mysql.com
d42f973b80
merged
2005-08-12 22:58:13 +02:00
serg@sergbook.mysql.com
f5ff607c14
BUG#12162 - one can start two transactions with the same XID.
...
Now we keep all active XID's in a hash
2005-08-12 21:15:01 +02:00
monty@mysql.com
4963388cc1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-08-12 13:57:20 +03:00
monty@mysql.com
4c0d23e156
Fixes during review of new pushed code
...
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
2005-08-12 13:54:42 +03:00
vtkachenko@quadxeon.mysql.com
fc22a36d78
set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h:
...
Added innodb_commit_concurrency variable
2005-08-11 18:03:01 +02:00
monty@mysql.com
7b80e62528
Cleanups during review of new code
2005-08-11 15:58:15 +03:00
jimw@mysql.com
d6a8330e39
Avoid problems on shutdown by shutting down replication slave threads
...
after normal connection threads. (Bug #11796 )
2005-08-08 18:05:27 -07:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
hf@deer.(none)
1311d4dc79
Merging
2005-08-04 16:27:53 +05:00
hf@deer.(none)
39ef54fd8e
Fix for bug #12177 (errorlog file isn't closed)
...
4.1 version of the patch
2005-08-04 15:23:21 +05:00
jimw@mysql.com
97797d91fb
Merge mysql.com:/home/jimw/my/mysql-5.0-7003
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:09 -07:00
bell@sanja.is.com.ua
4a0d64af89
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
2005-07-29 23:43:07 +03:00
jimw@mysql.com
4bef050cd4
Merge mysql.com:/home/jimw/my/mysql-5.0-10351
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-29 09:25:11 -07:00
jimw@mysql.com
90924fcb6a
Fix for handling of unsigned long options on 32-bit platforms that
...
allowed unintended overflows. (Bug #10351 )
2005-07-28 18:22:49 -07:00
bell@sanja.is.com.ua
b220fc47ef
store/restore sql_mode which was in force during ctrigger creation (BUG#5891)
...
other sql_mode fixes
2005-07-28 22:39:11 +03:00
jimw@mysql.com
2cb78727f6
Merge mysql.com:/home/jimw/my/mysql-5.0-10351
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-28 10:40:44 -07:00
hf@deer.(none)
faef3a442e
Merge deer.(none):/home/hf/work/mysql-4.1.11329
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-27 13:02:10 +05:00
hf@deer.(none)
a776edbed1
Fix for bug #11329 (lowercase_table.test fails)
2005-07-26 20:59:43 +05:00
jimw@mysql.com
72a6c71d08
Fix value returned from SELECT of unsigned long system
...
variables. (Bug #10351 )
2005-07-22 16:18:34 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
8f10662eab
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2005-07-23 00:15:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64
Faster alter table code for 5.1.
2005-07-22 23:43:59 +03:00
tulin@dl145b.mysql.com
bf6e3f9aa8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-20 07:53:10 +02:00
jimw@mysql.com
2a06e5756e
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:32 -07:00
jimw@mysql.com
63c6ece728
Cleanups after merge from 4.1.
2005-07-19 16:32:38 -07:00
tulin@dl145b.mysql.com
a6c21a0791
merge
2005-07-19 21:56:10 +02:00
konstantin@mysql.com
e3af1b6ec6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kostja/mysql/mysql-5.0-10760-new
2005-07-19 22:22:12 +04:00
konstantin@mysql.com
14344b658a
A fix and a test case for Bug#10760 and complementary cleanups.
...
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
2005-07-19 22:21:12 +04:00
jimw@mysql.com
80c1c6b33f
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 11:05:49 -07:00
dlenev@mysql.com
b141437ad3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-tn
2005-07-19 20:55:09 +04:00
monty@mishka.local
7e83d09ce7
Simple fixes during review of new code
2005-07-19 19:25:05 +03:00
dlenev@mysql.com
8a3e723b74
Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch)
...
"Triggers have the wrong namespace"
"Triggers: duplicate names allowed"
"Triggers: CREATE TRIGGER does not accept fully qualified names"
"SHOW TRIGGERS"
2005-07-19 20:06:49 +04:00