brian@avenger.(none)
3cf8548cd1
Merge
2004-12-16 15:44:46 -08:00
gluh@gluh.mysql.r18.ru
6a4d28c096
Fix for bug#7211: information_schema: crash if bad view(after review)
2004-12-16 17:44:36 +03:00
gluh@gluh.mysql.r18.ru
4f9f136fb7
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n
2004-12-16 17:33:21 +03:00
gluh@gluh.mysql.r18.ru
6372efa7da
Fix for bug#7212: information_schema: "Can't find file" errors if storage engine gone(after review)
2004-12-16 16:31:36 +03:00
ingo@mysql.com
05d5360e7f
Enlarged group item key_length by a varstring length field.
...
Group item fields are implemented as varstrings nowadays.
Made init_connect.test robust against existing t1.
2004-12-16 11:41:52 +01:00
gluh@gluh.mysql.r18.ru
7a38322f3f
Fix bug#7222 information_schema: errors in "routines"
2004-12-14 14:55:28 +03:00
guilhem@mysql.com
ba77277952
flush_read_lock_kill-master.opt:
...
don't make non-debug builds fail the testsuite
2004-12-13 14:21:59 +01:00
monty@mysql.com
b4dc75c877
Fix test results that may change from run to run
...
Added comments (from code review on pull)
2004-12-12 19:54:26 +02:00
monty@mysql.com
3b14ba64fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-12 18:44:15 +02:00
gluh@gluh.mysql.r18.ru
2e912bbbe8
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
...
mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable
2004-12-10 12:07:11 +03:00
brian@avenger.(none)
c8137bbb80
A few simple fixes plus the added support of being able to repair the meta data file via REPAIR TABLE. More information is now provided in SHOW TABLE STATUS.
2004-12-09 01:48:07 -08:00
monty@mysql.com
31b640c7db
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-08 23:55:01 +02:00
monty@mysql.com
1316954b3f
Fixed that mysql-test-run --ps-protocol works with system_mysql_db_fix.test
2004-12-08 01:17:52 +02:00
jani@ua141d10.elisa.omakaista.fi
f96a9a7a4a
Added some tests for new varchar.
2004-12-07 21:17:00 +02:00
monty@mysql.com
563500994a
Update results for new varchar handling
...
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
2004-12-07 15:47:00 +02:00
monty@mysql.com
77207d19f2
Merge with new VARCHAR code
2004-12-06 19:18:35 +02:00
monty@mysql.com
75d0958dc3
After merge fixes
...
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
2004-12-06 17:15:54 +02:00
monty@mysql.com
0de4777187
Merge with 4.1
2004-12-06 11:38:56 +02:00
monty@mysql.com
67ce247965
Add support for up to VARCHAR (size up to 65535)
...
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
monty@mysql.com
86508ad969
Fix test results
2004-12-06 01:34:19 +02:00
bell@sanja.is.com.ua
1b07e3b2db
postreview fixes
2004-12-04 00:14:18 +02:00
bell@sanja.is.com.ua
a3ad1765a8
merge
2004-12-03 23:24:41 +02:00
bell@sanja.is.com.ua
b48ec20ac7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2004-12-03 22:40:11 +02:00
bell@sanja.is.com.ua
734ffb8452
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
2004-12-03 22:13:53 +02:00
jimw@mysql.com
5c29de39bd
Fix t/rpl_create_database.test: replace version in SHOW BINLOG RESULTS
2004-12-03 18:42:35 +01:00
jimw@mysql.com
48fc4cbc6b
Merge
2004-12-03 17:48:19 +01:00
mats@mysql.com
fe70f8c747
Merge mysql.com:/space/bkroot/mysql-4.1
...
into mysql.com:/space/bk/b6391-mysql-4.1
2004-12-03 12:15:31 +01:00
mats@mysql.com
2bbdf2403d
Bug#6391 (binlog-do-db rules ignored)
...
CREATE DATABASE statement used the current database instead of the
database created when checking conditions for replication.
CREATE/DROP/ALTER DATABASE statements are now replicated based on
the manipulated database.
2004-12-03 12:13:51 +01:00
jimw@mysql.com
4b8e96d5ca
Merge
2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae
Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
...
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682 )
(Original fix reimplemented after review by Serg and Guilhem.)
2004-12-03 00:05:11 +01:00
guilhem@mysql.com
f3b577f591
Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable
...
(especially in case of bug like BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever").
2004-12-02 23:02:38 +01:00
monty@mysql.com
55cc515c8f
merged on pull
2004-12-02 14:47:14 +02:00
hf@deer.(none)
c7ef44857f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-02 16:46:30 +04:00
monty@mysql.com
d1a666d59a
Cleanups during review stage
...
Added auto-correct of field length for enum/set tables for ALTER TABLE
This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE
2004-12-02 14:43:51 +02:00
hf@deer.(none)
71bfbbdcd0
Fixes to make mysql-test-run --embedded-server working
2004-12-02 16:08:17 +04:00
ram@gw.mysql.r18.ru
3b111a9b42
A fix (bug #6878 : Crash with engine=memory).
2004-12-02 15:06:15 +04:00
ram@gw.mysql.r18.ru
7ed2753300
A fix (bug #6878 : Crash with engine=memory).
2004-12-02 14:34:53 +04:00
ram@gw.mysql.r18.ru
c78eefbc95
Fixes (bug #6932 : 'revoke all privileges...' doesn't remove all proper columns from columns_priv
...
bug #6933 : error in the tests/grant.pl test).
2004-12-02 13:34:30 +04:00
bar@mysql.com
a09a603d83
Bug #6379 : ENUM values are incorrectly converted
...
- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
we don't know column charset yet, to
mysql_prepare_table(), where we do.
2004-12-02 12:48:43 +04:00
bar@mysql.com
a38160f370
Move common trailing space checks into an include file.
...
Check UCS2 trailing spaces.
2004-12-01 19:25:05 +04:00
joreland@mysql.com
f36b81cb35
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-01 12:53:09 +01:00
joreland@mysql.com
4ed3b34c2f
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-01 12:50:13 +01:00
joreland@mysql.com
0718f788d6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:15:25 +01:00
joreland@mysql.com
64d6563afa
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-12-01 10:13:55 +01:00
joreland@mysql.com
9acd3ea38d
testcase for bug#6871, ndb, replace with collations
2004-12-01 10:13:18 +01:00
bell@sanja.is.com.ua
4c017d18e2
Merge
2004-12-01 10:25:11 +02:00
mwagner@mysql.com
2e0d1b3f9c
openssl_1.result, have_openssl_1.require, openssl_1.test:
...
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
2004-12-01 02:35:02 +01:00
guilhem@mysql.com
81609d6e1c
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-30 22:22:12 +01:00
guilhem@mysql.com
7219d2be90
two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
...
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.
2004-11-30 22:20:52 +01:00
bell@sanja.is.com.ua
f20e7a82b7
now we create temporary join for all queries with subqueries to make correct cleunup of tables and avoid too early unlock (BUG#6841)
2004-11-30 21:41:12 +02:00