Commit graph

583 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
Sinisa@sinisa.nasamreza.org
77eb6e5063 Better fix for "Halloween" effect ... 2003-03-12 17:11:48 +02:00
heikki@hundin.mysql.fi
6ef0f4ad41 ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
2003-03-03 19:31:01 +02:00
bell@sanja.is.com.ua
3103bca9b2 merging 2002-12-11 19:53:57 +02:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
heikki@hundin.mysql.fi
4b73222d5a row0mysql.c, row0mysql.h, ha_innodb.cc, sql_table.cc, handler.h:
Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp
2002-11-19 16:27:26 +02:00
monty@mashka.mysql.fi
7a70332836 Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
bell@sanja.is.com.ua
4307363079 new innodb query cache behaviour (recommit because of problem with 4.1 repository pushing)
fixed bug in quqry cache dbd transaction processing
2002-11-03 10:15:14 +02:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@hundin.mysql.fi
2d66b2f519 Revert change to use ha_rows for number of rows as other code depend of this 2002-09-30 14:54:16 +03:00
monty@hundin.mysql.fi
3a9eb4f621 Fix some ORDER BY ... DESC problems with InnoDB 2002-09-27 08:23:51 +03:00
serg@build.mysql2.com
7a7a0ae842 COUNT(*) for merge can be longlong even if it's long for MyISAM 2002-09-26 17:52:52 +02:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
serg@serg.mysql.com
99a954f405 InnoDB support for HANDLER 2002-08-21 20:55:34 +00:00
monty@mashka.mysql.fi
dddc20d9d1 New SET syntax & system variables.
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
2002-07-23 18:31:22 +03:00
bar@gw.udmsearch.izhnet.ru
6f5f47855a Default table character set has been added:
CREATE TABLE a (field,...) TYPE=type CHARSET=cset;
2002-06-19 21:21:30 +05:00
monty@hundin.mysql.fi
0d8e13979d Made keyread (key scanning) a key specific attribute.
This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem.
2002-06-19 00:22:30 +03:00
monty@hundin.mysql.fi
6e54cc492c Extension of .frm file (not yet ready for push) 2002-06-02 21:22:20 +03:00
monty@tik.mysql.fi
056175a1ce Update for BTREE keys in HEAP tables
Split handler->option_flag() to handler->table_flags() and handler->index_flags()
2002-04-12 21:35:46 +03:00
monty@hundin.mysql.fi
727e507bca merge with 3.23.50 2002-03-27 01:56:10 +02:00
heikki@hundin.mysql.fi
1f142262a1 sql_show.cc, handler.h, handler.cc:
Add foreign key defs to SHOW CREATE TABLE
2002-03-21 18:05:46 +02:00
serg@serg.mysql.com
3f51fcf1f1 mi_check flags cleanup
CHECK/REPAIR syntax cleanup
REPAIR ... USE_FRM syntax
2002-03-13 17:20:17 +00:00
monty@hundin.mysql.fi
79796e989f Merge from 3.23.48 tree 2002-01-30 16:37:47 +02:00
monty@hundin.mysql.fi
c396824b2a Take into account that table scans may use indexes 2002-01-30 16:07:11 +02:00
monty@hundin.mysql.fi
4609e627a5 Increase max package length to 512M for mysql and mysqldump.
Faster 'read_first_row' (Fixes slow 'preparing' state)
Read constant tables earlier, which provides better optimzations when using tables with <=1 row.
This also fixes a complicated bug involving const tables.
2002-01-23 02:52:26 +02:00
heikki@donna.mysql.fi
d927ff75dc ha_innobase.cc, ha_innobase.h, handler.h, handler.cc, sql_class.h, log.cc:
Tell table handlers where a binlog segment for a trx ends
2002-01-22 22:57:56 +02:00
monty@tik.mysql.fi
7dd4eb71fe Added support of null keys in HEAP tables
Added ORDER BY optimization
2002-01-12 15:42:54 +02:00
monty@hundin.mysql.fi
4b877e0088 Added macros for nice TIMESPEC usage.
Fixes for building MySQL with gcc 3.0
Added SIGNED / UNSIGNED casts
Fixed core dump bug in net_clear() with libmysqld.
Back to using semaphores in query cache.
Added 'Null' and 'Index_type' to SHOW INDEX.
2002-01-02 21:29:41 +02:00
serg@serg.mysql.com
b83bf332d0 HANDLER works only with MyISAM tables
HA_NO_FULLTEXT_KEY property -> HA_CAN_FULLTEXT
2001-12-21 13:28:51 +00:00
monty@hundin.mysql.fi
4b513347c4 Better optimization for InnoDB and BDB tables for ORDER BY 2001-11-29 15:34:37 +02:00
monty@hundin.mysql.fi
777fdb5d5c Fixes for embedded version. 2001-11-25 13:50:48 +02:00
monty@hundin.mysql.fi
4c60b41954 Portability fix
Cleanup typos (like SKIPP -> SKIP)
2001-11-07 00:13:29 +02:00
serg@serg.mysql.com
38bd84b7f9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-10-12 17:47:13 +02:00
monty@work.mysql.com
38a4648ad8 merge 2001-10-11 03:43:47 +02:00
heikki@donna.mysql.fi
1d7747aa25 ut0mem.c Merge changes in InnoDB-3.23.43b
ut0ut.c 	Merge changes in InnoDB-3.23.43b
trx0purge.c	Merge changes in InnoDB-3.23.43b
trx0rec.c	Merge changes in InnoDB-3.23.43b
trx0trx.c	Merge changes in InnoDB-3.23.43b
trx0undo.c	Merge changes in InnoDB-3.23.43b
thr0loc.c	Merge changes in InnoDB-3.23.43b
sync0arr.c	Merge changes in InnoDB-3.23.43b
sync0rw.c	Merge changes in InnoDB-3.23.43b
sync0sync.c	Merge changes in InnoDB-3.23.43b
srv0srv.c	Merge changes in InnoDB-3.23.43b
srv0start.c	Merge changes in InnoDB-3.23.43b
row0ins.c	Merge changes in InnoDB-3.23.43b
row0mysql.c	Merge changes in InnoDB-3.23.43b
row0purge.c	Merge changes in InnoDB-3.23.43b
row0sel.c	Merge changes in InnoDB-3.23.43b
row0umod.c	Merge changes in InnoDB-3.23.43b
row0upd.c	Merge changes in InnoDB-3.23.43b
row0vers.c	Merge changes in InnoDB-3.23.43b
rem0cmp.c	Merge changes in InnoDB-3.23.43b
que0que.c	Merge changes in InnoDB-3.23.43b
pars0opt.c	Merge changes in InnoDB-3.23.43b
pars0pars.c	Merge changes in InnoDB-3.23.43b
lexyy.c 	Merge changes in InnoDB-3.23.43b
pars0grm.c	Merge changes in InnoDB-3.23.43b
page0page.c	Merge changes in InnoDB-3.23.43b
os0file.c	Merge changes in InnoDB-3.23.43b
mtr0log.c	Merge changes in InnoDB-3.23.43b
mem0pool.c	Merge changes in InnoDB-3.23.43b
log0log.c	Merge changes in InnoDB-3.23.43b
log0recv.c	Merge changes in InnoDB-3.23.43b
lock0lock.c	Merge changes in InnoDB-3.23.43b
ibuf0ibuf.c	Merge changes in InnoDB-3.23.43b
fil0fil.c	Merge changes in InnoDB-3.23.43b
dict0crea.c	Merge changes in InnoDB-3.23.43b
dict0dict.c	Merge changes in InnoDB-3.23.43b
dict0load.c	Merge changes in InnoDB-3.23.43b
dict0mem.c	Merge changes in InnoDB-3.23.43b
data0data.c	Merge changes in InnoDB-3.23.43b
data0type.c	Merge changes in InnoDB-3.23.43b
buf0buf.c	Merge changes in InnoDB-3.23.43b
buf0lru.c	Merge changes in InnoDB-3.23.43b
btr0btr.c	Merge changes in InnoDB-3.23.43b
btr0cur.c	Merge changes in InnoDB-3.23.43b
btr0pcur.c	Merge changes in InnoDB-3.23.43b
btr0sea.c	Merge changes in InnoDB-3.23.43b
data0type.ic	Merge changes in InnoDB-3.23.43b
dict0dict.ic	Merge changes in InnoDB-3.23.43b
mtr0mtr.ic	Merge changes in InnoDB-3.23.43b
row0upd.ic	Merge changes in InnoDB-3.23.43b
sync0ipm.ic	Merge changes in InnoDB-3.23.43b
sync0rw.ic	Merge changes in InnoDB-3.23.43b
sync0sync.ic	Merge changes in InnoDB-3.23.43b
trx0rseg.ic	Merge changes in InnoDB-3.23.43b
btr0pcur.ic	Merge changes in InnoDB-3.23.43b
buf0buf.ic	Merge changes in InnoDB-3.23.43b
data0data.ic	Merge changes in InnoDB-3.23.43b
row0upd.h	Merge changes in InnoDB-3.23.43b
srv0srv.h	Merge changes in InnoDB-3.23.43b
sync0arr.h	Merge changes in InnoDB-3.23.43b
sync0rw.h	Merge changes in InnoDB-3.23.43b
sync0sync.h	Merge changes in InnoDB-3.23.43b
trx0trx.h	Merge changes in InnoDB-3.23.43b
ut0mem.h	Merge changes in InnoDB-3.23.43b
data0data.h	Merge changes in InnoDB-3.23.43b
data0type.h	Merge changes in InnoDB-3.23.43b
db0err.h	Merge changes in InnoDB-3.23.43b
dict0crea.h	Merge changes in InnoDB-3.23.43b
dict0dict.h	Merge changes in InnoDB-3.23.43b
dict0load.h	Merge changes in InnoDB-3.23.43b
dict0mem.h	Merge changes in InnoDB-3.23.43b
dict0types.h	Merge changes in InnoDB-3.23.43b
fil0fil.h	Merge changes in InnoDB-3.23.43b
ibuf0ibuf.h	Merge changes in InnoDB-3.23.43b
lock0lock.h	Merge changes in InnoDB-3.23.43b
log0log.h	Merge changes in InnoDB-3.23.43b
mtr0mtr.h	Merge changes in InnoDB-3.23.43b
rem0cmp.h	Merge changes in InnoDB-3.23.43b
row0ins.h	Merge changes in InnoDB-3.23.43b
row0mysql.h	Merge changes in InnoDB-3.23.43b
btr0cur.h	Merge changes in InnoDB-3.23.43b
btr0pcur.h	Merge changes in InnoDB-3.23.43b
btr0sea.h	Merge changes in InnoDB-3.23.43b
buf0buf.h	Merge changes in InnoDB-3.23.43b
sql_table.cc	Merge changes in InnoDB-3.23.43b
sql_db.cc	Merge changes in InnoDB-3.23.43b
ha_innobase.cc	Merge changes in InnoDB-3.23.43b
handler.cc	Merge changes in InnoDB-3.23.43b
ha_innobase.h	Merge changes in InnoDB-3.23.43b
handler.h	Merge changes in InnoDB-3.23.43b
2001-10-10 22:47:08 +03:00
serg@serg.mysql.com
069d313fd9 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-10-10 18:22:14 +02:00
monty@hundin.mysql.fi
06e719b7cc Remved Gemini code. 2001-10-10 02:50:28 +03:00
serg@serg.mysql.com
3911c81024 merged 2001-10-09 16:01:06 +02:00
serg@serg.mysql.com
3d3ef6528a Boolean search passes _some_ tests 2001-10-09 14:53:54 +02:00
monty@hundin.mysql.fi
2350609bce Fixed that SHOW CREATE TABLE shows all attributes 2001-09-30 05:47:35 +03:00
serg@serg.mysql.com
5a9a3e91e7 get rid of ft_search. Now there're two sets of ft_ functions, ft_nlq_* and ft_boolean_* 2001-09-25 20:31:02 +02:00
monty@hundin.mysql.fi
e390a99573 Added support of INSERT to MERGE tables
Fixes for embedded libary and openssl
2001-09-22 17:40:57 +03:00
monty@work.mysql.com
eb9cbe2cba merge 2001-09-17 23:26:00 +02:00
monty@hundin.mysql.fi
56cc14ab4c Added unique error for DEADLOCK
Include missing man pages into binary distribution
2001-09-17 23:43:53 +03:00
monty@work.mysql.com
18474d8419 Merge with 3.23.42 2001-09-13 09:52:35 +02:00
monty@hundin.mysql.fi
7a19987805 OS2 patch 2001-09-12 23:53:31 +03:00
monty@hundin.mysql.fi
381093b322 merge 2001-09-02 19:58:08 +03:00
monty@work.mysql.com
447c18954e merge with 3.23.42 2001-09-02 18:38:33 +02:00
monty@hundin.mysql.fi
04ec0de7d0 Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
Fix that DROP DATABASE works with all table types
Use BULK_INSERT when inserting more than one row
Better TRUNCATE TABLE
2001-09-02 13:47:00 +03:00
monty@hundin.mysql.fi
063a1a6557 Portability fixes.
Patches required by Gemini
Fix to properly detect if there is an active transaction in InnoDB
Fix to not lock thread structure when doing automatic rollback when thread ends
Allow -O lower_case_names=0 on UNIX
2001-08-21 20:06:00 +03:00
monty@hundin.mysql.fi
866a82782c Added support for symlinked tables.
myisamchk: Don't force a repair if the only problem was that the
open count wasn't correct.
Added missing error messages.
2001-06-01 04:27:59 +03:00
mikef@nslinux.bedford.progress.com
ceac5f9227 Pushing all the Gemini changes above the table handler. 2001-05-29 09:29:08 -04:00
monty@donna.mysql.fi
965cd30f87 Applied patches for BDB tables
Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB
2001-05-09 23:02:36 +03:00
monty@donna.mysql.fi
a94ba10f8d Fix for BDB and LOCK TABLES 2001-04-19 20:41:19 +03:00
mikef@nslinux.bedford.progress.com
d145a6b97e Add support for Gemini table handler, Monty has checked and approved
Fix bug when read return error
2001-03-21 15:34:16 -05:00
monty@tik.mysql.fi
6f9a73a1ba Added isolation levels
Added SELECT .. FOR UPDATE and SELECT .. IN SHARE MODE
2001-03-21 01:02:22 +02:00
monty@donna.mysql.fi
26a8c8b823 Optimization of delete with record cache (for MyISAM tables)
Added missing files for innobase to the distribution
2001-03-11 23:09:09 +02:00
monty@donna.mysql.fi
c1402e2d5c Fixed bug in MAX() optimizing for BDB tables 2001-03-10 17:05:10 +02:00
monty@donna.mysql.fi
bda3e09935 Merged some functions and removed some unused client functions.
Remember UNION for ALTER TABLE
Added test for if we are supporting transactions.
Don't allow REPLACE to replace a row when we have generated an auto_increment key
Fixed bug when using BLOB keys
Fixed bug in SET @variable=user.
2001-03-06 15:24:08 +02:00
monty@donna.mysql.com
c533308a15 Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
monty@donna.mysql.com
361067e915 Extended mysqltest with --commands and 'require'
Fixed test results.
Added mysqld variable 'have_isam'
2000-12-27 03:31:06 +02:00
monty@donna.mysql.com
3666dab516 Added innobase handler files + other updates for innobase 2000-12-06 01:54:17 +02:00
monty@donna.mysql.com
81bc313e99 All statements are now run in a sub transaction
Give warning if we are using non transactional tables and do ROLLBACK
Porting of crash-me and benchmarks to FrontBase
2000-11-24 01:51:18 +02:00
monty@narttu.mysql.fi
b689a1a752 merge 2000-11-16 00:24:11 +02:00
serg@serg.mysql.com
ff8df2c42b Ill-minded FULLTEXT impilict initialization hack removed.
From now on FULLTEXT search is initialized expilictly in mysql_select()
2000-11-02 17:36:21 +01:00
monty@tik.mysql.com
99f5d9bb68 Fixed bug with ORDER BY on BDB tables.
New benchmarks tests
2000-10-26 19:54:03 +03:00
monty@donna.mysql.com
b5ad31dffe Give an error if you use a BLOB(X) where X > 255
Fixes for MIT pthreads
2000-10-22 01:19:05 +03:00
monty@donna.mysql.com
2fedd7bae7 Bug fixes + defines for INNOBASE 2000-10-20 17:39:23 +03:00
monty@donna.mysql.com
4229796946 Automatic primary key for BDB tables 2000-10-16 02:29:48 +03:00
monty@tik.mysql.com
09dce662e2 Automatic repair of MyISAM tables + portability fixes 2000-10-11 00:06:37 +03:00
monty@tramp.mysql.fi
9f7c4563f7 First part of automatic repair of MyISAM tables.
Error on full disk on repair.
SIGHUP signal handling.
Update with keys on timestamp
Portability fixes
2000-10-03 14:18:03 +03:00
monty@tramp.mysql.fi
e32799e4dd RIGHT JOIN, part of automatic repair of MyISAM tables, backup on repair,
reading from FIFO, fixes for FULLTEXT, @@IDENTITY
2000-09-26 00:33:25 +03:00
sasha@mysql.sashanet.com
44bc3f9b0e merge of conflicts 2000-09-15 11:00:35 -06:00
sasha@mysql.sashanet.com
0a087649ec Added a comment about handler::restore() 2000-09-15 10:53:51 -06:00
sasha@mysql.sashanet.com
44455063e5 BACKUP TABLE TO 'directory'
RESTORE TABLE FROM 'directory'
log on slave when it connects to the master
2000-09-14 16:34:50 -06:00
monty@donna.mysql.com
b581f17be2 Fixes for MERGE TABLES and HEAP tables 2000-09-14 02:39:07 +03:00
monty@donna.mysql.com
2776500c22 Update to new root alloc, OPTIMIZE TABLE and some other changes 2000-09-12 03:02:33 +03:00
monty@donna.mysql.com
066d55c0c0 Bug fixes for 3.23.23 2000-08-29 12:31:01 +03:00
serg@infomag.ape.relarn.ru
b231fdefca Merge 2000-08-17 19:43:38 +04:00
serg@infomag.ape.relarn.ru
2006b4c551 Many MATCH'es per query now allowed (i.e. AND's and OR's now work, but
slow - full table scan); ORDER BY now works with MATCH (slow, full table
scan)
2000-08-17 19:30:36 +04:00
monty@donna.mysql.com
c5842d42f6 Additions for CHECK table + update of benchmarks 2000-08-17 01:05:02 +03:00
monty@donna.mysql.com
ea013c2152 Fixed for Ia64 + delayed key creation + a lot of small bug fixes 2000-08-15 20:09:37 +03:00
bk@work.mysql.com
f4c589ff6c Import changeset 2000-07-31 21:29:14 +02:00