hf@deer.mysql.r18.ru
389680e04e
Conflicts resolving
2003-01-20 18:59:45 +04:00
monty@mashka.mysql.fi
76f146a175
Merge with 4.0.9
2003-01-18 03:13:37 +02:00
heikki@hundin.mysql.fi
9a2afb60c7
ha_innodb.cc:
...
Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST
2003-01-17 00:50:27 +02:00
heikki@hundin.mysql.fi
01573f0d95
ha_innodb.cc:
...
Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle
2003-01-16 08:06:43 +02:00
heikki@hundin.mysql.fi
0efc57eed6
ha_innodb.cc:
...
Make SHOW INNODB STATUS aware when we are estimating index range size etc.
2003-01-16 07:15:55 +02:00
heikki@hundin.mysql.fi
c228dfacdf
ha_innodb.cc:
...
Fix a typo
2003-01-16 01:07:08 +02:00
heikki@hundin.mysql.fi
d7cc9da9b6
ha_innodb.cc:
...
Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing
2003-01-16 00:44:27 +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
heikki@hundin.mysql.fi
63a656c55c
ha_innodb.cc:
...
Added some assertions to make sure index_init is only called with a properly prepared InnoDB table handle
2003-01-13 23:25:55 +02:00
heikki@hundin.mysql.fi
8e6a4c6201
ut0mem.c, row0sel.c, row0mysql.c, ut0mem.h, row0sel.h, row0mysql.h:
...
Test allocation of memory beforehand if we are trying to return a > 2 MB BLOB; normally InnoDB asserts if memory allocation fails
ha_innodb.cc:
Do not fetch all columns if change_active_index() is called during a query; a sum(a), max(a) query seemed to do that, doing unnecessary copying (the change actually made in the previous bk ci)
Free BLOB heap of handle when MySQL calls some ::extra()'s
2003-01-12 23:58:56 +02:00
heikki@hundin.mysql.fi
c314981049
trx0trx.c:
...
Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards
ha_innodb.cc:
Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error
2003-01-12 22:31:16 +02:00
heikki@hundin.mysql.fi
b1b47e93b1
buf0buf.c, buf0buf.ic, buf0buf.h:
...
Reduce memory usage of the buffer headers
Many files:
Merge InnoDB-4.1 with AWE support
2003-01-06 22:07:25 +02:00
monty@mashka.mysql.fi
07daf3169e
Merge with 4.0.8
2003-01-03 00:04:33 +02:00
monty@mashka.mysql.fi
89a842de3c
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
2003-01-02 14:41:31 +02:00
heikki@hundin.mysql.fi
80f5621e4c
ha_innodb.cc:
...
Fix bug: could not switch trx isolation back to REPEATABLE READ after switching it to some other level
2002-12-31 10:17:35 +02:00
monty@mashka.mysql.fi
3ca695ea0b
Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
...
Changed long packat handling to check for packets of length 0xffffff.
This does however break packet handling for older clients.
If you are using packets >= 16M then you need to upgrade client and server
after this patch.
2002-12-26 18:26:37 +02:00
monty@mashka.mysql.fi
f03bbd3fe2
Merge with 3.23:
...
Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE
2002-12-21 10:56:40 +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
bell@sanja.is.com.ua
3103bca9b2
merging
2002-12-11 19:53:57 +02:00
monty@mashka.mysql.fi
146814f2ea
Merge with 3.23
2002-12-11 13:32:31 +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
monty@mashka.mysql.fi
859b688476
Merge with 4.0.6
2002-12-05 19:38:42 +02:00
monty@mashka.mysql.fi
fc06433a69
Removed copying of parameters as this leads to memory leaks in embedded server.
...
Fixed 'not initialized' memory error.
2002-12-05 03:40:33 +02:00
heikki@hundin.mysql.fi
ded9245d98
ha_innodb.cc:
...
Make copies of all string-type start/up options in case C-sharp moves them around; remove the need to specify innodb_log_arch_dir in my.cnf, since it has no relevance anyway
2002-11-29 13:05:37 +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
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
heikki@hundin.mysql.fi
7e7027ae23
ha_innodb.cc:
...
Remove unintentionally pushed printf
2002-11-15 23:10:51 +02:00
heikki@hundin.mysql.fi
1079b93640
ha_innodb.cc:
...
Fix another bug introduced in 4.0.4 in AUTO_INCREMENT and deadlock or lock wait timeout
2002-11-15 22:59:16 +02:00
heikki@hundin.mysql.fi
be6e811f51
ha_innodb.cc:
...
Fix bug intoduced in 4.0.4 in REPLACE and AUTO_INCREMENT: if replace did an update, then auto-inc counter was left 1 too low
2002-11-15 18:46:23 +02:00
monty@mashka.mysql.fi
7a70332836
Portability fix when using -DBIG_TABLES
2002-11-14 12:21:36 +02:00
heikki@hundin.mysql.fi
648b50660b
ha_innodb.cc:
...
Try to skip over corrupt records in SELECT if innodb_force_recovery > 0; print more page hex dumps in CHECK TABLE
2002-11-09 18:34:52 +02:00
monty@butch.
890b39bb68
merge
2002-11-07 12:49:01 +02: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
heikki@hundin.mysql.fi
db1693101b
Many files:
...
Merge InnoDB-4.0.5b: minor improvements to foreign keys, more logical data dictionary lock
2002-11-06 00:41:27 +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
heikki@hundin.mysql.fi
23657e8c33
srv0start.h, srv0start.c, ha_innodb.cc:
...
Add check that sizeof(trx_t) is the same in ha_inndob.cc and InnoDB compilation modules
2002-10-31 12:03:34 +02:00
heikki@hundin.mysql.fi
f51bc42cf5
ha_innodb.cc:
...
Fix bug: mysqld-debug-max failed standard test because a safe mutex size was seen as 24 bytes in the body of ha_innodb.cc, but 64 bytes in read0read.c
2002-10-31 11:32:42 +02:00
heikki@hundin.mysql.fi
ab12784d5f
ha_innodb.cc:
...
Fix bug in MySQL-3.23 ORDER BY from a table with no PRIMARY KEY and where the user had added UNIQUE indexes with CREATE INDEX
2002-10-31 00:26:04 +02:00
heikki@hundin.mysql.fi
9153d88c6b
Many files:
...
Merge InnoDB-4.0.5: new isolation levels READ COMMITTED and READ UNCOMMITTED now supported, selective deadlock resolution
mysqld.cc:
Change MySQL default isolation level to REPEATABLE READ; note that InnoDB has always had that default, and BDB and MyISAM always run at SERIALIZABLE level anyway
2002-10-29 23:16:46 +02:00
bar@bar.mysql.r18.ru
95aef91521
BINARY charset is now used instead of binary_flag
2002-10-25 13:58:32 +05:00
monty@hundin.mysql.fi
3476dc8f9e
Merge hundin.mysql.fi:/my/mysql-4.0 into hundin.mysql.fi:/my/mysql-4.1
2002-10-16 19:31:22 +03:00
monty@hundin.mysql.fi
fbf6ab4465
merge with 4.0.5
2002-10-16 19:30:24 +03:00
monty@hundin.mysql.fi
a54df74af0
Fixes after last merge.
...
Ignore changed keyblocks when on does DELETE FROM table_name;
2002-10-16 19:05:10 +03:00
monty@hundin.mysql.fi
67d3cd643b
Merge with 3.23.54
2002-10-16 13:11:25 +03:00
monty@narttu.mysql.fi
3c7f6a9835
merge
2002-10-14 12:07:16 +03:00
bar@bar.mysql.r18.ru
50c391538a
my_sortcmp -> my_strnncoll
2002-10-09 16:33:35 +05:00