bell@sanja.is.com.ua
5ea922aab0
merging
2003-04-16 20:35:29 +03:00
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
heikki@hundin.mysql.fi
bd14136331
ha_innodb.cc:
...
Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
2003-03-13 23:09:25 +02:00
heikki@hundin.mysql.fi
404116fd1d
ha_innodb.cc:
...
Add comment that Guilhem should check master_log_name, pending etc are right if the master log gets rotated
2003-03-04 19:14:37 +02:00
heikki@hundin.mysql.fi
14749b89bb
ha_innodb.cc:
...
Remove (already commented out) code about storing the latest relay log pos info to InnoDB: we will probably use only the master log pos info when we restart a slave after a crash
2003-03-04 19:06:40 +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
monty@narttu.mysql.fi
0197fc78c9
Merge with 4.0
2003-02-27 03:49:26 +02:00
heikki@hundin.mysql.fi
18dbed8463
ha_innodb.cc:
...
Remove DEBUG_ASSERT if MySQL internally names a UNIQUE index as the PRIMARY KEY, but inside InnoDB there is no primary key for the table
2003-02-26 19:52:31 +02:00
heikki@hundin.mysql.fi
f407468649
ha_innodb.cc:
...
Add docs to store_lock()
2003-02-26 19:31:05 +02:00
heikki@hundin.mysql.fi
f749357a21
ha_innodb.cc:
...
InnoDB maps HA_READ_PREFIX_LAST_OR_PREV to PAGE_CUR_LE, but note that only complete-field prefixes of the kay value can be used as the search key
2003-02-18 20:36:16 +02:00
heikki@hundin.mysql.fi
ed6a85b422
ha_innodb.cc:
...
Add comment about how to modify InnoDB to deal with partial-field prefixes of key value in the future
2003-02-18 20:07:06 +02:00
heikki@hundin.mysql.fi
e690ea09f7
page0cur.c:
...
Prepare for 5.x where HA_READ_PREFIX_LAST may pass only a few first bytes of the last field in a key value
ha_innodb.cc:
In 4.0 always assume HA_READ_PREFIX_LAST passes a complete-field prefix of a key value; LIKE queries use a padding trick
2003-02-18 19:43:41 +02:00
bell@sanja.is.com.ua
1de8a5996f
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1
2003-02-18 16:28:31 +02:00
monty@mashka.mysql.fi
7388c5f161
merge
2003-02-08 01:12:58 +02:00
heikki@hundin.mysql.fi
7abed55936
ha_innodb.cc:
...
Clarify the meaning of HA_READ_PREFIX_LAST as a search flag. InnoDB assumed the meaning wrong.
2003-02-07 17:33:15 +02:00
monty@mashka.mysql.fi
b14b246d38
Merge with 4.0 to get fix for MIN/MAX
2003-02-07 16:38:37 +02:00
heikki@hundin.mysql.fi
bd8c8522dc
ha_innodb.cc:
...
Since MySQL uses HA_READ_PREFIX_LAST in a wrong place, we make InnoDB to convert it to a right search condition
2003-02-07 13:28:18 +02:00
heikki@hundin.mysql.fi
a2de9c66f5
ha_innodb.cc:
...
Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place
2003-02-05 01:24:59 +02:00
monty@mashka.mysql.fi
023d6dd39b
Merge with 4.0.11
2003-02-04 21:52:14 +02:00
serg@serg.mysql.com
45ed0a0841
Merge work:/home/bk/mysql-4.0
...
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-01-30 16:02:11 +01:00
heikki@hundin.mysql.fi
d2328365e0
ha_innodb.cc:
...
Cleanup of the previous bug fix: replace code is either SQLCOM_REPLACE or SQLCOM_REPLACE_SELECT
2003-01-29 02:19:00 +02:00
heikki@hundin.mysql.fi
2db574ea19
ha_innodb.cc:
...
Fix a bug REPLACE INTO t SELECT ... did not work if t has an auto-inc column
2003-01-29 00:31:56 +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
heikki@hundin.mysql.fi
d62ef3a0d9
ha_innodb.cc:
...
Temporary fix to make the new client/server protocol to work: fetch all columns in an index, even if not needed by the SELECT statement; Monty has to fix the parser to tell InnoDB what to fetch
2003-01-24 04:47:06 +02: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
7d20900c6d
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1
2003-01-21 09:46:07 +04:00
heikki@hundin.mysql.fi
ff4ef4c4e7
ha_innodb.cc:
...
Convert TL_READ_NO_INSERT to TL_READ to allow concurrent inserts to the table in INSERT INTO ... SELECT ... FROM table
2003-01-21 00:38:55 +02:00
heikki@hundin.mysql.fi
a4a95cb217
ha_innodb.cc:
...
Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1
2003-01-20 23:39:28 +02:00
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