Commit graph

366 commits

Author SHA1 Message Date
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
c0f40d14cc Added support for hex strings to mysqlimport
A lot of new tests to mysqltest
Fixed bug with BDB tables and autocommit
2000-12-28 03:56:38 +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
988a98c393 Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql 2000-12-26 17:35:48 +02:00
monty@donna.mysql.com
a12c1ffb9a --safe-show-db and have_xxx variables 2000-12-26 17:34:04 +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
6ba7c07ce2 merge 2000-12-24 15:22:33 +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
tim@cane.mysql.fi
30e8de65b6 Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
2000-12-22 16:42:49 +02:00
tim@cane.mysql.fi
281a054f2a Fix replace bug w/ BDB tables by passing key_length to index_read_idx. 2000-12-22 16:19:54 +02:00
serg@serg.mysql.com
74d4eb53a0 sql_show.cc added RAID_* options to SHOW CREATE output 2000-12-22 12:25:49 +01:00
tim@cane.mysql.fi
7e3fd8ce79 Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
2000-12-21 12:00:09 +02:00
tim@cane.mysql.fi
9a29f1f7a5 Compatibility fix for BSDi.
BSDi uses size_t * for the optlen arg to getsockopt, while other Unixes
use socklen_t *.
2000-12-21 11:54:08 +02:00
sasha@mysql.sashanet.com
45d537d580 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-12-20 07:17:10 -07:00
sasha@mysql.sashanet.com
a3e3b04f2a fixed up rpl000014
undid bug in ENCRYPT() - will push this now
added a test case for ENCRYPT()
2000-12-20 07:15:49 -07:00
serg@serg.mysql.com
94b9b751f6 sql_select.cc Disables quick_select for JT_FT
filesort.cc	Temporary fix for FULLTEXT index removed
2000-12-20 12:51:00 +01:00
sasha@mysql.sashanet.com
e0f3ef911c Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-12-19 18:03:24 -07:00
sasha@mysql.sashanet.com
2c2c9c9fd5 sql/mysqld.cc
small fixes in backtrace code
2000-12-19 18:02:25 -07:00
sasha@mysql.sashanet.com
abd31b570e fixes for backtracing, still will not push, just a local commit 2000-12-19 07:56:24 -07:00
tim@cane.mysql.fi
27bb086348 Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
2000-12-18 23:52:57 +02:00
tim@cane.mysql.fi
1154dace3f Merge 2000-12-18 23:34:51 +02:00
monty@donna.mysql.com
11f7fd10f0 erge with 4.0 + updates for column types 2000-12-18 23:29:52 +02:00
tim@cane.mysql.fi
5fdf032769 Added SHOW OPEN TABLES. Thanks to Antony T Curtis <antony@abacus.co.uk>
for the code.
2000-12-18 23:22:20 +02:00
sasha@mysql.sashanet.com
eccd463bd2 fixed logging bug in generate_table()
added message on all segfaults, and numeric backtrace of Linux i386
introduced a bug into ENCRYPT() to test backtrace - will clean up
before push, but need this commit locally to pull on slave repositories
to do further testing
2000-12-18 11:09:45 -07: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
monty@donna.mysql.com
bed1668e23 Backed out the new LARGEFILE patch as it broked several things 2000-12-16 14:26:00 +02:00
monty@donna.mysql.com
f9dcc70932 configure fix to get Linux to work with new large file system detection 2000-12-16 04:35:17 +02:00
tim@cane.mysql.fi
574b2e932c Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
2000-12-15 18:01:57 +02:00
tim@cane.mysql.fi
b13b08fd21 Make mysqld_show_logs work without HAVE_BERKELEY_DB. 2000-12-15 18:01:17 +02:00
monty@donna.mysql.com
b58d92652b merge 2000-12-15 16:18:00 +02:00
monty@donna.mysql.com
3ea85078dc Fixed <=>
Added mysqltest for <=>
Removed use of TAB in output from mysql-test-run
2000-12-15 16:12:31 +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@tik.mysql.com
4a99b428ed Merge narttu:/my/mysql into tik.mysql.com:/home/my/mysql 2000-12-15 11:09:15 +02:00
monty@tik.mysql.com
b186b4f27a Fixed that LPAD() and RPAD() cuts arguments
New test for string functions
2000-12-15 10:58:17 +02:00
sasha@mysql.sashanet.com
d9d49dfa44 client/mysqltest.c
fixed bug that created empty result files in no-record mode
mysql-test/t/rpl000007.test
    testing non-replication of load data infile when the table is excluded from replication
mysql-test/t/rpl000016.test
    test purge master logs
sql/slave.cc
    fix memory leaks found by  purge master logs test
sql/sql_repl.cc
    fixed race condition and delete before close bug in reset_slave()

Overall comments - coverage testing is a very good thing!
2000-12-14 20:17:18 -07:00
sasha@mysql.sashanet.com
b63444de1b client/mysqltest.c
added system command
myisammrg/myrg_open.c
    fixed coredump when opening an empty union table
sql/sql_repl.cc
    fixed warnings, remove confusing comment, fixed coredump in
    change master to when master.info was corrupted

added new replication test case
2000-12-14 17:43:13 -07:00
sasha@mysql.sashanet.com
8b59d245ea sql_parse.cc we were using wrong strdup 2000-12-13 10:59:59 -07:00
sasha@mysql.sashanet.com
6b004aa730 fixed 2000-12-13 09:58:26 -07:00
serg@serg.mysql.com
36c7d4eb02 Merge 2000-12-12 13:30:07 +01:00
serg@serg.mysql.com
ef379c0dae ft0000001.test more tests added
ft0000002.test  several ft-indexes test
filesort.cc	DBUG_PRINT's added
2000-12-12 13:17:29 +01: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
sasha@mysql.sashanet.com
60dc7eabc9 log_event.h fixed load data infile replication for alpha 2000-12-11 14:22:48 -07:00
sasha@mysql.sashanet.com
3417aa25ad sql/sql_repl.cc
last fix in send_file() was wrong
2000-12-11 13:09:01 -07:00
sasha@mysql.sashanet.com
c8a915880b I hope I've fixed all the bugs by now, let's test it 2000-12-11 12:06:34 -07: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
1e56deab97 Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql 2000-12-10 21:12:12 +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
sasha@mysql.sashanet.com
3cf810222a fixed up leaks found by --exit-info=256
better error diagnostic in SLAVE START
2000-12-09 14:28:51 -07:00
sasha@mysql.sashanet.com
72fc1259a1 logs were not being called with exiting set to true on server exit 2000-12-08 21:01:36 -07:00
sasha@mysql.sashanet.com
2cd21162ca sql/mysqld.cc
fixed auto set of server id
sql/sql_repl.cc
    do not allow slave to replicate if master id was not supplied
sql/sql_repl.h
    fix for server_id
2000-12-08 12:50:57 -07:00
monty@donna.mysql.com
0dd9ec5a63 Merge 2000-12-08 18:39:37 +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
sasha@mysql.sashanet.com
17061d609f Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-12-08 07:11:45 -07:00
sasha@mysql.sashanet.com
6b7098cb20 fixed bug in load data infile replication
updated test suite to always test if slave obeys stop/start commands
2000-12-08 07:11:22 -07:00
serg@serg.mysql.com
486bf66f46 Merge 2000-12-08 14:00:48 +01:00
serg@serg.mysql.com
53df0e501a sql_base.cc merge+insert (v.3)
myrg_info.c	merge+insert (v.3)
myrg_extra.c	merge+insert (v.3)
ignore  	cleanup
2000-12-08 13:53:24 +01:00
sasha@mysql.sashanet.com
304b15f843 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-12-07 21:53:35 -07:00
sasha@mysql.sashanet.com
5a1b15b3be more cleanup of slave load data infile - trying to track down bug, 2000-12-07 21:51:29 -07:00
jani@prima.mysql.fi
c475a9885d Temporary fix for handling wild_one at end of string (key compression).
Full fix shall be in MySQL 4.1. (This is a hard one (!))
2000-12-08 00:34:16 +02:00
sasha@mysql.sashanet.com
3e4697c8b2 rpl000001 sporadic failure mystery solved - the table was being opened twice :-) 2000-12-07 11:40:22 -07:00
sasha@mysql.sashanet.com
7ccba68095 ok, here comes the push - prepare to resolve conflicts! And lets hope bk can gracefully handle all of my renames 2000-12-07 10:14:28 -07:00
serg@serg.mysql.com
24f75730c1 Merge 2000-12-07 15:13:01 +01:00
serg@serg.mysql.com
d22216bc6d myrg_rrnd.c merge+insert (alternate take)
myrg_info.c	merge+insert (alternate take)
myrg_extra.c	merge+insert (alternate take)
mymrgdef.h	merge+insert (alternate take)
sql_base.cc	open_table --> open_or_reset_table (needed for MERGE)
2000-12-07 14:48:05 +01:00
monty@donna.mysql.com
330a30a88b Fix compilation bugs 2000-12-07 15:02:12 +02:00
jani@prima.mysql.com
110a5f2d3a Merge 2000-12-07 14:26:29 +02:00
jani@prima.mysql.com
16a833a2a9 Bug fix, max_heap_table_size variable was not used. 2000-12-07 14:17:07 +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
monty@donna.mysql.com
3666dab516 Added innobase handler files + other updates for innobase 2000-12-06 01:54:17 +02:00
monty@narttu.mysql.fi
4d2076be87 Added innobase handler files
Change that handler gets file names in native format
2000-12-05 19:42:02 +02:00
monty@narttu.mysql.fi
402e8e5c78 Fix for core dump in DISTINCT 2000-12-05 16:14:52 +02:00
monty@donna.mysql.com
38fce965ea New error messages
Fix for creating read-only files on windows
Manual updates
2000-12-05 03:00:31 +02:00
monty@narttu.mysql.fi
d37bcf7b36 Merge 2000-12-03 12:56:27 +02:00
monty@donna.mysql.com
5883ec2cce Small manual changes + fix bug in range optimizer becasue of commented code 2000-12-03 12:45:00 +02:00
sasha@mysql.sashanet.com
e0100606ce Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-12-02 11:49:19 -07:00
sasha@mysql.sashanet.com
de445fe9f3 fix for SunPro CC 2000-12-02 11:41:16 -07:00
sasha@mysql.sashanet.com
07b36014fc added loops and other cool stuff to mysqltest
fixed slave to preserve temp tables on slave stop; slave start
added abort-slave-event-count option to mysqld to test the above
added a test case for temp tables with a contantly aborting slave
removed warning in sql_parse.cc
fixed thimble.cc to compile
2000-12-02 10:11:50 -07:00
serg@serg.mysql.com
6f9af8ee7f opt_range.cc bugfix (sel000033.test) 2000-11-30 15:19:22 +01:00
serg@serg.mysql.com
08f3c65152 sql_show.cc FULLEXT comment in SHOW KEYS 2000-11-29 21:25:22 +01:00
serg@serg.mysql.com
0c94c1dee5 Merge 2000-11-29 14:30:04 +01:00
serg@serg.mysql.com
d0162c3a9f item_func.cc bug with several fulltext indexes fixed 2000-11-29 13:21:02 +01:00
monty@donna.mysql.com
08a2c58ed1 Fixed bug in 'drop table'
Portability fixes
2000-11-29 05:09:28 +02:00
tim@threads.polyesthetic.msg
af297a21c3 mysql_priv.h manager_status is volatile
sql_manager.cc	manager_status is volatile
2000-11-28 15:59:46 -05:00
tim@threads.polyesthetic.msg
ea0a749132 Merge work.mysql.com:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work
2000-11-28 13:46:59 -05:00
serg@serg.mysql.com
b01622e362 Merge 2000-11-28 18:46:07 +01:00
serg@serg.mysql.com
0878cd5edd errmsg.txt translated
opt_range.h	bugs with const_tables and filesort fixed
opt_range.cc	bugs with const_tables and filesort fixed
item_func.cc	bugs with const_tables and filesort fixed
ha_myisam.h	bugs with const_tables and filesort fixed
ha_myisam.cc	bugs with const_tables and filesort fixed
ft_search.c	bugs with const_tables and filesort fixed
2000-11-28 18:11:18 +01:00
sasha@mysql.sashanet.com
25ae951289 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-11-27 23:10:49 -07:00
sasha@mysql.sashanet.com
87ef08f239 pointer casts -> int4store()
added error code to master failed connect message
2000-11-27 23:08:46 -07:00
tim@threads.polyesthetic.msg
b8dfb28e3c mysqld.cc minor formatting change 2000-11-27 21:52:09 -05:00
tim@threads.polyesthetic.msg
cfe4b99dcf Merged 2000-11-27 21:52:08 -05:00
monty@donna.mysql.com
74e7ffe987 New thr_alarm struct for better integration with OS2
Run bootstrap in separate thread
Fix bug in FLUSH TABLES table_name
2000-11-28 04:47:47 +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
sasha@mysql.sashanet.com
93c0180805 Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
2000-11-27 11:13:05 -07:00
monty@narttu.mysql.fi
ad2e43c7d6 merge 2000-11-27 02:44:41 +02:00
monty@donna.mysql.com
dc5e32ea40 Added connect_timeout and fix for transactions per statement 2000-11-27 02:28:41 +02:00
sasha@mysql.sashanet.com
f43e7910b5 yes, and a small change to log_event.h 2000-11-25 23:30:02 -07:00
sasha@mysql.sashanet.com
dd24015eac Fixed temp tables to work with replication. It will not work if you stop the slave
while slave thread has temp tables - not hard to fix though, but it is time to go to bed

added a new test case for temp table replication and Slave_open_temp_tables
status variable.

Misc fixes
2000-11-25 23:29:01 -07:00
sasha@mysql.sashanet.com
a9ef0b4bf1 slave master.info FILE -> IO_CACHE
send_file() is more stack-friendly - changed large static buffer to alloc_root()
fixed my_b_seek() to work with WRITE_CACHE
test case to make sure the slave starts correctly after being stopped
truncated words file so the replication tests will take less time
2000-11-24 19:49:13 -07:00