8f6f7502d1
srv0start.c, srv0srv.c:
...
If UNIV_SYNC_DEBUG was switched on, the error monitor thread could reserve a mutex BEFORE the sync debug system was initialized, and that caused a sync debug assertion in startup: move the 2 sec. sleep to a safer place; note that this is only heuristics, and in theory it can assert still
2004-01-13 17:13:03 +02:00
81f10f9f07
item_strfunc.cc:
...
Unnesessary code was removed. Comment was added.
2004-01-13 17:27:21 +04:00
9a9faeb03b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2361
2004-01-13 17:27:13 +04:00
646d692510
a fix (bug #2361 : ALTER TABLE ... DROP PRIMARY KEY drops a non-primary key).
2004-01-13 16:18:37 +04:00
709a12ecb1
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-01-13 12:31:51 +01:00
90c6ecca93
BUG#2304 - HANDLER and tables in non-current db
2004-01-13 12:31:25 +01:00
d7f6ced155
Fixed Bug #2338 Trigonometric arithmetic problem
...
by fixing optimizer bug with help of 'volatile' keyword
2004-01-12 22:47:26 -04:00
0c91129a38
Minor Novell supplied changes for 4.1 (inside netware directory)
2004-01-13 01:10:21 -01:00
c6c2478f8c
row0sel.c:
...
Improve previous push: save 1000 bytes of thread stack in non-error cases
2004-01-13 04:10:20 +02:00
bd37416e09
row0sel.c:
...
If MySQL tries to do SELECT from an InnoDB table, but has set no table locks at all in ::external_lock(), print a descriptive error message and assert; some subquery bugs were of this type
2004-01-13 04:05:38 +02:00
bee338fefe
Checked and applied Novell-supplied patches inside the netware directory only.
2004-01-12 21:15:49 -01:00
4cbf1e5150
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2004-01-12 21:06:21 +01:00
0b16ef245f
Fix for BUG#2333 "ALTER DATABASE on inexistent database hangs the client":
...
mysql_alter_db() now returns -1 in case of error, so that mysql_execute_command()
calls send_error().
2004-01-12 21:05:41 +01:00
6fd6a9a747
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
2004-01-12 18:11:54 +01:00
f7d4410b57
checking 2nd level of FT index destroyed info->lastkey and CHECK TABLE erroneously treated table as corrupted
...
bug#2190
2004-01-12 17:43:39 +01:00
05237bd863
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-01-12 16:28:12 +02:00
e62b6365ce
opt_sum.cc:
...
A fix for a bug #3189 , pertaining to crashing MySQL server when a query with MIN / MAX on the BLOB column is to be optimised
2004-01-12 16:25:13 +02:00
042fe0bed4
charset.c:
...
Fixed: client crashed when there are no Index.xml file.
2004-01-12 14:31:04 +04:00
ecf8118cff
Detect unexpected return codes of mysqltest in mysql-test-run.
...
This way, a crash of mysqltest will be visible in the test logs
(output of mysql-test-run).
2004-01-11 18:15:19 +01:00
c0cb3afb06
A fix (bug #2335 : Inconsistancy with handling of Years and NOW() function).
...
The test might fail if one runs it at 23:59:59 Dec 31
2004-01-11 14:12:46 +04:00
ba029973fa
null.result, null.test:
...
Fix for a bug #2219 , regarding a bad cast to integer from NULL
item_func.h:
Fix for a bug #2219 , regarding a bad cast to integer from NULL
sql_parse.cc:
A fix for a bug #2207 , with mysql server haning on option setting
2004-01-09 22:28:29 +02:00
f784f54c9c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-01-09 12:40:09 +01:00
8178bd4ec8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2231
2004-01-09 11:15:14 +04:00
1bd4091470
row0mysql.c:
...
Fix typo
2004-01-08 18:56:21 +02:00
75df017276
An improvement of the fix for the bug #2231 : string column,
...
INDEX+LIKE, don't take the ESCAPE character. (ver. 2)
2004-01-08 12:24:36 +04:00
3348564447
Fix for 1224 (USER() CURRENT_USER() functions in embedded library)
...
Now we return user@host for USER() in embedded library
CURRENT_USER returns empty string if library compiled with
NO_EMBEDDED_ACCESS_CHECKS
2004-01-07 21:30:15 +04:00
18036f98ac
buf0lru.c:
...
Start InnoDB Monitor if 80 % of the buffer pool occupied by adaptive has or lock heaps; do not print the same warning more than 1 time
2004-01-07 18:15:17 +02:00
2e7a5d3e74
SCRUM
...
WL#1246 (Query cache in embedded library)
Some fixes after testing
2004-01-07 16:41:09 +04:00
d6545ace0a
SCRUM
...
WL#1246 (Query cache in embedded library)
Small fix - code removed that prevents using query cache in embedded library
2004-01-07 14:45:04 +04:00
73012f0db2
Merge
2004-01-07 12:54:28 +04:00
4c0ad9ccb6
trx0sys.c:
...
DO NOT MERGE TO 4.1: forgot to change this in the previous push
2004-01-06 20:06:07 +02:00
41d0719cc3
srv0start.c:
...
More instructions about a downgrade 4.1.1 -> 4.0.18
2004-01-06 20:03:06 +02:00
64fb0172e2
Merge heikki@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-01-06 19:52:24 +02:00
51c0fa2935
trx0sys.c:
...
DO NOT MERGE TO 4.1: charset changes can cause problems in a downgrade 4.1.1 -> 4.0.18
2004-01-06 19:50:50 +02:00
704284d4a1
mysqldump.c:
...
Fix for UNLOCK TABLES bug #2242
2004-01-06 19:23:30 +02:00
f97cc835d9
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-4.1.1676
2004-01-06 20:53:23 +04:00
d9f95fcbe0
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-01-06 14:02:24 +01:00
b6fcdcffed
Completion of fix for BUG#2121 "Inadequate message "check permissions on master.info"":
...
I had not corrected these languages.
As it has been discussed with the docs team, the new messages will be merged
to 4.1, and then will be translated in 4.1 (they will remain in English
in 4.0).
2004-01-06 14:01:49 +01:00
4fa54c1dca
trx0sys.c, srv0start.c, ibuf0ibuf.c, trx0sys.h, srv0srv.h:
...
DO NOT MERGE TO 4.1: add code for automatic downgrade 4.1.1 -> 4.0 if the user has not created multiple tablespaces yet
2004-01-06 13:40:14 +02:00
d358e52b8b
As far as we cut off derived table branch, we have to close JOINs (BUG#2141)
...
(test case is absend because it is multi-thread and very big)
2004-01-06 13:13:04 +02:00
fe6250488e
srv0start.c:
...
Add comment that the insert buffer format changed between 4.0 and 4.1.1, but the undo log format did not
2004-01-06 13:10:57 +02:00
5ec1adee44
Fixed Bug#2205.
2004-01-05 21:45:14 +02:00
501ae0bc52
allow UPDATE and DELETE stetements with tables derived from subquery if they are not updated (BUG#2117)
...
allow delete table by alias in multi-delete statement
2004-01-04 23:44:33 +02:00
e5fa5585f0
removed droping field->query_id for reinitialization tables for subquery.
...
(BUG#2089)
2004-01-03 00:12:07 +02:00
7bb74b6592
log0recv.h, log0recv.c:
...
Merge a log replay change required by ibbackup
2004-01-02 16:21:58 +02:00
1c74cd9bf5
row0purge.c:
...
Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure
2004-01-01 01:51:36 +02:00
39559d4817
#2244 User variables collation conflict is not detected
2003-12-31 19:01:03 +04:00
934f08c5d1
Fixed Bug#1472, mysql \h output out of order.
2003-12-30 17:58:39 +02:00
4a87597984
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-4.1.1676
2003-12-30 19:43:53 +04:00
e49c7ae45f
Fix for the bug #2231 : string column, INDEX+LIKE, don't take the ESCAPE character.
...
(acctually i don't like the fix, any suggestions?)
2003-12-30 19:23:38 +04:00
