Commit graph

220 commits

Author SHA1 Message Date
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
serg@serg.mylan
e8eda8129f ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
Field::val_str simplification, comment
2004-04-06 21:35:26 +02:00
dlenev@jabberwock.localdomain
f6bff2e6c6 WL#1266 "Separate auto-set logic from TIMESTAMP type."
Final version of patch.

Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
clauses for TIMESTAMP field definition.
Current implementation allows only one such field per table and
uses several unireg types for storing info about this properties of
field. It should be replaced with better implementation when new
.frm format is introduced.
2004-04-02 10:12:53 +04:00
monty@mysql.com
dc2f606fb8 Merge with 4.0 to get lastest bug fixes 2004-03-29 19:21:53 +03:00
vva@eagle.mysql.r18.ru
c81bf339c2 some cleanup of last patch for BUG #2342 2004-03-27 02:37:05 +04:00
vva@eagle.mysql.r18.ru
8a66c13b34 fixed bug #2342
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"
2004-03-27 02:29:31 +04:00
vva@eagle.mysql.r18.ru
23d30c397d fixed bug #2342
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"

1. added new status HA_ADMIN_REJECT and processing of it in mysql_admin_table
2. got ha_berkley::analyze to return HA_ADMIN_REJECT if there are any 
 transactions with the table..
2004-03-27 00:35:45 +04:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
monty@mysql.com
e27960a44e Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts
Abort if we can't allocate memory for table cache
Fix bug with multi-update-tables and BDB tables.
2004-03-12 01:10:22 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
0a27eef814 Cleanup ha_checktype() and redundant variables. 2004-03-02 10:08:50 +00:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
monty@mysql.com
c1dd070ba7 Some small portability fixes.
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)
2003-12-30 13:14:21 +02:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
serg@serg.mylan
9c4049ad12 Bitmap post-review fixes 2003-10-30 19:17:57 +01:00
pem@mysql.com
337238b78a Merging 4.1->5.0 2003-10-22 16:10:22 +02:00
serg@serg.mylan
f944fd4a65 merged 2003-10-21 11:58:43 +02:00
serg@serg.mylan
4aa99ff7b1 fixes for new key_map code 2003-10-16 21:21:48 +02:00
monty@mashka.mysql.fi
9ef2a83fbe Portability fixes for windows
After merge fixes
2003-10-15 22:40:36 +03:00
serg@serg.mylan
50d9b95b77 merged 2003-10-15 12:25:44 +02:00
monty@mashka.mysql.fi
461d1627b3 merge with 4.0 for more memory allocation variables. 2003-10-13 15:50:30 +03:00
monty@mashka.mysql.fi
c95d142f8f Add new user variables for tuning memory usage:
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
2003-10-11 22:00:24 +03:00
serg@serg.mylan
8cc3951c8f key_map with more that 64 bits width 2003-10-11 13:06:55 +02:00
hf@deer.(none)
73f2e739b2 Fix for #1430
there was an error about sendind prepared parameters to the server
2003-10-01 16:44:57 +05:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
hf@deer.(none)
a2dbfaefa3 SCRUM
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
2003-09-19 14:44:31 +05:00
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03:00
ram@mysql.r18.ru
5e6d8dd7fe Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column. 2003-09-02 21:09:28 +05:00
hf@genie.(none)
f8f0b70380 SCRUM
two KILL commands implementation (version 2)
2003-03-31 13:39:46 +05:00
bar@bar.mysql.r18.ru
caf31a0790 Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows)
Some changes to the prepared statement protocol to make it easier to use and faster.
2003-01-21 21:07:59 +02:00
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
hf@deer.mysql.r18.ru
c59bff7c96 SCRUM
embedded library trimming
2003-01-15 12:11:44 +04:00
monty@mashka.mysql.fi
803dff1002 Merge with 4.0.8 2003-01-06 02:04:52 +02:00
monty@mashka.mysql.fi
1f6ecc0cd3 Changed mysql-test to print warnings for not existing table to DROP TABLE
Cleaned up test; Removed wrong DROP TABLE commands and use standard table and database names.
changed store_warning() -> push_warning_print()
2003-01-06 01:48:59 +02:00
monty@mashka.mysql.fi
9ecf9645eb A lot of portability fixes.
Added rename table for BDB. This fixes a bug in ALTER TABLE with BDB tables.
2003-01-05 20:18:49 +02:00
ram@mysql.r18.ru
ca0defad77 patches from sleepycat.com have been applied (SCRUM)
ha_berkeley::rename_table() has been added (SCRUM)
2002-12-19 12:38:32 +04:00
hf@deer.mysql.r18.ru
d8c700891e Merging&testing 2002-12-17 19:33:25 +04:00
monty@mashka.mysql.fi
d3eb993a27 rename of net_pkg.cc to protocol.cc
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
2002-12-11 09:17:51 +02:00
ram@mysql.r18.ru
3dbba5a02b support for HA_READ_BEFORE_KEY and HA_READ_PREFIX_LAST_OR_PREV 2002-11-27 19:32:47 +04:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
monty@mashka.mysql.fi
7a70332836 Portability fix when using -DBIG_TABLES 2002-11-14 12:21:36 +02:00
ram@mysql.r18.ru
5e09392faa BDB 4.1.24 2002-10-30 15:57:05 +04: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
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
monty@mashka.mysql.fi
2aecdd1a91 Big code cleanup/review before 4.0.2 release.
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
2002-06-11 11:20:31 +03:00
bar@gw.udmsearch.izhnet.ru
c60a29f0ee Hash now supports several charsets 2002-03-14 21:44:42 +04:00
monty@hundin.mysql.fi
df5f8c18eb Move HA_EXTRA_NO_READCHECK to ha_open
Fixed bug in multi-table-delete
2002-01-16 23:02:26 +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
b658662ae4 Update copyright
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
2001-12-06 14:10:51 +02:00
monty@bitch.mysql.fi
d0ccff5090 New improved IO_CACHE 2001-11-28 02:55:52 +02:00
monty@hundin.mysql.fi
777fdb5d5c Fixes for embedded version. 2001-11-25 13:50:48 +02:00
monty@hundin.mysql.fi
8cd4c2358d Fix that mysqladmin shutdown can be interrupted with ^C
Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times
2001-11-03 15:18:09 +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@hundin.mysql.fi
008472f373 Fixed problem with "record not found" in BDB tables. 2001-09-14 17:59:05 +03:00
monty@hundin.mysql.fi
442c03f071 Fix bugs when using LOCK TABLES with BDB tables
Optimized remove of key when using internal cursor in BDB tables.
2001-09-08 20:45:53 +03:00
monty@hundin.mysql.fi
e24bdfa8bb More debug info
Fix DBUG_ASSERT()
Optimization for BDB tables
Fix for BDB under Win98
2001-09-08 11:47:34 +03:00
monty@tik.mysql.fi
e508ad16f8 Fix for LOCK TABLES and BDB tables 2001-09-08 01:02:41 +03:00
tim@white.box
2b6776d337 Add test case for update/replace bug in bdb.
Remove unused argument to ha_berkeley::remove_key().
2001-07-24 12:23:17 -04:00
tim@white.box
c61f04b005 ha_berkeley.cc Fix bug in remove_key(), when key != primary_key it would
ha_berkeley.cc	core dump if cursor was invalid.
2001-07-24 12:00:23 -04:00
monty@hundin.mysql.fi
de7d371900 Fixed problem with part keys and BDB tables 2001-07-18 11:31:18 +03:00
monty@hundin.mysql.fi
aecef7614e Removed wrong warning from thr_lock
Fixed problem with UPDATE and BDB tables
Fixed problem with GRANT FILE privilege on database level
mysqld --warnings works now
Fixed problem with SHOW OPEN TABLES when not using BDB
Added some tests for ALTER TABLE to the test scripts
2001-07-17 21:04:01 +03:00
monty@donna.mysql.fi
0f37b1244b Fixed portability problems in mysqlcheck 2001-04-21 03:03:08 +03:00
monty@donna.mysql.fi
a94ba10f8d Fix for BDB and LOCK TABLES 2001-04-19 20:41:19 +03:00
monty@donna.mysql.fi
add70fc1ba Changed pthread_mutex_init() to use new MY_MUTEX_INIT.. macro
(For glibc 2.2)
2001-03-26 01:05:04 +03: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
98c70da357 Fixed test cases for innobase
Fixed bug introduced with last ORDER BY optimization
Changed log position to longlong to avoid warnings.
2001-03-07 23:50:44 +02:00
monty@donna.mysql.fi
becf27e6db Removed duplicated index_init() calls that causes problems with BDB
tables.
Merged maxsql.spec with mysql.spec
2001-03-07 14:06:39 +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.fi
5ccbbd83f2 Fixes for innobase usage
Fixed bug when using TEXT columns with BDB tables
Allow LOAD DATA INFILE to use numbers with ENUM and SET columns
2001-03-03 03:03:12 +02:00
monty@donna.mysql.com
450d98e341 Changed --replace to --replace_result in mysqltest
Changed errmsg -> my_errmsg (portability issue)
Fixed that mysqlbinlog writes SET TIMESTAMP before all queries
Fixed comments in default my.cnf files
2001-02-15 03:43:14 +02:00
monty@donna.mysql.com
a7c5b9c211 Portability fixes for OPENBSD, OS2 and Windows 2001-01-27 01:20:56 +02:00
monty@donna.mysql.com
877386602a Added new mutex for hostname lookup
Added free of io_cache when using ALTER TABLE ... ORDER BY
2001-01-23 01:25:07 +02:00
monty@donna.mysql.com
0f28f7a414 keep bk happy 2001-01-22 04:46:32 +02:00
monty@donna.mysql.com
0732f7475e Fixed for bugs that was found when getting full code coverage of BDB
Fixed bug with HEAP tables on windows
Fixed bug with HAVING on empty tables
2001-01-17 03:15:20 +02:00
monty@donna.mysql.com
c1b5a5b00f Removed not used variable 'last_ref'
Fixed problem with negative DECIMAL() keys
Fixed some bugs with NULL keys in BDB
More mysql-test tests
2001-01-16 06:02:05 +02:00
monty@donna.mysql.com
12d0f179cd Fixes for mysqltest 2001-01-15 22:56:44 +02:00
monty@donna.mysql.com
94bc7ce8d7 Fixed that --open-files-limit works on Linux 2001-01-14 12:25:30 +02:00
monty@donna.mysql.com
6295e1b195 Added test for innobase
Fixed problem with NULL keys in BDB
2001-01-12 16:40:27 +02:00
monty@donna.mysql.com
9c80d5cb70 Patches for NetBSD/macppc
Fixed bug in LEFT JOIN
Added bdb_log_buffer_size
2001-01-12 13:52:32 +02:00
monty@donna.mysql.com
7541f7212c Fixed bug when opening BDB tables twice 2001-01-02 00:27:08 +02:00
monty@donna.mysql.com
4de5ac3327 Fixed new bug in BDB tables 2000-12-31 11:38:44 +02:00
tim@cane.mysql.fi
f0505c0902 Don't use subtransactions on write_row() and delete_row() in
ha_berkeley.
A few smaller bug fixes.
2000-12-28 19:26:32 +02:00
tim@cane.mysql.fi
a23a5d9860 Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
2000-12-28 04:34:44 +02:00
tim@cane.mysql.fi
be02015b13 Share DB *file; this fixes a deadlock problem.
While we're at it, share the keyfile and keytype arrays, too.
2000-12-28 04:25:31 +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
tim@cane.mysql.fi
384b371bd2 ha_berkeley.cc - Don't use subtransactions in update_row by default
ha_berkeley.cc	- Use the DB_RMW (read, modify, write) flag when removing a key
ha_berkeley.h	- Don't use subtransactions in update_row by default
sql_table.cc	- Don't use subtransactions in update_row by default
bdb.result	BitKeeper file /usr/home/tim/my/work/mysql-test/r/bdb.result
bdb.test	BitKeeper file /usr/home/tim/my/work/mysql-test/t/bdb.test
2000-12-26 17:16:49 +02:00
monty@donna.mysql.com
b590fa2567 New benchmark test
Fixed bug in REPLACE with BDB tables
Prepare for write lock on read for BDB
Inform the handler when we want to use IGNORE / REPLACE
New manual pages
2000-12-24 15:19:00 +02:00
monty@donna.mysql.com
155823ad51 Lots of new benchmark runs
Remember filename for temporary files created with mkstemp
Fixed wrongly allocated BDB share structure
Cleanups for SunPRO
2000-12-18 16:09:19 +02:00
monty@donna.mysql.com
5cce198b69 Fixed error when copying mysqld_multi
Fixes for mysql-test
Fixed race condition in SHOW LOGS
2000-12-16 23:41:45 +02:00
tim@cane.mysql.fi
a6d703b73a Fix berkeley_show_logs(). 2000-12-15 14:33:22 +02:00
tim@cane.mysql.fi
7bff1dd4db Add SHOW LOGS command. 2000-12-15 13:18:52 +02:00
monty@donna.mysql.com
10693572ed Fixed delete in tables with hidden primary key
Remove not used BDB logs on shutdown
Don't give warnings for repair on slaves
Fixed transaction log files
2000-12-12 04:34:56 +02:00
monty@donna.mysql.com
b4974dacb9 Removed init that crashed BDB
Fixed newly introduced bug in update
2000-12-11 02:31:09 +02:00
monty@donna.mysql.com
0efb424e48 Bugfix when using a multi-part unique key in the SET and WHERE part
Put PRIMARY KEY and UNIQUE keys before other keys
Fixes for auto_increment keys for BDB tables
2000-12-10 21:10:03 +02:00
monty@donna.mysql.com
7617d198a4 Lots of fixes for BDB tables
Change DROP TABLE to first drop the data, then the .frm file
2000-12-08 17:04:57 +02:00
monty@donna.mysql.com
330a30a88b Fix compilation bugs 2000-12-07 15:02:12 +02:00
monty@donna.mysql.com
87d9388e52 Only write full transactions to binary log
A lot of new functions for BDB tables
Fix for DROP DATABASE on windows
Default server_id variables
2000-12-07 14:08:48 +02:00
tim@threads.polyesthetic.msg
a9c031ed5e Generalize handle_flush thread to also handle various management
tasks for different handlers.  Add a callback from berkeley db to
delete log files that are no longer needed.
2000-11-27 18:14:49 -05:00
monty@donna.mysql.com
dc5e32ea40 Added connect_timeout and fix for transactions per statement 2000-11-27 02:28:41 +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
tim@work.mysql.com
6b4967e3e5 Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/d1/users/tim/src/mysql
2000-11-19 22:27:46 +01:00
monty@donna.mysql.com
7f2aff3de4 Fixed bug with text key compares in BDB 2000-11-17 14:38:53 +02:00
monty@narttu.mysql.fi
b689a1a752 merge 2000-11-16 00:24:11 +02:00
tim@work.mysql.com
c270064c6d ha_berkeley.cc fixed misleading comment
sql_parse.cc	typo when checking for autocommit
2000-11-15 08:34:18 +01:00
monty@tik.mysql.com
7a013339f8 Bug fixes, TRUNCATE, safer passwords on command line and connect timeout 2000-11-13 23:55:10 +02:00
tim@threads.polyesthetic.msg
96b8ab704f sql_parse.cc test for changing to auto_commit mode was backwards
ha_berkeley.cc	bug fixes to make OPT_BEGIN work properly
handler.cc	bug fixes to make OPT_BEGIN work properly
2000-11-07 00:53:02 -05: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
adeed9168d Added bdb_lock_max and fixed bug in BDB tables when using key parts 2000-10-25 01:50:46 +03:00
monty@donna.mysql.com
6633c2113a Fix for new berkeley DB interface 2000-10-24 03:55:04 +03:00
monty@donna.mysql.com
a67ff1bf08 Update of interface for BDB tables.
Fixed bug in SHOW CREATE TABLE
2000-10-24 02:39:54 +03:00
monty@donna.mysql.com
117d8b7f64 Automatic repair of MyISAM tables + small bug fixes 2000-10-17 00:47:15 +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
9323e733ff Changed meaning of HA_EXTRA_RESET and start of hidden primary keys for BDB tables 2000-10-15 18:45:53 +03:00
monty@donna.mysql.com
02fd65b970 Fixed indention, removed compiler varnings and fixed a bug
in FULLTEXT indexes.
2000-09-29 00:58:16 +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
monty@donna.mysql.com
be5e4e72b6 Small bug fixes 2000-09-07 04:55:17 +03:00
monty@donna.mysql.com
f0952ce3e1 FLUSH TABLE table_list
Fixes for RENAME TABLE
Portability fixes
2000-08-22 00:18:32 +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