Commit graph

138 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
5dd970c335 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-03-17 15:06:06 +02:00
bar@bar.mysql.r18.ru
caf31a0790 Preparing to client<->server autoconvert 2003-03-17 13:14:04 +04:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
monty@narttu.mysql.fi
fae2711297 merge 2003-03-10 14:13:46 +02:00
monty@narttu.mysql.fi
f1635f64f9 Merge with 3.23 to get fixes for --user and BACKUP TABLE 2003-03-10 12:48:43 +02:00
monty@narttu.mysql.fi
c43b3af78c Don't allow BACKUP TABLE to overwrite files
Fixed memory leak when replication restarts in debug mode
2003-03-10 11:22:37 +02:00
monty@mashka.mysql.fi
987f4c4d8b Fixed AUTO_INCREMENT handling in MyISAM (last auto_increment patch broke things)
Some after merge fixes
2003-03-07 12:36:52 +02:00
serg@serg.mysql.com
be580475be fix auto-increment in sub-key and insert ... select 2003-03-02 01:48:57 +01:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
serg@serg.mysql.com
1ced5948f0 low-level error messages cleanup 2003-01-28 17:42:08 +01:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +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
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00
hf@deer.mysql.r18.ru
d8c700891e Merging&testing 2002-12-17 19:33:25 +04:00
monty@mashka.mysql.fi
43875f50cb Use delayed create index for LOAD DATA INFILE, INSERT ... SELECT and CREATE ... SELECT
(Accidently disabled by a recent push)
2002-12-16 17:28:53 +02:00
hf@deer.mysql.r18.ru
c1e69d2cca Merging 2002-12-16 18:58:55 +04:00
hf@deer.mysql.r18.ru
e3b3b68307 Big purge about embedded library (scrum) 2002-12-16 17:33:29 +04:00
monty@mashka.mysql.fi
9c509fcb52 Transactions in AUTOCOMMIT=0 mode didn't rotate binary log
Don't enable any bulk insert or record caching code if inserting less than MIN_ROWS_TO_USE_BULK_INSERT rows (100)
2002-12-14 12:45:31 +02:00
monty@mashka.mysql.fi
62dfd57475 Removed compiler warnings
Fixed wrong variable name for Windows
2002-12-12 21:01:32 +02: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
serg@serg.mysql.com
b42eff16cb bulk insert code optimized 2002-12-07 22:40:20 +01:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
monty@mashka.mysql.fi
adfad220f4 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-16 21:58:09 +02:00
monty@mashka.mysql.fi
1a96948e81 Small improvement to alloc_root
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
2002-11-16 20:19:10 +02:00
serg@serg.mysql.com
b4cc92a3d9 Merge serg.mysql.com:/usr/home/serg/Abk/mysql
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-11-14 22:42:19 +01:00
serg@serg.mysql.com
822d4bd037 better fix for OPTIMIZE bug 2002-11-14 22:39:46 +01:00
serg@serg.mysql.com
31fa2c5084 merged 2002-11-13 23:38:19 +01:00
serg@serg.mysql.com
8a088f2e3c optimize table corruption fixed, though more clean fix is desired.
Fix for another optimize bug is undone, as the new one handles both cases.
test added
2002-11-13 22:55:32 +01:00
serg@serg.mysql.com
7720348bd2 removed DBUG_ENTER/RETURN tags 2002-11-11 22:43:07 +01:00
serg@sergbook.mysql.com
cd6bf73f20 manually merged 2002-11-07 21:56:24 +01:00
hf@genie.(none)
25bd1e9a37 Merged by hands 2002-11-07 12:20:08 +04:00
monty@butch.
a2bdf9265f Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes. 2002-11-07 03:54:00 +02:00
bar@bar.mysql.r18.ru
86b633379c Some charset code clean-ups 2002-11-06 17:01:12 +04:00
serg@sergbook.mysql.com
6f963dad66 added DBUG_ENTER/RETURN tags, dbug_add_tags.pl bugfix 2002-11-05 16:06:11 +01:00
hf@genie.(none)
a6b0579fcd Some code improvements 2002-10-23 16:55:35 +05:00
serg@serg.mysql.com
43599856b2 make REPAIR killable 2002-10-22 00:25:36 +00:00
hf@genie.(none)
8a88791fb1 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
serg@serg.mysql.com
0b2f4dac0b ha_myisam::repair should not touch file->save_state (directly, that is) 2002-10-15 15:15:53 +00:00
serg@serg.mysql.com
e65536b147 --tmpdir=dir1:dir2:... support in myisamchk 2002-10-08 14:34:04 +00:00
hf@genie.(none)
55866b0615 Huge pull 2002-10-07 15:38:07 +05:00
hf@genie.(none)
71d0f48f1f Geometry field type implementation 2002-10-04 12:48:32 +05:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
ce4b584a85 Increased max possible max_allowed_packet to 1G
Small optimization to not do external locking of temporary MyISAM tables.
2002-09-19 17:49:41 +03:00
monty@mashka.mysql.fi
f638ee6df9 Added code to flush a bulk_insert index.
This fixes a bug when doing multi-row inserts on table with an auto_increment key that is not in the first key segment.
2002-09-18 21:04:49 +03:00
serg@serg.mysql.com
27390a8d81 LOCK+modify+OPTIMIZE bugfix 2002-08-31 23:18:08 +00:00
serg@serg.mysql.com
2e15d13fd8 LOCK+change+OPTIMIZE MyISAM bug 2002-08-31 20:42:41 +00: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