mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48460 commits 2793 branches 343 tags 1.7 GiB
Commit graph

48460 commits

This branch
This branch
All branches
Author SHA1 Message Date
istruewing@chilla.local
410e4400c4 Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-21 03:12:35 +02:00
istruewing@chilla.local
d9bd5f2364 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-21 03:10:23 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
c1ca591f09 silence two 'unused variable' warnings 2007-07-20 14:01:37 -07:00
acurtis/antony@ltamd64.xiphis.org
3d7ce2ce9c Merge xiphis.org:/anubis/antony/work/mysql-5.1-engines 
into  xiphis.org:/anubis/antony/work/p1-bug29875.1
 2007-07-20 12:35:15 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
395233b4f7 Bug#29875 
"Disable transaction support in Federated storage engine"
  Minimal patch to disable Federated's transactions until they can be fixed.
 2007-07-20 11:35:19 -07:00
svoj@mysql.com/june.mysql.com
2edad3d4ba BUG#28838 - duplicate external_lock in mysql_alter_table 
Fixed wrong test case. Added lost row that appeared after fix for
this bug.
 2007-07-20 13:27:12 +05:00
svoj@june.mysql.com
bc1f8d49ba Merge mysql.com:/home/svoj/devel/mysql/BUG28838/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG28838/mysql-5.1-engines
 2007-07-20 11:08:31 +05:00
svoj@june.mysql.com
574079a17b Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG28838/mysql-5.0-engines
 2007-07-20 10:50:39 +05:00
tsmith@bk-internal.mysql.com
4223b12523 Merge bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.1-maint
 2007-07-19 17:44:35 +02:00
tsmith@bk-internal.mysql.com
b066c1208e Merge bk-internal.mysql.com:/data0/bk/mysql-4.1-maint 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint
 2007-07-19 17:43:34 +02:00
svoj@june.mysql.com
39f7a95589 Merge mysql.com:/home/svoj/devel/mysql/BUG26325/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG26325/mysql-5.1-engines
 2007-07-19 15:54:31 +05:00
svoj@mysql.com/june.mysql.com
5d4a134f8f BUG#26325 - TEMPORARY TABLE "corrupt" after first read, according 
to CHECK TABLE

CHECK/REPAIR TABLE reports "File not found" error when issued
against temporary table.

Fixed by disabling a brunch of code (in case it gets temporary table)
that is responsible for updating frm version as it is not needed
for temporary tables.
 2007-07-19 13:51:31 +05:00
tsmith@ramayana.hindu.god
27ef95237d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-07-18 15:32:22 -06:00
tsmith@ramayana.hindu.god
f4309e1777 ddl_i18n_utf8.test, ddl_i18n_koi8r.test: 
Don't run test with embedded server; requires external client connections
 2007-07-18 15:31:24 -06:00
istruewing@chilla.local
0f355a4696 Post-merge fixes 
Fixed debug code of new query cache implementation.
 2007-07-18 20:52:55 +02:00
cmiller@zippy.cornsilk.net
4463163c11 Re-set the plugin name so that we can be sure the plugin init() 
function doesn't set it to something else.
 2007-07-18 13:37:56 -04:00
cmiller@zippy.cornsilk.net
5d0b7dea04 Move the filling of the table_name column above the initialization, 
so that the init function has access to the name.
 2007-07-18 12:27:54 -04:00
svoj@mysql.com/june.mysql.com
17d5af9922 BUG#28838 - duplicate external_lock in mysql_alter_table 
Removed duplicate call to handler::external_lock() when
ALTER TABLE that doesn't need to copy a table (quick
ALTER TABLE) was executed.

Also quick ALTER TABLE doesn't hold LOCK_open anymore when
it enables/disables indexes.
 2007-07-18 15:39:13 +05:00
svoj@mysql.com/june.mysql.com
b94217491a BUG#29839 - lowercase_table3.test: Cannot find table test/T1 from 
the internal data dictiona
- re-enabled lowercase_table3 test;
- added a rule to throw away expected warning to mtr_report.pl;
- fixed a test case to produce unique warning.
 2007-07-18 13:55:50 +05:00
tsmith@ramayana.hindu.god
23695e4e1e Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-07-17 11:33:26 -06:00
tsmith@ramayana.hindu.god
e84e86c156 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-07-17 11:32:50 -06:00
tsmith@ramayana.hindu.god
91dc419715 Merge ramayana.hindu.god:/home/tsmith/m/bk/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-07-17 11:32:34 -06:00
kostja@bodhi.(none)
0d027edd6a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-17 13:32:19 +04:00
kostja@bodhi.(none)
19a19f81e8 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-17 13:13:49 +04:00
kostja@bodhi.(none)
6b3784870c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-17 13:10:02 +04:00
kostja@bodhi.(none)
948ba7b7fb Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-17 13:08:23 +04:00
svoj@june.mysql.com
cb995365fb Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/test/mysql-5.1-engines
 2007-07-17 13:20:32 +05:00
istruewing@chilla.local
db2884a530 Disabled a test case that reports an error on OSX. 2007-07-17 09:52:55 +02:00
tnurnberg@sin.intern.azundris.com
c01fe97165 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
 2007-07-17 09:39:44 +02:00
tnurnberg@sin.intern.azundris.com
8d7365a4b0 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
 2007-07-17 09:37:46 +02:00
istruewing@chilla.local
ba177535f5 Post-merge fixes 
Disabled test cases that produce errors in a "server log".
 2007-07-17 09:25:01 +02:00
tnurnberg@sin.intern.azundris.com
bc3b442998 Merge sin.intern.azundris.com:/home/tnurnberg/27198/50-27198 
into  sin.intern.azundris.com:/home/tnurnberg/27198/51-27198
 2007-07-17 08:23:43 +02:00
tnurnberg@sin.intern.azundris.com
261acdbbea Merge sin.intern.azundris.com:/home/tnurnberg/27198/41-27198 
into  sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
 2007-07-17 06:59:24 +02:00
dkatz@damien-katzs-computer.local
e5d23da4af Merge damien-katzs-computer.local:/Users/dkatz/mysql51 
into  damien-katzs-computer.local:/Users/dkatz/51
 2007-07-16 23:15:34 -04:00
kostja@bodhi.(none)
97bdd8030b Fix a build break on 64 bit (uint and size_t are distinct types). 2007-07-17 01:30:57 +04:00
istruewing@chilla.local
dd7e9b9a42 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-16 23:21:08 +02:00
istruewing@chilla.local
acd2c62fd1 Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-16 23:19:45 +02:00
kostja@bodhi.(none)
0e92e434d1 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-17 01:06:47 +04:00
kostja@bodhi.(none)
b8fc731804 Post-merge fixes (merge from the main). 2007-07-17 00:59:21 +04:00
tnurnberg@sin.intern.azundris.com
7dbf738f4a Merge sin.intern.azundris.com:/home/tnurnberg/27198/40-27198 
into  sin.intern.azundris.com:/home/tnurnberg/27198/41-27198
 2007-07-16 22:38:50 +02:00
kostja@bodhi.(none)
7989c712a6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-16 23:41:28 +04:00
kostja@bodhi.(none)
c8a651bb41 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-16 23:38:55 +04:00
kostja@bodhi.(none)
1ecb226efa Bug#29050 Creation of a legal stored procedure fails if a database is not 
selected prior: ensure the fix also works for information_schema
tables.
 2007-07-16 23:37:02 +04:00
kostja@bodhi.(none)
88fc7cab26 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-16 23:31:36 +04:00
dkatz@damien-katzs-computer.local
639fd4c555 Bug #29692 Single row inserts can incorrectly report a huge number of row insertions 
This bug was caused by unitialized value that was the result of a bad 5.0 merge.
 2007-07-16 14:53:05 -04:00
istruewing@chilla.local
62620ecb4e Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-16 20:39:05 +02:00
kostja@bodhi.(none)
06d656b808 Fix ndb_cache* test failures in the -runtime tree. 
Do not try to acquire structure_guard_mutex for the second time
when invalidating a table from send_result_to_client.
 2007-07-16 22:34:36 +04:00
istruewing@chilla.local
7f6bf17bab Post-merge fix 
Disabled a test that reports Slave SQL error in warnings file.
 2007-07-16 16:12:05 +02:00
kostja@bodhi.(none)
be4f73c44f Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-16 17:22:33 +04:00
kostja@bodhi.(none)
eec9f7c59d A follow up after the fix for Bug#21074 - fix NDB tests breaking on 
asserts.
The patch for Bug#21074 replaces acquisition of the global LOCK_open lock
with exclusive locks on table names in such operations ad DROP TABLE
and RENAME TABLE.
Unfortunately, NDB internally assumes that LOCK_open is acquired and
tries to release it.
This dependency should be fixed by a separate (and significant in size)
patch. For now we just satisfy it - after all, the original
goal of the patch for Bug#21074 was to move query_cache_invalidate
outside of the scope of LOCK_open, and we still can do that.

This fixes some failing NDB tests in the runtime tree.
 2007-07-16 15:57:20 +04:00