Commit graph

3873 commits

Author SHA1 Message Date
hf@deer.mysql.r18.ru
6a83d37532 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor
2003-04-28 14:29:22 +05:00
hf@deer.mysql.r18.ru
d69b5c4d69 SCRUM
Protocol_cursor task
net_field_length definitions trimmed with Monty's suggestions
2003-04-28 14:25:29 +05:00
monty@mashka.mysql.fi
dea3a3a88e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-04-28 10:34:34 +03:00
monty@mashka.mysql.fi
51eed4b48c Fix for openssl on Solaris
Fix for grant bug with SELECT *
2003-04-28 10:32:56 +03:00
greg@mysql.com
eda4590086 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-04-27 21:16:20 -04:00
monty@mashka.mysql.fi
c137673711 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-04-27 22:12:38 +03:00
monty@mashka.mysql.fi
dd377bfba6 Fixed problem when comparing a key for a multi-byte-character set. (bug 152)
Use 0x.... as strings if 'new' mode. (bug 152)
Don't report -max on windows when InnoDB is enabled. (bug 332)
Reset current_linfo;  This could cause a hang when doing PURGE LOGS.
Fix for row numbers in EXPLAIN (bug 322)
 Fix that USE_FRM works for all table types (bug 97)
2003-04-27 22:12:08 +03:00
heikki@hundin.mysql.fi
a1861ddb22 trx0trx.h, trx0trx.c, ha_innodb.cc:
Remove code never actually used in IGNORE; InnoDB just rolls back the latest row insert or update on a duplicate key error and leaves it for MySQL to decide whether to ignore the error
2003-04-27 17:25:39 +03:00
monty@mashka.mysql.fi
8b20a878cc Merge with 3.23:
Set innobase_flush_log_at_trx_commit to 1 by default
Fix problem with timestamp on 64 bit systems
Reserve alarms for up to 10 slave threads
2003-04-26 21:10:13 +03:00
monty@mashka.mysql.fi
bf6cfd2948 Fix for -fbranch-probabilites (bug 268)
Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314)
Fix for new bison 1.875
max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211)
Don't show port in SHOW PROCESSLIST for system threads
Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275)
Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
using many joined tables (Bug 212)
2003-04-26 20:43:28 +03:00
monty@mashka.mysql.fi
f88097eee9 Fix possible memory overrun when reading broken character set files 2003-04-26 17:57:19 +03:00
Sinisa@sinisa.nasamreza.org
5d3df7610f merge fix 2003-04-26 16:44:42 +03:00
Sinisa@sinisa.nasamreza.org
6fd764a662 Post-merge fix. 2003-04-26 15:58:39 +03:00
igor@hundin.mysql.fi
ba5b57c642 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/igor/dev/mysql-4.0
2003-04-26 15:53:28 +03:00
bell@laptop.sanja.is.com.ua
ed1b48185a fixed incorrect number of affected rows in REPLACE...SELECT... (bug 130) 2003-04-26 15:53:27 +03:00
Sinisa@sinisa.nasamreza.org
5dc8dbea5f merge fix 2003-04-26 15:26:28 +03:00
Sinisa@sinisa.nasamreza.org
3ca1a152eb Making a better fix for double released pointers and safe
TMP_TABLE_PARAM.
This involved moving things around in include files.
All tests, including the ones with Valgrind passed.
2003-04-26 15:12:14 +03:00
igor@hundin.mysql.fi
b6534b667f filesort.cc, order_by.result:
Fixed bug 263
order_by.test:
  Fixed bug 263
2003-04-26 14:54:53 +03:00
serg@sergbook.mysql.com
4c749f6f3e Merge bk-internal:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-04-25 15:45:45 +04:00
guilhem@mysql.com
050d5b5487 forgot to commit this one in cset 1.1561 (replication) 2003-04-25 12:31:51 +02:00
greg@mysql.com
24968f1ee3 Changes from Novell for NetWare platform 2003-04-24 20:48:54 -04:00
heikki@hundin.mysql.fi
a4281f59ed ha_innodb.cc:
When FLUSH LOGS is called, flush InnoDB logs to disk also in the case innodb_flush_log_at_trx_commit=0
2003-04-24 23:24:11 +03:00
guilhem@mysql.com
66e97ba570 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-04-24 17:42:07 +02:00
igor@hundin.mysql.fi
517a287ec9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/igor/dev/mysql-4.1
2003-04-24 18:42:06 +03:00
vva@eagle.mysql.r18.ru
855a6b8274 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1
2003-04-24 11:42:05 -04:00
vva@eagle.mysql.r18.ru
0f33b2f0cb added '.' to end of compressed string 2003-04-24 11:37:55 -04:00
guilhem@mysql.com
b03ec0d7db Replication: new code to not modify in-memory log positions until the COMMIT
is executed, even if the transaction spans on >=2 relay logs (bug #53).
New variable relay_log_purge =0|1
New test to verify bug #53
2003-04-24 15:29:25 +02:00
heikki@hundin.mysql.fi
9a29732968 ha_innodb.h, ha_innodb.cc:
Make ANALYZE TABLE to update index cardinality and other statistics also for an InnoDB table; note that the estimates are based on 10 random dives, not on an exhaustive read of the table
2003-04-24 15:34:43 +03:00
igor@hundin.mysql.fi
80615fade2 Many files:
Added the MAX_LENGTH_FOR_SORT_DATA option
filesort.cc:
  Added the MAX_LENGTH_FOR_SORT_DATA option
2003-04-24 14:33:33 +03:00
monty@narttu.mysql.fi
c6333c5148 Fixed bug in SET SQL_BIG_SELECTS 2003-04-24 09:18:53 +03:00
serg@sergbook.mysql.com
294cc19667 Merge bk-internal:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-04-24 01:44:26 +04:00
monty@narttu.mysql.fi
b228f5ff10 merge 2003-04-24 00:36:48 +03:00
monty@narttu.mysql.fi
f6a43bd567 Fixes for valgrind
Added optimzation for clustered index
Fixed bug in UPDATE ... ORDER BY
Fixed handling of UPDATE ... LIMIT
2003-04-23 21:52:16 +03:00
Sinisa@sinisa.nasamreza.org
cde501853a improved bug fix 2003-04-23 21:44:24 +03:00
Sinisa@sinisa.nasamreza.org
9298d590ac properly back quoting db.table names in SHOW GRANTS 2003-04-23 20:42:07 +03:00
hf@deer.mysql.r18.ru
ca02714715 SCRUM
Protocol_cursor class and sql-common/ directory
2003-04-23 19:37:33 +05:00
bar@bar.mysql.r18.ru
d160904394 set_var.cc:
We don't need this code any more. It was used to initialize CONVERT structure in 4.0.
2003-04-23 18:38:54 +05:00
bar@bar.mysql.r18.ru
6d5f527afd Variable names have been renamed:
client_collation -> collation_client
  result_collation -> collation_results
  connection_collation -> collation_connection
2003-04-23 18:19:22 +05:00
gluh@gluh.mysql.r18.ru
e6fe7d1bed Task 761:'mysqlbinlog should not die when reading
unknown event'
2003-04-23 18:00:07 +05:00
Sinisa@sinisa.nasamreza.org
45080daf4a removing back tick support from the server in change_db() 2003-04-23 15:27:11 +03:00
serg@sergbook.mysql.com
1a2719ce53 Merge bk-internal:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-04-23 15:53:40 +04:00
serg@sergbook.mysql.com
fa456991fa bug 283: FULLTEXT index on a TEXT filed converted to a CHAR field doesn't work anymore 2003-04-23 15:44:39 +04:00
bell@sanja.is.com.ua
c4637293fd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1
2003-04-23 11:20:19 +03:00
bell@sanja.is.com.ua
a3d3937ac2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-23 10:37:13 +03:00
vva@eagle.mysql.r18.ru
2705a9e91f Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-22 19:51:24 -04:00
vva@eagle.mysql.r18.ru
56667e1eba Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-22 19:50:21 -04:00
vva@eagle.mysql.r18.ru
9588dc01e5 fix error message for for load data infile 2003-04-22 19:38:57 -04:00
monty@narttu.mysql.fi
f4e2112817 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-04-23 01:46:07 +03:00
vva@eagle.mysql.r18.ru
136e9943b6 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1
2003-04-22 18:46:06 -04:00
vva@eagle.mysql.r18.ru
11666b5281 small compress/uncompress modification after monty's review 2003-04-22 18:41:47 -04:00