mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34488 commits 2784 branches 343 tags 1.6 GiB
Commit graph

951 commits

Author SHA1 Message Date
rburnett@bk-internal.mysql.com
da6e25d86d Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-18 17:24:29 +02:00
knielsen@mysql.com
a061c90d8a Merge mysql.com:/usr/local/mysql/tmp_merge 
into  mysql.com:/usr/local/mysql/merge-5.1
 2006-05-18 11:56:50 +02:00
konstantin@mysql.com
85c6883146 Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-05-15 00:51:12 +04:00
holyfoot@mysql.com
250e07b652 Merge bk@192.168.21.1:mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.14573
 2006-05-14 20:56:22 +05:00
acurtis@xiphis.org
4e2c63a7ba Merge bk-internal:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/acurtis/mysql-5.1-merge
 2006-05-12 17:40:58 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
640a4de065 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 15:44:15 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c85be97f50 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:22:31 -04:00
acurtis@xiphis.org
9ba0ac9579 manual merge bug#10952 2006-05-12 08:50:31 -07:00
holyfoot@deer.(none)
034508f6ca bug #14573 (Error on adding auto_increment on to a column with '0' values) 2006-05-12 18:02:42 +05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
56b97747de BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table. 2006-05-10 12:53:40 -04:00
acurtis@xiphis.org
7c9b4c2792 Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/p1-bug10952.1
 2006-05-09 13:34:31 -07:00
acurtis@xiphis.org
47e89f208a bug#10952 
"alter table from MyISAM to MERGE lost data without errors and warnings"
  Add new handlerton flag which prevent user from altering table storage
  engine to storage engines which would lose data. Both 'blackhole' and 
  'merge' are marked with the new flag.
  Tests included.
 2006-05-09 13:31:46 -07:00
dlenev@mysql.com
b9d49ee894 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg12472
 2006-05-09 16:48:23 +04:00
dlenev@mysql.com
589daad10f Fix for bugs#12472/#15137 'CREATE TABLE ... SELECT ... which explicitly 
or implicitly uses stored function gives "Table not locked" error'

CREATE TABLE ... SELECT ... statement which was explicitly or implicitly
(through view) using stored function gave "Table not locked" error.

The actual bug resides in the current locking scheme of CREATE TABLE SELECT
code, which first opens and locks tables of the SELECT statement itself,
and then, having SELECT tables locked, creates the .FRM, opens the .FRM and
acquires lock on it. This scheme opens a possibility for a deadlock, which
was present and ignored since version 3.23 or earlier. This scheme also
conflicts with the invariant of the prelocking algorithm -- no table can
be open and locked while there are tables locked in prelocked mode.

The patch makes an exception for this invariant when doing CREATE TABLE ...
SELECT, thus extending the possibility of a deadlock to the prelocked mode.
We can't supply a better fix in 5.0.
 2006-05-09 16:39:11 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
b8227de1bf BUG#19140: Create index caused crash 2006-05-08 21:41:10 -04:00
monty@mysql.com
8c7783c1e0 Don't use row level logging on optimize or repair table. 
(Fixes core dump in rpl_failed_optimize.test)
Ensure we end active transcations if we do an admin command (like optimize, repair etc)
 2006-05-05 20:08:40 +03:00
monty@mysql.com
3ddc1f9956 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-05-04 15:58:30 +03:00
monty@mysql.com
86b2be8d35 After merge fixes 
Remove compiler warnings
Fix some broken tests
Workaround for syncronization bug in NDB (Bug #16445)
 2006-05-04 06:28:24 +03:00
monty@mysql.com
8f6ed291a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-05-04 01:58:21 +03:00
holyfoot@mysql.com
2f7ac18f22 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-04 02:17:17 +05:00
pekka@mysql.com
ec42119233 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-05-03 23:17:16 +02:00
monty@mysql.com
d689f2fa70 Cleanups after review of WL#602 
Fixed warnings from test suite
Some fixes in mysql-test-run script to catch more warnings
 2006-05-03 19:40:52 +03:00
monty@mysql.com
343644dd5d Added support for key_block_size for key and table level (WL#602) 
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
 2006-05-03 15:59:17 +03:00
holyfoot@deer.(none)
81e625ac4a merging fix 2006-05-03 17:43:32 +05:00
holyfoot@mysql.com
7ee205f67a merging 2006-05-03 16:42:39 +05:00
holyfoot@mysql.com
9de68b8122 merging 2006-05-03 16:33:42 +05:00
holyfoot@mysql.com
0007484c26 Merge mysql.com:/home/hf/work/mysql-4.1.15225 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:51:19 +05:00
mikael@zim.(none)
fdb8043efe Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug19313
 2006-05-03 01:04:14 -07:00
ramil@mysql.com
b337e83db2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b7643
 2006-05-02 11:33:26 +05:00
cmiller@zippy.(none)
21bec19920 Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new
 2006-05-01 13:41:40 -04:00
cmiller@zippy.(none)
6af3f88f07 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
 2006-05-01 09:46:00 -04:00
elliot@mysql.com
604b5836bb BUG#19145: mysqld crashes if you set the default value of an enum field to NULL 
Now test for NULLness the pointers returned from objects created from the
default value. Pushing patch on behalf of cmiller.
 2006-04-28 12:15:29 -04:00
mikael@zim.(none)
5b3bf39987 BUG#19313: Crash after mysqld starts and stops immediately afterwards. 2006-04-25 14:33:54 -07:00
ingo@mysql.com
d49ecc49c8 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug18129
 2006-04-25 16:32:38 +02:00
ramil@mysql.com
815da9ccee Fix for bug #7643: ALTER TABLE fails for CSV, EXAMPLE, ARCHIVE engines 2006-04-25 15:27:28 +05:00
Magnus@hugo.
0f51bcc35d Fix windows compile problem 2006-04-22 13:29:05 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
33eccd0c1e WL 2826: Error handling of ALTER TABLE for partitioning 
Fixed merge issue
 2006-04-22 04:38:19 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6473c10445 WL 2826: Error handling of ALTER TABLE for partitioning 
Final review fixes
 2006-04-21 08:35:25 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14d75e5b9f WL 2826: Error handling of ALTER TABLE for partitioning 
Fixed up create_handler_files call
 2006-04-19 21:43:30 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
09e95da616 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-19 21:22:35 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c9085e5189 WL2826: Error handling of ALTER TABLE for partitioning 
Actual error reported in my_errno from my_delete
 2006-04-19 20:57:42 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dd257b22dc WL 2826: Error handling of ALTER TABLE for partitioning 
Various bug fixes (mostly mixed to and from in replace methods)
 2006-04-19 20:04:00 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
0a053c3d8c Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-wl2826 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-19 16:19:21 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
f78195049d WL 2826: Error handling of ALTER TABLE for partitioning 
Fixed a number of bugs
 2006-04-19 16:08:59 -04:00
bar@mysql.com
cedafc30e8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 09:50:17 +05:00
mikron@c-ae09e253.1238-1-64736c10.cust.bredbandsbolaget.se
eb60344d78 WL 2826: Error handling of ALTER TABLE for partitioning 
Use \0 to indicate frm-file
Add more comments
Add more #ifdef code missing previously
 2006-04-18 16:58:12 +02:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
8ae26a2868 WL 2826: Error handling of ALTER TABLE for partitioning 
After review changes
 2006-04-15 21:49:13 -04:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
ingo@mysql.com
56d414b057 Bug#18129 - Fast (online) add index leaves temporary table frm in case of errors 
ALTER TABLE temporarily creates a new table with a .frm
file and optionally other files. For fast ALTER TABLE
only the .frm file is created. If the operation succeeds,
The temporary files are renamed to their final target.

In case of an error, the temporary file was forgotten to
remove.

Manually tested. The test requires to look at files,
which I think cannot be done portably with the test suite.
The test file is attached to the bug report.
 2006-04-13 16:19:19 +02:00
holyfoot@deer.(none)
c2acfc5b7c bug #15860 (SPATIAL keys in INNODB) 2006-04-12 22:05:23 +05:00