mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16295 commits 2784 branches 343 tags 1.6 GiB
Commit graph

4296 commits

Author SHA1 Message Date
igor@rurik.mysql.com
4df18b1aae func_in.result, func_in.test: 
Added a case for bug #6365.
item_cmpfunc.cc:
  Fixed bug #6365 : Server crashed when list of values
  in IN predicate contains NULL while the tested field is
  of the character type and not of the default set;
  e.g. when f in 'f IN (NULL,'aa') belongs to binary
  character set, while the default character set is latin1.
 2004-11-04 20:39:52 -08:00
guilhem@mysql.com
76f51406ce Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-11-04 19:19:51 +01:00
guilhem@mysql.com
1869cd9f83 Fix for BUG##5714 "Insert into MyISAM table and select ... for update]": 
the fact that the transaction log is empty does not mean we're not in a transaction
(it could be BEGIN; SELECT * FOR UPDATE FROM ibtable: then we don't want to commit now, even if
the statement is a MyISAM update).
With a testcase.
 2004-11-04 19:19:23 +01:00
wax@kishkin.ru
ff32313dd5 autocommit and changed name mysql_test_run_new 2004-11-04 21:25:51 +05:00
wax@mysql.com
bf2685a690 autocommit 2004-11-04 21:25:49 +05:00
tomas@poseidon.ndb.mysql.com
b8e9a612b3 to make sure we get the kill right on the different platforms 2004-11-04 16:24:41 +00:00
tomas@poseidon.ndb.mysql.com
08b25e9901 updated start script for ndbcluster to make better cleanup 
changed to use new switch
 2004-11-04 15:57:29 +00:00
tomas@poseidon.ndb.mysql.com
f5e5dfb2f7 just do kill instead ok kill -9 2004-11-04 13:06:22 +00:00
tomas@poseidon.ndb.mysql.com
21d86bda38 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-04 12:55:29 +00:00
mskold@mysql.com
0bd6fd7875 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-04 10:43:52 +01:00
tomas@poseidon.ndb.mysql.com
09501afd53 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-04 08:53:11 +00:00
ram@gw.mysql.r18.ru
75e322e21c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6331
 2004-11-04 10:24:27 +04:00
bar@mysql.com
f979603cf2 field.cc, sql_mode.result, sql_mode.test: 
"SHOW CREATE TABLE" mysql-4.0 and mysql-3.23 
  compatibiliry mode change:
  Check that a binary collation adds 'binary'
  suffix into a char() column definition in
  mysql40 and mysql2323 modes. This allows
  not to lose the column's case sensitivity
  when loading the dump in pre-4.1 servers.
 2004-11-04 08:50:07 +04:00
guilhem@mysql.com
613c98ce3e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-11-03 22:44:51 +01:00
pekka@mysql.com
b9ec6803ae NDB blobs - try to handle insert-update-delete under autocommit=0 2004-11-03 20:21:56 +01:00
dlenev@mysql.com
fa21feda93 Fix for bug #6387 "Queried timestamp values do not match the inserted 
value if server runs in time zone with leap seconds".

Now in my_gmt_sec() function we take into account difference between
our target and estimation in seconds part.
 2004-11-03 17:59:03 +00:00
tomas@poseidon.ndb.mysql.com
3674c40631 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-11-03 17:41:31 +00:00
lars@mysql.com
424ff9741d Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b5551-4.1-v4
 2004-11-03 18:24:44 +01:00
lars@mysql.com
485de9cbb7 Fix for bug#5551 (Version 4). 
The idea of the fix is that the administrative statements 
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not 
generate binlog errors if there is no errors on the master.
 2004-11-03 18:23:58 +01:00
mskold@mysql.com
700da57918 Fix for bug#6398 update of primary key fails 2004-11-03 15:53:26 +01:00
tomas@poseidon.ndb.mysql.com
0fd9d08c01 changed to use the future-proof option to ndb_mgmd 
there was a clash in using -c, added -f as the future proof switch
 2004-11-03 14:34:21 +00:00
tomas@poseidon.ndb.mysql.com
2356c9f995 mysql-master-run does not need to start second mysqld with innodb, add --skip-innodb 2004-11-03 11:43:46 +00:00
bar@mysql.com
45451568bf opt_range.cc, range.result, range.test: 
Bug #6045: Binary Comparison regression in MySQL 4.1
  Binary searches didn't use a case insensitive index, now they do.
 2004-11-03 15:22:33 +04:00
monty@mysql.com
2185f1a56c Remove usage of !$ from mysql-tests 
Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test
 2004-11-02 20:13:27 +02:00
ram@gw.mysql.r18.ru
86b33f360b A fix (bug #6331: INSERT IGNORE .. SELECT breaks subsequent inserts). 2004-11-02 19:48:37 +04:00
joerg@mysql.com
7c0e191d27 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2004-11-02 16:25:48 +01:00
joerg@mysql.com
1b94652bde Test expansion: "MOD" on non-integral first operand. 2004-11-02 15:09:57 +01:00
bar@mysql.com
6a3b1d443f Many files: 
Allow mixing of different character sets for more SQL functions.
item_func.h:
  Allow mixing of different character sets for more SQL functions..
 2004-11-02 16:02:12 +04:00
bar@mysql.com
bc6bbebbc8 ctype_sjis.result, ctype_sjis.test, ctype-sjis.c: 
Bug #6223 Japanese half-width kana characters get truncated. Bytes 0xA1..0xDF were not treated as a single byte sequence in a mistake.
 2004-11-02 09:00:46 +04:00
pekka@mysql.com
21984b0caa Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-11-01 15:43:54 +01:00
matthias@three.local.lan
afecfd77b5 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
 2004-11-01 10:51:43 +01:00
pekka@mysql.com
354739acb7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2004-10-31 15:44:35 +01:00
pekka@mysql.com
0669646752 NDB bug-6018 support writeTuple with blobs 2004-10-31 15:33:56 +01:00
konstantin@mysql.com
e97a79f2ee Enable REPLACE ... SELECT in prepared statements. 2004-10-30 17:17:52 +04:00
tomas@poseidon.ndb.mysql.com
475aaac8ee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-29 14:38:33 +00:00
tomas@poseidon.ndb.mysql.com
dfe8b2ecea Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-29 14:06:57 +00:00
mleich@mysql.com
86143bc832 These modifications are the result of 
WL#2067 add features to mysqltest: "disable_error_abort" + "$mysql_errno"

$mysql_errno is a new builtin variable of mysqltest and contains the
return code of the last command send to the server.

"--disable_abort_on_error" switches the abort of mysqltest
after "unmasked" failing statements off.
"--enable_abort_on_error" switches the abort of mysqltest
after "unmasked" failing statements on. (default)

"Maskings" are
    !$<error number>  and  --error <error number>
in the line before the statement to be checked.

The benefit of the option "--disable_abort_on_error" is that
- all statements after the failing statement are executed
- a r/<test>.reject will be produced
- it is possible to write test cases, which perform
  code sequences depending on the return code of a single
  statement
 2004-10-29 14:51:56 +02:00
serg@serg.mylan
c365960582 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-10-29 14:31:20 +02:00
serg@serg.mylan
d2bfefc3c1 proper max_records estimation for sort-repair of fulltext indexes 2004-10-29 14:24:06 +02:00
bar@mysql.com
ea49a5181a Allow to convert to non-Unicode charset when mixing a string 
constant with a column. The string is converted into the column
character set. It conversion doesn't lose data, then operation
is possible. Otherwise, give an error, as it was earlier.
 2004-10-29 16:00:03 +05:00
tomas@poseidon.ndb.mysql.com
da3efc2b82 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-29 10:24:56 +00:00
hf@deer.(none)
d2bb900612 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.6117
 2004-10-29 09:32:32 +05:00
tomas@poseidon.ndb.mysql.com
2ebdddf2c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-28 15:52:26 +00:00
tomas@poseidon.ndb.mysql.com
54e72c7207 ndb_basic.result: 
forgot to commit new result
 2004-10-28 15:43:16 +00:00
tomas@poseidon.ndb.mysql.com
289f68a1b9 test that attribute name truncation works 
exposed the attribute name size limit for handler
   added field name truncation to ndb handler
 2004-10-28 15:35:06 +00:00
tomas@poseidon.ndb.mysql.com
37025cb384 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-local
 2004-10-28 11:26:19 +00:00
tomas@poseidon.ndb.mysql.com
0003a8d5a0 added test for max limit of 128 attributes in table 
new define for long signal section size
   bumbed up limit for attributes to 128
    use new define in SectionSegment
    some bug fixing of send fragmented signal +
    make chunk size a multiple the dew define for SectionSegment size
 2004-10-28 11:19:51 +00:00
bar@mysql.com
541883f9d8 Produce a "truncated" warning if a value cannot be converted 
into the column character set on INSERT/UPDATE.
 2004-10-28 15:21:20 +05:00
hf@deer.(none)
f4bc2e7f2d Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.6117
 2004-10-28 11:38:59 +05:00
bell@sanja.is.com.ua
75f7235e8d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
 2004-10-27 23:31:24 +03:00
bell@sanja.is.com.ua
9aa2d5f750 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
 2004-10-27 21:17:31 +03:00
bell@sanja.is.com.ua
3ae044c24f removed incorrect error message about aggregate functions 
improved mechanisn of detection posibility to be NULL for single row queries
switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
(changes to make subselects test working with PS protocol)
 2004-10-27 21:11:06 +03:00
monty@mysql.com
3493f54a5e Merge with 4.0 2004-10-27 19:52:41 +03:00
monty@mysql.com
d5691702d7 Fix when compiling without InnoDB 2004-10-27 18:57:49 +03:00
serg@serg.mylan
cce8f5449d after merge fix 2004-10-26 22:41:45 +02:00
serg@serg.mylan
51d3d41e8e merged 2004-10-26 21:12:14 +02:00
serg@serg.mylan
8dab51445e Bug #6019 - SELECT tries to use too short prefix index on utf8 data 
Field_string::pack should respect max_length as Field_string::pack_key does
 2004-10-26 20:31:41 +02:00
monty@mysql.com
7698054d19 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-26 19:30:57 +03:00
monty@mysql.com
6fbc869d18 A lot of fixes for prepared statements (PS): 
New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb
 2004-10-26 19:30:01 +03:00
bar@mysql.com
a18cee7a18 Bug 6206: ENUMs are not case sensitive even if declared BINARY 
The same problem with SET columns:

find_set() now executes find_type2() to do charset aware search,
instead of always using system_charset_info comparison.
 2004-10-26 13:17:37 +05:00
gluh@gluh.mysql.r18.ru
27a658b2d9 Fix for bug #6166: index prefix length of 0 not rejected 2004-10-26 12:16:35 +04:00
bar@mysql.com
47788e9e07 - Check ENUM/SET duplicate values taking in account charset/collation. 2004-10-26 10:41:14 +05:00
bar@mysql.com
6c4263edfb Reuse more code: two equal pieces for ENUM and SET where moved 
into a function.
 2004-10-26 09:13:52 +05:00
bar@mysql.com
217d83a69f Bug#6202: ENUMs are not case sensitive even if declared BINARY 2004-10-25 17:51:26 +05:00
monty@mysql.com
8b6839e644 Fixed wrong range test code for HEAP tables. This caused a crash when doing a range test with a key that didn't have lower or upper bound (Bug #6082) 
More test cases
 2004-10-23 03:30:27 +03:00
serg@serg.mylan
b7a8cce4eb test fixed 2004-10-22 23:23:02 +02:00
ingo@mysql.com
189a6bc114 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug6151
 2004-10-22 22:34:59 +02:00
ingo@mysql.com
7916e63c5a Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug6151
 2004-10-22 21:07:09 +02:00
konstantin@mysql.com
50c5af7bc4 Post merge fix (test results) 2004-10-22 23:05:48 +04:00
konstantin@mysql.com
659de73248 Manual merge 2004-10-22 22:55:49 +04:00
konstantin@mysql.com
e3abcb6b53 A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values for 
prepared statements when LIMIT is used" and post-review comments.
The fix changes the approach we calculate the need for ORDER BY 
in UNION: the previous was not PS friendly, as it damaged SELECT_LEX 
options in case of single select.
 2004-10-22 22:51:16 +04:00
monty@mysql.com
a308981257 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-22 19:51:04 +03:00
dlenev@mysql.com
0ea8f29186 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
 2004-10-22 20:21:55 +04:00
monty@mysql.com
3afecef4df Fix compiler warnings (detected by Intel's C++ compiler) 
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
 2004-10-22 18:44:51 +03:00
hf@deer.(none)
497fe7f71e Fix for bug #6117 (Centroid() crashes server) 
I learned that one shouldn't use String::set in val_str() methods...
 2004-10-22 20:32:02 +05:00
ingo@mysql.com
20cea41f76 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug6151
 2004-10-22 17:03:26 +02:00
konstantin@mysql.com
33c97a499b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-6050
 2004-10-22 15:59:58 +04:00
konstantin@mysql.com
a7c52d755b A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field 
names with ident. tables fr. diff. schemata": revise all uses of
Item_field and make them prepared-statements friendly when necessary.
 2004-10-22 14:47:35 +04:00
guilhem@mysql.com
42d103b67a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-10-22 11:12:14 +02:00
kent@mysql.com
7a640b44dd mysqltest.c, mysqltest.result, mysqltest.test: 
Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
  new file
 2004-10-22 05:56:27 +02:00
bell@sanja.is.com.ua
ded12c828d Check of temporary tables hiding for query fetched from QC (BUG#6084) 2004-10-21 23:56:12 +03:00
ingo@mysql.com
0d044c6869 BUG#6151 - myisam index corruption. 
Removed the assumption of a certain key order.
Since 4.1, keys are padded with blanks for comparison.
Hence, shorter keys sort behind longer keys, if the
data bytes have values below BLANK.
 2004-10-21 22:17:10 +02:00
dlenev@brandersnatch.localdomain
e6a44b719a Fix for bug #6116 "SET time_zone := ... requires access to 
mysql.time_zone* tables".

We are excluding implicitly used time zone tables from privilege
checking.
 2004-10-21 22:18:00 +04:00
joerg@mysql.com
a7d054d18f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2004-10-21 17:57:48 +02:00
joerg@mysql.com
a77d91e82e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-21 17:47:05 +02:00
ram@gw.mysql.r18.ru
136652522e A fix (bug #6138: MOD operator should not round non-integral argument). 2004-10-21 19:52:55 +05:00
joerg@mysql.com
61ca493a8d Adapt 'ps_10nestset' to standard test style; correct a typing error in 'ps_11bugs'. 2004-10-21 16:02:12 +02:00
bar@mysql.com
636ddd4128 ctype_uca.result: 
Forgot to commit in the previous changeset
 2004-10-21 14:54:17 +05:00
bar@mysql.com
e28976e0ef Bug #5679 utf8_unicode_ci LIKE--trailing % doesn't equal zero characters 2004-10-21 14:48:37 +05:00
bar@mysql.com
e9fde8f54e Allow cp932 characters to be stored in a SJIS column 2004-10-21 12:17:59 +05:00
tomas@poseidon.ndb.mysql.com
eda3eb378d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-20 17:31:59 +00:00
tomas@poseidon.ndb.mysql.com
8ae6219c26 fix so that ndb handler can cope with char(0), mapped to char(1) for now 2004-10-20 17:22:58 +00:00
monty@mysql.com
b686f98f50 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-20 18:58:01 +03:00
tomas@poseidon.ndb.mysql.com
a1bd5432c4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-20 15:58:00 +00:00
tomas@poseidon.ndb.mysql.com
0e114cc7e6 fix for wrong use of shell test 2004-10-20 15:56:57 +00:00
monty@mysql.com
4e63fb9891 After merge fixes 2004-10-20 17:28:40 +03:00
monty@mysql.com
e1218474b8 Merge with 4.0 2004-10-20 16:24:28 +03:00
monty@mysql.com
b32ffec8fd Fix test case for innodb-lock 2004-10-20 16:04:28 +03:00
dlenev@mysql.com
a10ce662b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
 2004-10-20 17:02:15 +04:00
dlenev@brandersnatch.localdomain
75d816627c Fix for bug #6173 "One can circumvent missing UPDATE privilege if 
he has SELECT and INSERT privileges for table with primary key"

Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
function (this also fixes a bug) and some other code.
 2004-10-20 16:04:43 +04:00
monty@mysql.com
1f8b3d0f22 Code cleanups (done during review of new code) 
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
 2004-10-20 11:24:08 +03:00
guilhem@mysql.com
2146e31ad8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-10-19 22:33:39 +02:00
guilhem@mysql.com
41b808d224 Optimization: in the replication slave, we can avoid doing one strlen() per event's execution, 
as we already have db_len in Log_event. Only if rewrite_db() changed the db we need a strlen
(so we now do the strlen() in rewrite_db). Plus a test (we had none for --replicate-rewrite-db :( ).
 2004-10-19 22:27:19 +02:00
tomas@poseidon.ndb.mysql.com
8476fe9757 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-19 15:00:02 +00:00
ram@gw.mysql.r18.ru
ece5c9f293 A fix (bug #6101: mysqldump writes invalid SQL). 2004-10-19 11:00:44 +05:00
tomas@poseidon.ndb.mysql.com
aed0390662 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-18 13:39:19 +00:00
bar@mysql.com
47f638054e Bug #6139 UNION doesn't understand collate in the column of second select 2004-10-18 17:56:25 +05:00
tomas@poseidon.ndb.mysql.com
60cf2213fd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-18 12:12:02 +00:00
bar@mysql.com
1596d46528 Bug #6040 can't retrieve records with umlaut characters in case insensitive manner 2004-10-18 15:23:24 +05:00
jan@hundin.mysql.fi
3c49aa7cfa Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
 2004-10-16 08:17:50 +03:00
joerg@mysql.com
1354b1bd5d New tests for bug#1644 and bug#1676, 
test for bug#1180 changed to table naming scheme 't#'.
 2004-10-15 12:56:57 +02:00
joerg@mysql.com
09c09f04fb Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-15 10:34:40 +02:00
joreland@mysql.com
273209d259 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-10-15 08:11:45 +02:00
joreland@mysql.com
f5e57076d2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-10-15 08:10:08 +02:00
jan@hundin.mysql.fi
d0930b8efd Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
 2004-10-15 08:24:58 +03:00
jan@hundin.mysql.fi
d07ade5579 This patch removes unnecessary lock from the supremum record, takes 
X-locks on duplicates also on LOAD DATA...REPLACE clause and
fixes a bug #6086 adding --disable_warnings and --enable_warnings around
the create table clauses in ctype_utf8 tests for InnoDB.
 2004-10-14 15:36:36 +03:00
bar@mysql.com
299297d4a9 ctype_utf8.test, ctype_utf8.result: 
Wrong handler.
 2004-10-14 16:40:03 +05:00
bar@mysql.com
e827839619 Bug #6019 SELECT tries to use too short prefix index on utf8 data 2004-10-14 16:36:29 +05:00
pekka@mysql.com
69f0df8a9f NDB dbtux minor change 2004-10-14 13:23:57 +02:00
joerg@mysql.com
0290e159fb There were no tests for bug#1644 and bug#1676, added them now. 2004-10-14 13:22:25 +02:00
bar@mysql.com
48120f77eb ctype_utf8.test: 
Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support
 2004-10-14 15:29:07 +05:00
bar@mysql.com
2f8f0f2eb2 Bug #6043 erratic searching for diacriticals in indexed MyISAM UTF-8 table 2004-10-14 14:14:50 +05:00
pekka@mysql.com
5c700650ca Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/space/pekka/ndb/version/my41-tux
 2004-10-14 10:38:47 +02:00
konstantin@mysql.com
7c95fa7085 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-5985
 2004-10-14 02:54:44 +04:00
konstantin@mysql.com
5abc3de22b A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)" 
crashes server." The fix makes Item_func_rand prepared-statements
aware plus it fixes the case when RAND is used in prepared
statements and replication is on (as well as several similar issues).
Until now we did not reset THD before every execution of a prepared
statement, so if some execution had set thd->time_zone_used
or thd->rand_used they would not be reset until next mysql_parse.
Some of post-review fixes done.
 2004-10-14 02:53:59 +04:00
joreland@mysql.com
57612c479f Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-10-13 10:19:28 +02:00
joreland@mysql.com
29c270c13e Bug#6020, any lock >= write_allow_write is a write lock 2004-10-13 10:08:18 +02:00
tomas@poseidon.ndb.mysql.com
b40261262a fix for some build/test errors for 4.1.6 2004-10-13 00:38:43 +00:00
konstantin@mysql.com
cc57252bb7 ps.test, ps.result: a test case for Bug#6042 "constants 
propogation works only once (prepared statements)".
 2004-10-12 21:16:07 +04:00
sergefp@mysql.com
a0ba02d740 Fix for bug#5138 continued: added comments, removed extra debug printf calls, changed ha_heap::records_in_range to use table->rec_per_key. 2004-10-12 18:21:25 +04:00
joerg@mysql.com
ae8800d8d3 New tests for prepared statements: 
- 'ps_10nestset' uses a "nested set" approach for an employee 
  hierarchy, then does arithmetic on the "salary" field;
  (soon) to be extended by inserts / deletes which imply
  mass updates on the "l"/"r" fields showing the set inclusion,
- 'ps_11bugs' will get (some of ?) those bug DB entries which
  refer to prepared statements, but whose number does not appear
  in a test file comment - so it will also be extended.
 2004-10-12 16:00:50 +02:00
joreland@mysql.com
4041575a46 Fix order by 2004-10-12 07:20:38 +02:00
tomas@poseidon.ndb.mysql.com
ed52b77483 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-11 22:31:44 +00:00
tomas@poseidon.ndb.mysql.com
1b35f6b469 another order by fix for ndb 2004-10-11 20:58:48 +00:00
guilhem@mysql.com
c84737d6e8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-10-11 11:02:24 +02:00
guilhem@mysql.com
13af58aab6 Fix for BUG#5949 "error code 1223 in binlog when using innobackup": 
when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT,
it was accepted but my_error() was called and so, while client got no error, error was logged in binlog.
We now don't call my_error() in this case; we assume the connection know what it does.
This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.
 2004-10-11 11:01:38 +02:00
pekka@mysql.com
fabf791061 Merge 2004-10-10 18:55:05 +02:00
tomas@poseidon.ndb.mysql.com
f05a92ce4b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-10 14:08:18 +00:00
ram@gw.mysql.r18.ru
e970eab39d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5382
 2004-10-10 16:31:42 +05:00
tomas@poseidon.ndb.mysql.com
f3d002c1b6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-10 11:31:41 +00:00
ram@gw.mysql.r18.ru
0962ac560f clean-up, indentation fixes. 2004-10-10 15:29:06 +05:00
tomas@poseidon.ndb.mysql.com
252c14049e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-10 10:03:10 +00:00
ram@gw.mysql.r18.ru
48305dcd69 A fix (bug #5382: Server crashes after writing INTO OUTFILE) 2004-10-10 14:40:24 +05:00
tomas@poseidon.ndb.mysql.com
c5020e3b4c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-10 08:32:15 +00:00
tomas@poseidon.ndb.mysql.com
060707c2f1 Fixes bug with tableImpl with blobs not being initialized properly w.r.t pointer to blob tableImpl in column 
added blob to test to see that blob tables don't show up in show tables
    auto increment setting need not fetch blob tables (will otherwise generate error during table creation)
    moved addBlobTables out of fetchGlobalTableImpl to get_local_table_info
    changed addBlobTables to start from last column and break if all blobs added
    also addBlobTables will return -1 if failed (typically getTable)
    changed to using get_local_table_info with internal table name where applicable for efficiency
    added option to get_local_table_info wether to fetch blob tables or not
    getTable always fetches the blobtables
    moved addBlobTables to get_local_table_info to always be called, even if main table goes to cache only
 2004-10-10 08:31:45 +00:00
ram@gw.mysql.r18.ru
5e352defa5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.gconcat
 2004-10-10 12:35:39 +05:00
ram@gw.mysql.r18.ru
5f857a7a82 Blob support for the group_concat() function. 
(Bug #4315: GROUP_CONCAT with ORDER BY returns strange results for TEXT fields
 Bug #5564: Strange behaviour with group_concat and distinct
 Bug #5970: group_concat doesn't print warnings)
 2004-10-10 12:10:53 +05:00
konstantin@mysql.com
e08febea0c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-hook
 2004-10-10 02:39:48 +04:00
konstantin@mysql.com
daa4c2495c A fix and test case for Bug#5987 "subselect in bool function 
crashes server (prepared statements)": the bug was that all boolean
items always recovered its original arguments at statement cleanup 
stage.
This collided with Item_subselect::select_transformer, which tries to 
permanently change the item tree to use a transformed subselect instead of
original one.
So we had this call sequence for prepare:
mysql_stmt_prepare -> JOIN::prepare -> 
Item_subselect::fix_fields -> the item tree gets transformed ->
Item_bool_rowready_func2::cleanup, item tree is recovered to original
state, while it shouldn't have been;
mysql_stmt_execute -> attempts to execute a broken tree -> crash.
Now instead of bluntly recovering all arguments of bool functions in 
Item_bool_rowready_func2::cleanup, we recover only those
which were changed, and do it in one place.
There still would exist a possibility for a collision with subselect
tranformation, if permanent and temporary changes were performed at the 
same stage.
But fortunately subselect transformation is always done first, so it 
doesn't conflict with the optimization done by propogate_cond_constants.
Now we have: 
mysql_stmt_prepare -> JOIN::prepare -> subselect transformation 
permanently changes the tree -> cleanup doesn't recover anything, 
because nothing was registered for recovery.
mysql_stmt_execute -> JOIN::prepare (the tree is already transformed, 
so it doesn't change), JOIN::optimize -> 
propogate_cond_constants -> temporary changes the item tree 
with constants -> JOIN::execute -> cleanup -> 
the changes done by propogate_cond_constants are recovered, as
they were registered for recovery.
 2004-10-10 02:39:22 +04:00
mwagner@here.mwagner.org
edc4b65d5c mysql-test-run.sh: 
Look for 'client_test' in tests/ not bin/
make_binary_distribution.sh:
  Copy 'client_test' into the dist
 2004-10-08 13:38:35 -05:00
magnus@neptunus.(none)
01c29fc921 BUG#5973 ndb table belonging to different database shows up in SHOW TABLES 2004-10-08 13:37:13 +02:00
pekka@mysql.com
8920cff4e9 NDB wl-2151 Fix bounds setting table handler vs TUX 2004-10-08 10:50:50 +02:00
kent@mysql.com
05c01360e3 Makefile.am, client_test.test, mysql-test-run.sh: 
To make client_test work as mysql-test-run test case, needs to install it
 2004-10-08 01:39:20 +02:00
konstantin@mysql.com
d7bda287de Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-5748-anew
 2004-10-08 02:22:40 +04:00
konstantin@mysql.com
2aa7ec0d9d A fix for Bug#5748 "Prepared statement with BETWEEN and bigint values 
crashes mysqld": implementation for a generic item tree modifications
registry. Every item tree modification which should be rolled back for
subsequent execution of a prepared statement or stored procedure should
be saved in the registry. All such modifications are rolled back at once
during cleanup stage of PS.
Actual fix for the bug just adds a call to register modifications to
convert_constant_item.
Post review fixes implemented.
 2004-10-08 02:21:19 +04:00
tomas@poseidon.ndb.mysql.com
0d5c9fb910 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-07 16:57:53 +00:00
tomas@poseidon.ndb.mysql.com
69f40808e2 ndb_alter_table.result, ndb_alter_table.test: 
...
 2004-10-07 16:30:21 +00:00
magnus@neptunus.(none)
d167c09834 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
 2004-10-07 15:42:56 +02:00
tomas@poseidon.ndb.mysql.com
6f0dc0f48e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-07 13:42:55 +00:00
tomas@poseidon.ndb.mysql.com
a257686692 more order by fixes 2004-10-07 12:36:37 +00:00
magnus@neptunus.(none)
ac9016df91 Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is set to 1 in test_if_skip_sort_order if we decide to optimize "order by" by uinsg index_read. 2004-10-07 11:57:48 +02:00
tomas@poseidon.ndb.mysql.com
0ac2c35fe9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-07 09:57:46 +00:00
dlenev@mysql.com
e5483ab3bd Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves 
differently when converting column to auto_increment in 4.1" with
current tree.
 2004-10-07 13:51:32 +04:00
monty@mysql.com
01232b2c52 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-07 12:51:31 +03:00
tomas@poseidon.ndb.mysql.com
4afccd761b more order by for ndb 2004-10-07 09:51:30 +00:00
monty@mysql.com
546c2bd6ab Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-07 12:37:21 +03:00
tomas@poseidon.ndb.mysql.com
690cdfc697 added order by to give same order results on different endian and different sized clusters 2004-10-07 09:27:39 +00:00
dlenev@brandersnatch.localdomain
1f54900630 Fix for bug #5915 "ALTER TABLE behaves differently when converting column 
to auto_increment in 4.1".
Now we are enforcing NO_AUTO_VALUE_ON_ZERO mode during ALTER TABLE only
if we are converting one auto_increment column to another auto_increment
column (this also includes most common case when we don't do anything
with such column).

Also now when we convert some column to TIMESTAMP NOT NULL column with
ALTER TABLE we convert NULL values to current timestamp, (as we do this
in INSERT). One can still get old behavior by setting system TIMESTAMP
variable to 0.
 2004-10-07 13:02:39 +04:00
tomas@poseidon.ndb.mysql.com
a8d2692c65 adder order by 2004-10-07 08:42:11 +00:00
monty@mysql.com
6239edc1d1 After merge fixes 
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code
 2004-10-07 10:50:13 +03:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release 
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
 2004-10-06 19:14:33 +03:00
tomas@poseidon.ndb.mysql.com
ae87bd11fb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb2
 2004-10-06 13:34:17 +00:00
tomas@poseidon.ndb.mysql.com
884892a650 bug#5736, subqueries and not in 
and testcases
 2004-10-06 13:18:55 +00:00
joreland@mysql.com
f715d82a74 testcase for bug#5736 
fix of changed clo to mysql-test-run
 2004-10-06 11:00:09 +02:00
ram@gw.mysql.r18.ru
0944bed7fc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5733
 2004-10-06 12:49:56 +05:00
bar@mysql.com
3fc7640a19 Bug #5832 SELECT doesn't return records in some cases 2004-10-05 21:22:14 +05:00
joreland@mysql.com
761bc1ce4d Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-10-05 15:02:10 +02:00
gluh@gluh.mysql.r18.ru
2a621e275b Fix for bug #5555: "GROUP BY enum_field" returns incorrect results 2004-10-05 17:02:09 +04:00
joreland@mysql.com
9d6cb54bce Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-10-05 14:04:33 +02:00
joreland@mysql.com
0a8bbe4d85 wl2135 - index restart 2004-10-05 12:17:42 +02:00
ingo@mysql.com
c546074e21 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug4286
 2004-10-05 11:33:13 +02:00
dlenev@mysql.com
0d83bdf20d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
 2004-10-04 20:13:16 +04:00
tomas@poseidon.ndb.mysql.com
16ab4447bf corrected merge error rgarding NDB_CONNECTSTRING 2004-10-04 13:53:36 +00:00
dlenev@mysql.com
a4d5804e31 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
 2004-10-04 17:16:49 +04:00
dlenev@brandersnatch.localdomain
cfd34f779f Made TIMESTAMP NULL columns without explicit DEFAULT value to be always 
treated as DEFAULT NULL columns (independently from their position in
table).

(still to be discussed with Monty, Brian, Trudy et al. before push)
 2004-10-04 17:13:31 +04:00
tomas@poseidon.ndb.mysql.com
bc5ca3a1ce Merge 2004-10-04 12:36:25 +00:00
tomas@poseidon.ndb.mysql.com
e13b136c9a bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed 
added testcase for this
use force send for all executes
 2004-10-04 12:26:26 +00:00
tomas@poseidon.ndb.mysql.com
4cab81d8c3 Merge 2004-10-04 00:34:34 +00:00
tomas@poseidon.ndb.mysql.com
e554888be6 use new function stop_ndbcluster 2004-10-04 00:25:04 +00:00
tomas@poseidon.ndb.mysql.com
fd0e3d0899 Merge 2004-10-04 00:15:32 +00:00
tomas@poseidon.ndb.mysql.com
794755cd9d better cleanup of cluster processes with test failure 2004-10-04 00:10:33 +00:00
tomas@poseidon.ndb.mysql.com
08ce5f4a35 make sure old mysqld's are shutdown 2004-10-03 23:41:15 +00:00
tomas@poseidon.ndb.mysql.com
f6ad058388 Merge 2004-10-03 21:39:04 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
b36a565931 Merge ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/staff/repositories/mysql-4.0 
into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug4118
 2004-10-03 00:25:09 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2973a047ea Bug#4118: multi-table UPDATE takes WRITE lock on read table 
Ensures that WRITE lock is not obtained on all tables referenced.
 2004-10-03 00:20:47 +01:00
tomas@poseidon.ndb.mysql.com
fbf2a6ac0c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-01 22:15:05 +00:00
tomas@poseidon.ndb.mysql.com
5745223a90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-01 21:35:50 +00:00
dellis@goetia.(none)
141a5eeaca Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
 2004-10-01 14:53:52 -05:00
dellis@goetia.(none)
ce6f076315 grant.test, grant.result, sql_acl.cc: 
BUG #5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
 2004-10-01 14:48:48 -05:00
kent@mysql.com
391cc2963a Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
 2004-10-01 18:28:44 +02:00
kent@mysql.com
3f717d7c00 client_test.test: 
Temporarely disabled client_test test
  Use MASTER_MYSOCK to get socket path
 2004-10-01 18:27:24 +02:00
tomas@poseidon.ndb.mysql.com
929e98b45b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-01 16:17:04 +00:00
dlenev@mysql.com
53209cc4fc Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-ryan
 2004-10-01 18:55:17 +04:00
dlenev@brandersnatch.localdomain
2511990c97 Support for TIMESTAMP columns holding NULL values. Unlike all other 
column types TIMESTAMP is NOT NULL by default, so in order to have 
TIMESTAMP column holding NULL valaues you have to specify NULL as
one of its attributes (this needed for backward compatibility).

Main changes:
Replaced TABLE::timestamp_default_now/on_update_now members with
TABLE::timestamp_auto_set_type flag which is used everywhere
for determining if we should auto-set value of TIMESTAMP field 
during this operation or not. We are also use Field_timestamp::set_time()
instead of handler::update_timestamp() in handlers.
 2004-10-01 18:54:06 +04:00
dellis@goetia.(none)
f5b7774e99 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
 2004-10-01 08:22:12 -05:00
mskold@mysql.com
dd8c74beac Added index cardinality check 2004-10-01 14:57:17 +02:00
dellis@goetia.(none)
8a12b5add0 logging_ok: 
Logging to logging@openlogging.org accepted
sql_acl.cc, grant.test, grant.result:
  BUG 5831 Changed mysql_revoke_all() to successfully delete all privileges for a user in one pass.
 2004-10-01 07:50:26 -05:00
mskold@mysql.com
ca47a4a25c Changed test to be independent on scan order 2004-10-01 14:23:31 +02:00
ram@gw.mysql.r18.ru
4ec50dc4d7 delete.result, delete.test: 
A fix (bug #5733: Table handler error with self-join multi-table DELETE).
records.cc:
  A fix (bug #5733: Table handler error with self-join multi-table DELETE).
 2004-10-01 16:23:54 +05:00
tomas@poseidon.ndb.mysql.com
5e8ce3841a bug#5349 ALTER TABLE corrupts TEXT (and blob?) 2004-10-01 11:16:49 +00:00
jan@hundin.mysql.fi
aaf661fcaa Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-10-01 08:39:34 +03:00
kent@mysql.com
48006039c1 client_test.test: 
Use TESTS_BINDIR to point out bin dir for "client_test"
mysql-test-run.sh:
  Export TESTS_BINDIR to be used from --exec
 2004-10-01 00:32:42 +02:00
tomas@poseidon.ndb.mysql.com
77582df921 bug#5782 2004-09-30 21:36:25 +00:00
kent@mysql.com
d7bdb6bede Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
 2004-09-30 19:41:39 +02:00
kent@mysql.com
b045736508 mysql_protocols.test: 
--exec now checks return code, make all command lines succeed
 2004-09-30 19:40:33 +02:00
magnus@neptunus.(none)
4faaed98ed Merge fixes 2004-09-30 16:12:28 +02:00
dlenev@mysql.com
28f933fe10 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg4302
 2004-09-30 16:30:34 +04:00
dlenev@brandersnatch.localdomain
0aa589d099 Final solution for bug# 4302 "Ambiguos order by when renamed column is 
identical to another in result"
According to SQL standard queries like 
"select t1.a as col from t1, t2 order by a" should return an error if
both tables contain field a.
 2004-09-30 16:28:17 +04:00
magnus@neptunus.(none)
9e4ba7dac2 WL#1424 Added more advanced test cases for autodiscovery 2004-09-30 14:20:14 +02:00
tomas@poseidon.ndb.mysql.com
9bd6a0b977 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-09-30 08:44:11 +00:00
jan@hundin.mysql.fi
2be1005bcf Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-09-29 08:22:37 +03:00
tomas@poseidon.ndb.mysql.com
2c50746090 multiple servers for cluster 2004-09-28 23:40:20 +00:00
tomas@poseidon.ndb.mysql.com
03e0606b66 Merge 2004-09-28 19:22:04 +00:00
tomas@poseidon.ndb.mysql.com
be795aefd9 mysql-test-run.sh: 
test
 2004-09-28 19:12:44 +00:00
konstantin@mysql.com
07700678b0 Some of the recently pushed prepared statements 
tests were disabled due to failures caused by floating point conversion
issues on optimized builds).
 2004-09-28 21:44:42 +04:00
kent@mysql.com
314e4e286e Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
 2004-09-28 19:44:41 +02:00
tomas@poseidon.ndb.mysql.com
80b2b102b4 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-09-28 17:44:40 +00:00
tomas@poseidon.ndb.mysql.com
20ba684ea6 added 2 masters for ndb tests 2004-09-28 17:04:30 +00:00
kent@mysql.com
f0c44a5cc1 mysql-test-run.sh: 
Make timer an option
 2004-09-28 18:25:57 +02:00
kent@mysql.com
43d3516cc6 Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
 2004-09-28 16:43:05 +02:00
kent@mysql.com
155e1ec330 client_test.test: 
Run client_test as a testcase
  new file
mysql-test-run.sh:
  More clearly report failure if --force, also exit 1
client_test.c:
  Use MAXPATHLEN in test_frm_bug()
  Renable test cases disabled for running from mysql-test-run
mysqltest.c:
  Don't check errno from popen, may not be set
 2004-09-28 16:27:50 +02:00
tomas@poseidon.ndb.mysql.com
13cb28259f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-09-28 11:06:42 +00:00
kent@mysql.com
c3fdbf0f73 Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-es
 2004-09-28 10:34:26 +02:00
mskold@mysql.com
18d5e9b45c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1-ndb
 2004-09-28 10:34:26 +02:00
tomas@poseidon.ndb.mysql.com
459111c487 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-09-28 08:34:25 +00:00
mskold@mysql.com
1b9d0b340d Adjusted so auto_increment value after bulk insert will be exactly +1 after last (if no parallel inserts) 2004-09-28 09:53:14 +02:00
kent@mysql.com
0841e2c444 mysql-test-run.sh: 
Embarrassing typo
 2004-09-28 09:14:18 +02:00
tomas@poseidon.ndb.mysql.com
8e653fcb04 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-09-27 16:11:58 +00:00
kent@mysql.com
0061da910d mysql-test-run.sh: 
Added timing output for each test case.
  Added --embedded-server option.
mysqltest.c:
  Added 'start_timer', 'end_timer' commands
Makefile.am:
  Include mysys/my_getsystime.c to get time function in mysqltest
Many files:
  new file
 2004-09-27 17:01:26 +02:00
jan@hundin.mysql.fi
7d9766b107 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-09-27 10:46:02 +03:00
dlenev@mysql.com
4ff9f1f558 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg4131-3
 2004-09-27 00:50:29 +04:00
dlenev@mysql.com
263b33e12d Fix for bug #4131 "TIMESTAMP columns missing minutes and seconds when 
using GROUP BY"
Now we are setting Field_timestamp::field_length to 19 in open_table()
if we are in new mode (and we are restoring it back when we are coming
back to normal mode). This also should solve potential problems with
some of LOAD DATA INFILE and SELECT * INTO in this mode.
 2004-09-27 00:50:00 +04:00
bar@noter.intranet.mysql.r18.ru
010f4242b7 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into noter.intranet.mysql.r18.ru:/root/mysql-4.1
 2004-09-26 21:55:17 +05:00
bar@noter.intranet.mysql.r18.ru
29b8c6b1e0 bug #5723 length(varchar utf8 field) returns verying results 2004-09-26 21:52:20 +05:00
mskold@mysql.com
f29939c453 Setting MODE_NO_AUTO_VALUE_ON_ZERO at copying in copy_data_between_tables 2004-09-26 17:11:28 +02:00
bell@sanja.is.com.ua
75b628b89d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-09-26 17:31:06 +03:00
magnus@shellback.(none)
94b305b226 Merge 2004-09-26 16:21:15 +02:00
magnus@shellback.(none)
059941db21 WL#1424 Updated after review 
* Changed the implementation of ndbcluster_find_files to be more efficient, using only one mutex lock
* Moved ha_find_files to end of mysql_find_files so that it can be passed the list that we are interested to find.
 2004-09-26 16:11:24 +02:00
dlenev@brandersnatch.localdomain
b7d7c62f24 Disabled part of ps_1general.test behaving differently on different builds. 
(Until mysqltest will support replace_result and replace_column on metadata).
 2004-09-26 15:57:07 +04:00
tomas@poseidon.ndb.mysql.com
b67853d70e added printout for where configuration is fetched 
debug printouts
 2004-09-25 16:06:30 +00:00