mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19188 commits 2780 branches 343 tags 1.6 GiB
Commit graph

5312 commits

Author SHA1 Message Date
evgen@moonbone.local
dc381ea960 Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad results 
Temporary field wasn't restored to default values after ON DUPLICATE KEY
 UPDATE event, which results in wrong data being inserted in new record.
 2005-06-21 22:24:58 +04:00
monty@mishka.local
1524cd001d Cleanup during review of new code 
Fixed wrong allocation that could cause buffer overrun when using join cache
 2005-06-21 18:18:58 +03:00
igor@rurik.mysql.com
3bfe28e9bf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-21 06:19:06 -07:00
msvensson@neptunus.(none)
ddeaf342a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0 patch 2005-06-21 14:19:56 +02:00
igor@rurik.mysql.com
bb944aa9dc Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
 2005-06-21 04:31:07 -07:00
igor@rurik.mysql.com
2104e9e668 group_by.result, group_by.test: 
Added a test case for bug #11295.
item_buff.cc:
  Fixed bug #11295.
  This a correction for the patch of bug #11088 that takes into
  account a possible NULL values of the BLOB column.
 2005-06-21 04:24:21 -07:00
mskold@mysql.com
2716e772d4 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-21 10:35:22 +02:00
kent@mysql.com
4958b54339 mysql-test-run.pl: 
More compact and safe handling of path names.
  Support for running in Windows source tree.
  Use libtool wrapper, instead of messing with
  library path names, and objects in .libs dir.
mtr_misc.pl:
  Utility function that search aand check path names
mtr_report.pl:
  Patch by Carsten, set correct reject/result/eval if not main suite
 2005-06-21 02:21:52 +02:00
jimw@mysql.com
f36ee2a96d Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 14:48:04 -07:00
kent@mysql.com
9426710c68 mtr_cases.pl: 
Bug#11466: Script can now get test case name
  from test case file path on command line
mysql-test-run.pl:
  Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mtr_cases.pl:
  Don't set --default-time-zone if opt file sets it
  Restart the server if time zone is given in opt file
mysql-test-run.pl:
  Don't remove symlink to "var" directory in cleanup
  Removed duplicate/unessesary options to mysqld
 2005-06-20 21:37:39 +02:00
jimw@mysql.com
27eace6304 Merge jwinstead@production.mysql.com:my/mysql-4.1-7858 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-20 12:04:22 -07:00
igor@rurik.mysql.com
28214f3da8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-20 10:52:38 -07:00
igor@rurik.mysql.com
acc6651d24 group_by.result: 
Added  a test case for bug #11385.
group_by.test:
  Added  a test case for bug #11385.
field.h:
  Fixed bug #11385.
  The bug was due to not defined method decimals for the class
  Field_datetime.
 2005-06-20 10:49:04 -07:00
jimw@mysql.com
4429756e53 Fix crash when an entry was added to the mysql.tables_priv 
table with an empty hostname. (Bug #11330)
 2005-06-20 10:21:35 -07:00
mskold@mysql.com
777ec78755 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-20 16:13:34 +02:00
igor@igor-inspiron.creware.com
7ea12bd787 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-06-20 06:13:30 -07:00
dlenev@mysql.com
b5b3b32d0a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
 2005-06-20 16:07:36 +04:00
dlenev@brandersnatch.localdomain
d07843efd9 Fix for bug #11060 "Server crashes on re-execution of prepared 
INSERT ... SELECT with UNION" (reviewed version).

Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.
 2005-06-20 16:07:00 +04:00
msvensson@neptunus.(none)
73c1578f15 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug10365
 2005-06-20 13:08:45 +02:00
kent@mysql.com
67a95f5f14 mysql-test-run.pl: 
Corrected path to 'mysql_fix_privilege_tables'
 2005-06-20 12:32:53 +02:00
mskold@mysql.com
598929a109 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-20 12:27:50 +02:00
kent@mysql.com
5bf83588e3 mysql-test-run.pl: 
Corrected path to 'mysql_fix_privilege_tables'
  Corrected dummy --manager-port to take integer argument
 2005-06-20 11:49:25 +02:00
sergefp@mysql.com
ef85deab92 Fix for BUG#10151: In Item_func_case::find_item don't assume that parameter str != &(this->str_value) 2005-06-20 11:43:38 +02:00
mskold@mysql.com
6fa3cdad5f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-06-20 09:37:31 +02:00
kent@mysql.com
917276f254 mysql-test-run.pl: 
Added dummy --manager-port flag, for backward compatibility
  Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
  Removed hard coded exclude list for embedded server
mysql-test-run.pl:
  Set environment variable MYSQL_SHOW, to be used in test cases
 2005-06-19 20:06:27 +02:00
kent@mysql.com
32734072d0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-19 18:55:00 +02:00
serg@serg.mylan
3812e15c00 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-06-18 18:16:04 +02:00
serg@serg.mylan
07513c001c BSD make compatibility. bug#9828 2005-06-18 18:14:28 +02:00
jimw@mysql.com
176143413e Fix hang/crash with Boolean full-text search against an unindexed field for 
which the query contained more words than we allocated space. (Bug #7858)
 2005-06-17 21:44:17 +02:00
msvensson@neptunus.(none)
daba295db0 BUG#10589: des_encrypt functionality always return NULL 
- Push warnings if des_encrypt or des_descrypt function fails because of out of resources or wrong params.
 - Push warning if des_encrypt or des_decrypt function is used when server is missing support for openssl.
 - Add test func_encrypt_nossl that is tun when the server is missing support for openssl.
 2005-06-17 18:07:46 +02:00
jimw@mysql.com
ec54dcb054 Fix spurious permissions problem when CONVERT_TZ() is used 
in a multi-table update query. (Bug #9979)
 2005-06-17 08:56:04 -07:00
elliot@mysql.com
0c71508759 BUG#10442 Fix replication slave crash when a query with multiupdate and 
subselects is used.
 2005-06-17 11:15:29 -04:00
mskold@mysql.com
dc5e1444a0 Fix for bug#10936: Cluster engine shows wrong key value for duplicate key error 2005-06-17 14:45:54 +02:00
igor@rurik.mysql.com
dd782a8746 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-17 03:56:24 -07:00
konstantin@mysql.com
dcb0e65dcb Fix Bug#9334 "PS API queries in log file" and 
Bug#8367 "low log doesn't gives complete information about prepared 
statements"
Implement status variables for prepared statements commands (a port of
the patch by Andrey Hristov).
See details in comments to the changed files.
No test case as there is no way to test slow log/general log in 
mysqltest.
 2005-06-17 00:11:48 +04:00
igor@rurik.mysql.com
deaf7f9608 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-06-16 09:49:04 -07:00
igor@rurik.mysql.com
2095758a9d group_by.result, group_by.test: 
Added a test case for bug #8614.
sql_select.cc:
  Fixed bug #8614.
  SELECT DISTINCT ... GROUP BY 'const' must be equivalent to
  SELECT ... GROUP BY 'const'.
 2005-06-16 09:45:41 -07:00
lars@mysql.com
869882f321 WL#2076: Added if(...) construct to mysqltest 
Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
 2005-06-16 16:56:03 +02:00
serg@serg.mylan
b49bb72b7a fix test results - Bug #11328 2005-06-16 10:09:05 +02:00
kent@mysql.com
6fc352067d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-14 05:30:36 +02:00
igor@igor-inspiron.creware.com
754e6c0527 func_if.result, func_if.test: 
Correction for test case of bug #11142.
 2005-06-13 11:38:16 -07:00
igor@igor-inspiron.creware.com
42271e4240 func_if.result, func_if.test: 
Added a test case for bug #11142.
item_cmpfunc.cc:
  Fixed bug #11142.
  Implementation of Item_func_nullif::is_null was corrected.
 2005-06-13 11:24:26 -07:00
igor@igor-inspiron.creware.com
36ff674468 Merge igor-inspiron.creware.com:/home/igor/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
 2005-06-13 07:35:46 -07:00
igor@igor-inspiron.creware.com
750fca61f9 ctype_utf8.test, ctype_utf8.result: 
Added a test case for bug #11167.
sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes
 2005-06-13 06:10:19 -07:00
lars@mysql.com
c199d7fd66 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b6883-mysql-4.1
 2005-06-13 11:12:10 +02:00
kent@mysql.com
9e5baf5d02 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-11 00:23:22 +02:00
jimw@mysql.com
481f763255 Merge mysql.com:/home/jimw/my/mysql-4.1-9500 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-10 14:44:25 -07:00
kent@mysql.com
a2073df284 mtr_process.pl: 
Added a sleep for 5 seconds when shuting down,
  work around for strange problem with server restarts
mtr_cases.pl:
  Set default time zone as opt to mysqld
mysql-test-run.pl:
  Enabled --mysqld=<flags> to work
  Put some Windows path names into environment,
  to be used in --replace_result
mysql-test-run.sh:
  Make shell script tolerant to Windows change in test cases
 2005-06-10 21:29:37 +02:00
msvensson@neptunus.(none)
a152d29117 Bug #9558 mysqldump --no-data db t1 t2 format still dumps data 
- Added testcases according to spec in bug report.
 2005-06-10 16:26:23 +02:00
lenz@mysql.com
abaae49cfd Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-4.1-build
 2005-06-10 15:37:21 +02:00
lenz@mysql.com
a610a7749f - added missing files std_data/server-cert.pem and std_data/server-key.pem to make 
the SSL tests pass
 2005-06-10 15:30:16 +02:00
jimw@mysql.com
bb8f2663ae Merge mysql.com:/home/jimw/my/mysql-4.1-10566 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-09 18:03:18 -07:00
acurtis@xiphis.org
cb7961bd9b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/usr/home/antony/work2/p1-bug11028.3
 2005-06-09 16:44:03 +01:00
acurtis@xiphis.org
304bb0c66d Bug#11028 Crash on create table like 
Report error instead of crashing
 2005-06-09 16:06:15 +01:00
konstantin@mysql.com
6a5b215443 Fix broken test suite. 2005-06-09 18:00:50 +04:00
gluh@mysql.com
f183ee49eb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Merge/4.1
 2005-06-09 15:26:46 +05:00
joreland@mysql.com
7d5960a5a6 update result file for ps7_ndb 2005-06-09 12:26:45 +02:00
gluh@eagle.intranet.mysql.r18.ru
8574ed6fc6 Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message 
generate proper error message if we use SET ... = NULL for 'set'
  variables
 2005-06-09 14:39:29 +05:00
joreland@mysql.com
5c9dee551a Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-push
 2005-06-09 08:12:14 +02:00
jimw@mysql.com
495ee34be0 Fix problem with handling of lower_case_table_name == 2 when 
the case in the FROM and WHERE clauses didn't agree. (Bug #9500)
 2005-06-08 14:35:16 -07:00
msvensson@neptunus.(none)
8771c73258 BUG#10365 Cluster handler uses non-standard error codes 
- Added better error messages when trying to open a table that can't be discovered or unpacked. The most likely cause of this is that it does not have any frm data, probably since it has been created from NdbApi or is a NDB system table.
 - Separated functionality that was in ha_create_table_from_engine into two functions. One that checks if the table exists and another one that tries to create the table from the engine.
 2005-06-08 13:31:59 +02:00
serg@serg.mylan
b95c7afcda Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-06-07 22:45:01 +02:00
serg@serg.mylan
30d81b75ff bug#5373: handler READ NEXT w/o HANDLER READ [FIRST] 
check table->file->inited to catch incorrect calling sequence.
 2005-06-07 22:43:25 +02:00
monty@mysql.com
eb9e5777ee Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-06-07 18:23:04 +03:00
lars@mysql.com
f952a0d6f1 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b6883-mysql-4.1
 2005-06-07 16:31:10 +02:00
igor@rurik.mysql.com
5514c94865 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-06-07 06:48:21 -07:00
igor@rurik.mysql.com
d3f3cc617d Many files: 
Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
 2005-06-07 06:34:13 -07:00
monty@mysql.com
543691ab15 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2005-06-07 16:34:10 +03:00
joreland@mysql.com
e6dfe6aa36 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-06-07 15:25:21 +02:00
monty@mysql.com
47c3261375 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-06-07 15:42:35 +03:00
monty@mysql.com
1c725ff797 Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites 
Fix instead wrong call to ha_key_cmp
This is related to bug #10741 Inserting double value into utf8 column crashes server
 2005-06-07 15:09:49 +03:00
igor@rurik.mysql.com
6244353c2a Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-06-07 03:12:12 -07:00
igor@rurik.mysql.com
90dd86907e sql_select.cc, item_buff.cc, item.h: 
Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB field.
  Now the size of the buffer is limited by max_sort_length.
group_by.test, group_by.result:
  Added a test case for bug #11088.
 2005-06-07 03:05:57 -07:00
lars@mysql.com
630dd9a0b7 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b6883-mysql-4.1
 2005-06-07 11:54:31 +02:00
bar@mysql.com
093573b6b7 Bug#10253: compound index length and utf8 char set 
produces invalid query results

mi_key.c:
  well_formed_length should be executed before space trimming, not after.
ctype_utf8.test:
ctype_utf8.result:
  adding test.
 2005-06-07 13:56:42 +05:00
bar@mysql.com
abb2d7aa34 ctype_cp1250_ch.result, ctype_cp1250_ch.test: 
Adding test.
ctype-win1250ch.c:
  Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
  Wrong min_sort_char fix.
 2005-06-06 21:22:23 +05:00
kent@mysql.com
5ec1549776 mtr_misc.pl, mtr_report.pl: 
Try kill all children to the mysql-test-run process when exiting
mtr_process.pl:
  Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting
mysql-test-run.pl:
  Try kill all children to the mysql-test-run process when exiting
  New --vardir caused problems on Windows
  Changed faulty calls to error() to mtr_error()
 2005-06-05 20:10:47 +02:00
konstantin@mysql.com
f0233c2e3d Fix show warnings limit 0 and show warnings limit 0, 0. 
Add test coverage for SHOW WARNINGS LIMIT a, b;
 2005-06-04 14:58:32 +04:00
serg@serg.mylan
7a1282b3e5 mergemerged 2005-06-04 07:28:26 +02:00
serg@serg.mylan
dc0df7ee5a after mergemerge 2005-06-04 07:15:11 +02:00
monty@mysql.com
29fd1f2fd9 Move USE_PRAGMA_IMPLEMENTATION to proper place 
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
 2005-06-03 23:46:03 +03:00
serg@serg.mylan
aaa4c11d11 mergemerged 2005-06-03 21:24:13 +02:00
serg@serg.mylan
5b810bc607 after merge fixes 2005-06-03 21:08:45 +02:00
serg@serg.mylan
e4d4baed62 merged 2005-06-03 18:29:36 +02:00
mronstrom@mysql.com
96252c1de9 Bug #10901 
Analyze table corrupts the state on
data_file_length, records, index_file_length...
by writing the shared state when there is an updated internal
state due to inserts or deletes
Fixed by synching the shared state with the internal state before
writing it to disk
Added test cases of 2 error cases and a normal case in new
analyze test case
 2005-06-03 17:13:43 +02:00
bar@mysql.com
1002a9416b ctype_utf8.result, ctype_utf8.test: 
adding test
field.cc:
  bug#10714 Inserting double value into utf8 column crashes server:
  sprintf was executed with too big length, which caused
  crash on some Windows platforms.
 2005-06-03 09:37:53 +05:00
bar@mysql.com
e686057259 item_func.cc: 
set_var.cc:
variables.result
variables.test

  Bug #10904 Illegal mix of collations between a system variable and a constant
  Changing coercibility of system variables to SYSCONST,
  to be the same with USER(), DATABASE(), etc.
 2005-06-02 16:17:44 +05:00
jimw@mysql.com
fb51d6eca5 Update results of test after merge of bugfix 2005-06-01 14:35:02 -07:00
jimw@mysql.com
b8f3c515ba Merge mysql.com:/home/jimw/my/mysql-4.1-9660 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-01 13:02:26 -07:00
jimw@mysql.com
7ac7bfc3c8 Fix handling of NULL fields in FIELD(). (Bug #10944) 2005-06-01 09:48:25 -07:00
lars@mysql.com
2b3c8b9dc5 BUG#6883: Added tests for create/drop temporary table, UNLOCK TABLES 
If a create table can not do implicit commit, the stmt now fails
CREATE/DROP TEMPORARY TABLE is now flushed to binlog
 2005-06-01 15:52:32 +02:00
ingo@mysql.com
effd338f67 Merge 2005-05-31 20:55:42 +02:00
ingo@mysql.com
40b53eab23 Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. 
After merge fix.
 2005-05-31 20:45:41 +02:00
acurtis@xiphis.org
fb10cfd08d Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/usr/home/antony/work2/p4-bug10413.2
 2005-05-31 19:21:08 +01:00
ingo@mysql.com
c420599581 Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. 
Hand merged from 4.0.
 2005-05-31 19:37:24 +02:00
acurtis@xiphis.org
c4f37eda65 Bug#10413 - Invalid column name is not rejected 
Stop ignoring name parts and check for validity
 2005-05-31 18:06:54 +01:00
ingo@mysql.com
51d80960ea Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. 
1.) Added a new option to mysql_lock_tables() for ignoring FLUSH TABLES.
Used the new option in create_table_from_items().
It is necessary to prevent the SELECT table from being reopend.
It would get new storage assigned for its fields, while the
SELECT part of the command would still use the old (freed) storage.
2.) Protected the CREATE TABLE and CREATE TABLE ... SELECT commands
against a global read lock. This prevents a deadlock in
CREATE TABLE ... SELECT in conjunction with FLUSH TABLES WITH READ LOCK
and avoids the creation of new tables during a global read lock.
3.) Replaced set_protect_against_global_read_lock() and
unset_protect_against_global_read_lock() by
wait_if_global_read_lock() and start_waiting_global_read_lock()
in the INSERT DELAYED handling.
 2005-05-31 11:08:14 +02:00
ramil@mysql.com
cc0061a122 a fix (bug #7405: group_concat with distinct and rollup => ignores distinct in some rows). 2005-05-31 10:54:33 +05:00
igor@rurik.mysql.com
10cc5a46df olap.result, olap.test: 
Added test cases for bug #7894.
sql_select.cc:
  Fixed bug #7894: GROUP BY queries with ROLLUP returned
  wrong results for expressions containing group by columns.
  The fix ensured correct results by replacement of all
  occurrences of group by fields in non-aggregate expressions
  for corresponding ref objects and preventing creation of
  fields in temporary tables for expression containing group
  by fields.
 2005-05-30 03:01:51 -07:00
lars@mysql.com
54bf811ada BUG#6883: Added implicit commit for CREATE TABLE, TRUNCATE TABLE and DROP/CREATE DATABASE 2005-05-27 04:17:33 +02:00
msvensson@neptunus.(none)
dbcf3b3a2e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-26 20:02:21 +02:00
bell@sanja.is.com.ua
b186d8b4f9 merge 2005-05-26 18:33:57 +03:00
bell@sanja.is.com.ua
db2ce1edf6 fixed problem with long string results of expressions in UNIONS (BUG#10025) 2005-05-26 17:30:12 +03:00
msvensson@neptunus.(none)
975ca22872 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-05-26 12:10:05 +02:00
jimw@mysql.com
aac55df4f4 Fix table renaming to not lowercase table names for all storage 
engines when lower_case_table_names == 2, as it did previously
for InnoDB and MEMORY. (Bug #9660)
 2005-05-25 20:26:40 -07:00
msvensson@neptunus.(none)
0ed2e57731 Use one err file for each master 2005-05-25 11:10:10 +02:00
joreland@mysql.com
c448ab53d6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-05-25 09:26:59 +02:00
Sinisa@sinisa.nasamreza.org
e94f4fa8e0 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-05-24 22:44:18 +03:00
jimw@mysql.com
bbdfea15da Increase limit of partial key length in MEMORY storage engine 
to the same as a full key. (Bug #10566)
 2005-05-24 12:21:15 -07:00
brian@zim.(none)
46a3eef67d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into zim.(none):/home/brian/mysql/mysql-4.1
 2005-05-24 10:48:03 -07:00
Sinisa@sinisa.nasamreza.org
df53be3dfe Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-05-24 19:47:18 +03:00
jani@ua141d10.elisa.omakaista.fi
ed2e508bdd Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2005-05-24 18:23:31 +03:00
joreland@mysql.com
6132b0a528 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-05-24 17:05:20 +02:00
jani@ua141d10.elisa.omakaista.fi
5254d52cb6 Added a test case for Bug#8009. 2005-05-24 17:50:17 +03:00
joreland@mysql.com
66407729fb ndb - mysqltestrun 
run ndb_select_all --no-defaults
 2005-05-24 16:48:56 +02:00
reggie@mdk10.(none)
0f43a4719e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/41test2
 2005-05-24 09:02:56 -05:00
reggie@mdk10.(none)
6726b9fd09 removed unneeded reserved_win_names testcase 2005-05-24 09:01:06 -05:00
acurtis@xiphis.org
565c20ecbf Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/usr/home/antony/work2/p3-bug7241.5
 2005-05-24 13:40:25 +01:00
acurtis@xiphis.org
a6a589ef76 Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used. 
Only acquire necessary write lock for multi-delete
 2005-05-24 11:44:34 +01:00
lars@mysql.com
93565c8e7d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-24 01:09:23 +02:00
reggie@mdk10.(none)
3384ecc988 BUG# 9148 Denial of service 
fixups of test case and comment formatting
 2005-05-23 14:48:25 -05:00
lars@mysql.com
4e2766ffc7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-23 16:23:05 +02:00
reggie@mdk10.(none)
48c584537d BUG# 9148: Denial of service 
The problem was that on Windows the access method indicates that access to file 
such as "com1" and "lpt1" is allowed (since they are device names) and
this causes mysql to attempt to open them as databases or tables.

The fix was to write our own my_access method that uses other Win32 functions
to determine if the given argument is indeed a file and has to requested
mode.
 2005-05-20 16:04:10 -05:00
brian@zim.(none)
6182241268 Additions for --add-drop-database 2005-05-20 06:56:02 -07:00
lars@mysql.com
3e25e5867d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-19 12:59:46 +02:00
lars@mysql.com
60021dbe02 CSC#4944: Adding File_size to output of SHOW BINARY lOGS 2005-05-19 12:34:15 +02:00
serg@serg.mylan
1bb2a929fb Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-05-19 09:50:43 +02:00
serg@serg.mylan
541ff258bf after merge fix 2005-05-19 09:47:13 +02:00
serg@serg.mylan
8044488d7c merged 2005-05-18 22:14:08 +02:00
bell@book.sanja.is.com.ua
816e84c1f6 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
 2005-05-18 22:58:48 +03:00
ingo@mysql.com
21bf35fce0 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-05-18 19:45:59 +02:00
ingo@mysql.com
26f2e57ecb Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE 
After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
 2005-05-18 19:40:39 +02:00
Sinisa@sinisa.nasamreza.org
aec54dcc7c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-05-18 19:43:48 +03:00
jimw@mysql.com
9ef20027a6 Update mysqldump test and results 2005-05-18 09:40:12 -07:00
jimw@mysql.com
79ce5dcd90 Resolve bugfix merge 2005-05-18 09:25:06 -07:00
bell@book.sanja.is.com.ua
b22e2aca56 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
 2005-05-18 16:58:37 +03:00
bell@book.sanja.is.com.ua
203881d9a9 reduced 1 server reloding during test 2005-05-18 16:41:32 +03:00
Sinisa@sinisa.nasamreza.org
78a1688351 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-05-18 15:28:13 +03:00
igor@rurik.mysql.com
80aa0062db olap.result, olap.test: 
Added test cases for bug #7914.
sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.
 2005-05-18 05:15:48 -07:00
serg@serg.mylan
28712375d5 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-05-18 11:03:05 +02:00
serg@serg.mylan
48377eb7c4 test fixes 2005-05-18 10:57:07 +02:00
bell@book.sanja.is.com.ua
295722520f Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
 2005-05-17 19:10:53 +03:00
sergefp@mysql.com
cc13545413 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10095
 2005-05-16 22:21:19 +02:00
bell@book.sanja.is.com.ua
1ff9f55920 relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020) 2005-05-16 12:19:10 +03:00
kent@mysql.com
63fcb5de6f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-05-16 02:55:51 +02:00
sergefp@mysql.com
510f662332 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/psergey/mysql-4.0-bug10095
 2005-05-15 22:58:10 +02:00
sergefp@mysql.com
f08287f386 Fix for BUG#10095: {wrong query results because of incorrect constant propagation} 
The problem: base_list::remove didn't modify base_list::last when removing 
the last list element.
The fix: If we remove the last element, find the element before it (by walking
from the beginning of the list) and set base_list::last accordingly.

The list gets corrupted in both 4.0 and 4.1. There are no visible problems in 
current 4.1 because current 4.1 doesn't call where_cond->fix_fields() after 
constant propagation step.
 2005-05-15 22:56:45 +02:00
kent@mysql.com
6374bfeb61 mysqltest.c: 
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
  In cleanup, remove possible soft link to var directory
 2005-05-15 20:38:54 +02:00
kent@mysql.com
81b36addc9 mtr_report.pl, mtr_process.pl, mysql-test-run.pl: 
Added option --vardir=<directory> for feature bug#10096
 2005-05-15 17:22:54 +02:00
kent@mysql.com
f37bdbe059 mysql-test-run.pl: 
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
init_db.sql:
  Initial db updates
 2005-05-15 07:34:09 +02:00
kent@mysql.com
221b1ccae8 mysqltest.c, mysql-test-run.sh: 
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
  Use Purify suppress file
 2005-05-15 06:59:34 +02:00
monty@mysql.com
beb5867dfb After merge fixes 2005-05-14 16:24:36 +03:00
sergefp@mysql.com
480957e7e6 Fix for BUG#9622: Make index statistics collection in MyISAM behave the same 
way in ALTER TABLE ... ENABLE KEYS, ANALYZE TABLE and after bulk insert:
now statistics collection always assumes NULLs are inequal.
 2005-05-14 00:21:53 +02:00
monty@mysql.com
b4e92e6360 Merge with 4.0 2005-05-14 00:01:40 +03:00
monty@mysql.com
9b39f8304e Fixed wrong buffer usage for auto-increment key with blob part that caused CHECK TABLE to report that the table was wrong. (Bug #10045) 2005-05-13 23:08:29 +03:00
monty@mysql.com
b54d7d04bd Fixes during review 2005-05-13 14:04:32 +03:00
monty@mysql.com
20f969b256 Change create_field->offset to store offset from start of fields, independent of null bits. 
Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236
 2005-05-13 11:11:50 +03:00
mleich@mysql.com
1494f0ab68 If the system is under high load 'show full processlist' might report the 
process of the predecessing test case instead of the current test case. 
Shifting the command to the end of the current test case should avoid this problem.
 2005-05-12 17:49:34 +02:00
bar@noter.(none)
8a5c6502ca bug#10344: some string function fail for UCS2 
substr fix
 2005-05-10 14:13:58 +05:00
sergefp@mysql.com
b580a12d47 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug10095
 2005-05-10 00:43:18 +02:00
sergefp@mysql.com
d1e9d9b981 Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available 2005-05-10 00:40:41 +02:00
bar@noter.(none)
c783cb3d7e SUBSTR with negative argument didn't work 
with multi-byte strings, length() instead
of numchars() where used in a mistake.
 2005-05-09 20:55:06 +05:00
antony@ltantony.mysql.com
ddf6225def Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733
 2005-05-09 14:50:56 +01:00
antony@ltantony.mysql.com
cc3bfc6ff1 Bug#8733 - server accepts malformed query (multiply mentioned distinct) 
Detect conflicting options in SELECT
 2005-05-09 14:31:46 +01:00
antony@ltantony.mysql.com
61d7f1db13 Fix outfile test/results 2005-05-09 08:33:45 +01:00
lenz@mysql.com
5cdf15a919 - added "--skip-comments" to the "mysqldump" test to avoid printing comments that include 
version-dependent information (which causes test failures when running the test with a
  different version string)
 2005-05-09 09:25:47 +02:00
lenz@mysql.com
44c857ad4d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-05-09 00:51:05 +02:00
lenz@mysql.com
1b198a78b2 - fix the range test to pass when InnoDB is note enabled (e.g. in the "-classic" build) 2005-05-09 00:47:47 +02:00
antony@ltantony.mysql.com
714994e3e6 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0
 2005-05-08 23:24:33 +01:00
antony@ltantony.mysql.com
10b460e780 Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug8191 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0
 2005-05-08 23:07:46 +01:00
antony@ltantony.mysql.com
b6609031fa Bug#8191 - SELECT INTO OUTFILE insists on FROM clause 
Fix bug + include test case.
  Enable outfile tests.
 2005-05-08 22:56:58 +01:00
brian@brian-akers-computer.local
a8968e337d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2005-05-08 14:24:43 -07:00
antony@ltantony.mysql.com
d51308aec4 Bug#6236 
Incomplete ALTER TABLE breaks MERGE compatibility
  Fix implicit NOT NULL not set on ALTER of PK columns
 2005-05-08 21:03:50 +01:00
jimw@mysql.com
e2a11cc15e Fix crash in mysqldump -c triggered by tables with a large number of long 
field names. (Bug #10286)
 2005-05-08 12:02:46 -07:00
brian@brian-akers-computer.local
39f4e5755d Patch for --insert-ignore 2005-05-07 09:49:39 -07:00
svoj@mysql.com
fc3ff35be6 Test fix. DROP TABLE added. 2005-05-07 21:37:27 +05:00
antony@ltantony.mysql.com
a5e9523364 Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
 2005-05-07 14:46:54 +01:00
antony@ltantony.mysql.com
687417be74 Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
 2005-05-07 14:43:03 +01:00
antony@ltantony.mysql.com
1af671bf36 Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool 
Fix bug by moving TRUE/FALSE in with other literals.
 2005-05-07 13:51:29 +01:00
antony@ltantony.mysql.com
1ebc9e37ea Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update" 
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
  Fix so that protocol doesn't break by properly ignoring dups.
 2005-05-07 13:31:37 +01:00
svoj@mysql.com
c7f0fcab23 BUG#7709 fix - Boolean fulltext query against unsupported engines does not 
fail.
 2005-05-07 15:48:56 +05:00
jimw@mysql.com
ef183de687 Merge mysql.com:/home/jimw/my/mysql-4.1-8497 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-07 01:00:24 -07:00
ramil@ram-book.(none)
bec93d485b fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB 2005-05-06 20:11:01 +05:00
bar@noter.(none)
b20cac254c Bug#6505 Wrong sorting order: 
latin2_croatian_ci collation was fixed.
 2005-05-06 18:41:41 +05:00
bar@noter.(none)
59129d9bbe bug#6504 Upper/Lower conversion bug: 
upper/lower conversion for LATIN LETTER D WITH STROKE
was wrong in latin2.
 2005-05-06 15:22:55 +05:00
shuichi@mysql.com
f0fb08dd79 Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql
 2005-05-05 10:46:14 -07:00
shuichi@mysql.com
720418fe46 Added cp932 character set 2005-05-05 10:36:17 -07:00
konstantin@mysql.com
15dbab1c12 A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it 
should return a non empty one"
(see comments for the changed files for details).
 2005-05-05 12:55:09 +04:00
tulin@dl145b.mysql.com
ccac26a27a logging_ok: 
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287
 2005-05-04 10:16:03 +02:00
konstantin@mysql.com
018b8025c0 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into mysql.com:/opt/local/work/mysql-4.1-9096-fresh
 2005-05-03 12:49:22 +04:00
konstantin@mysql.com
3589e78fda A fix and test case for Bug#9096 "select doesn't return all matched 
records if prepared statements is used".
This fix changes equality evaluation method of basic constants from
by-name to by-value, thus effectively enabling use of parameter markers
in some optimizations (constants propagation, evaluation of possible
keys for query).
 2005-05-03 12:47:27 +04:00
jimw@mysql.com
0b0e4f1166 Merge mysql.com:/home/jimw/my/mysql-4.1-9761 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:12:03 -07:00
jimw@mysql.com
2aea94f483 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-05-02 08:05:58 -07:00
monty@mysql.com
aa84afb983 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-30 03:45:12 +03:00
jimw@mysql.com
6dc842980a Merge mysql.com:/home/jimw/my/mysql-4.1-9634 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-29 08:47:03 -07:00
jimw@mysql.com
78ff49437f Manually resolve merge 2005-04-29 08:46:03 -07:00
monty@mysql.com
fbf31c4a8c CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036) 
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)
 2005-04-29 17:03:34 +03:00
mskold@mysql.com
56499dbe54 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-29 11:56:38 +02:00
jimw@mysql.com
8ef6ae7442 Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names 
is set on case-sensitive file systems and the source table
was specified in something other than lowercase. (Bug #9761)
 2005-04-28 15:30:42 -07:00
sergefp@mysql.com
b2ebf51fbe Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9298
 2005-04-28 19:58:52 +04:00
mskold@mysql.com
78263507ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-28 10:57:08 +02:00
jimw@mysql.com
518f644204 Fix 'mysql_client_test' with embedded server. (Bug #9634) 2005-04-27 17:50:48 -07:00
monty@mysql.com
b40756c27e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-28 00:41:39 +03:00
msvensson@neptunus.(none)
bdb1441a65 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-27 21:40:11 +02:00
sergefp@mysql.com
1d8fe5acef Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9298
 2005-04-27 22:51:02 +04:00
mskold@mysql.com
5f9843aeee Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
ramil@mysql.com
82fc2ce8b7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b9803
 2005-04-27 17:20:29 +05:00
monty@mysql.com
e18a155fd6 Fixed core dump bug when hot link list in key cache was empty. Bug #10167 2005-04-27 14:31:04 +03:00
msvensson@neptunus.(none)
631f035ee9 Merge neptunus.(none):/home/msvensson/mysql/bug9911 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-27 12:17:07 +02:00
Sinisa@sinisa.nasamreza.org
edf2a16049 union.result: 
Results for the above test case
union.test:
  A test case for bug #10032 involving UNION's and ORDER BY clause
sql_yacc.yy:
  Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY
 2005-04-26 21:27:06 +03:00
monty@mysql.com
3ca23bd918 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-26 21:09:42 +03:00
gbichot@quadita2.mysql.com
a95571875c checking that statements get into binlog even when they were affecting 
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).
 2005-04-26 15:52:04 +02:00
monty@mysql.com
220a01a838 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-26 16:03:20 +03:00
msvensson@neptunus.(none)
8d370fbcf9 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error 
- Implemented ha_archive::rename_table
 - Added testcases for rename
 2005-04-26 11:35:52 +02:00
mskold@mysql.com
9457551616 Fix for Bug #9318 drop database does not drop ndb tables 2005-04-22 15:28:23 +02:00
mskold@mysql.com
e0fe3e75c7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-21 09:27:20 +02:00
igor@rurik.mysql.com
20250dc497 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-04-20 15:08:22 -07:00
ingo@mysql.com
8faed37945 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug7806
 2005-04-20 12:24:22 +02:00
mskold@mysql.com
8f7bb4eced Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-20 11:26:57 +02:00
sergefp@mysql.com
f284512ce0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9103
 2005-04-20 12:11:06 +04:00
igor@rurik.mysql.com
25c396628a sql_select.cc: 
Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.
olap.result, olap.test:
  Added a test case for bug #9681.
 2005-04-19 16:54:30 -07:00
mskold@mysql.com
dbd035818b Disabled ndb tests for embedded 2005-04-19 17:23:49 +02:00
ingo@mysql.com
792b816b1b Bug#7806 - insert on duplicate key and auto-update of timestamp 
Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.
 2005-04-19 15:12:32 +02:00
mskold@mysql.com
d4b862f076 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-19 12:51:20 +02:00
ramil@mysql.com
775010a40d A fix (bug #9837: round(1, 6) delivers wrong value in create table context). 2005-04-19 14:44:54 +05:00
mskold@mysql.com
4193a314fb Fix for Bug #9691 UPDATE fails on attempt to update primary key 2005-04-19 11:21:26 +02:00
dlenev@brandersnatch.localdomain
91c482e4a1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
 2005-04-18 13:54:42 +04:00
sergefp@mysql.com
9fbdd4e03f Fix for BUG#9298: Make int->string conversion sign-aware in Protocol_simple::store_long 2005-04-18 07:26:23 +04:00
sergefp@mysql.com
a76ecc5bc7 Fix for BUG#9103: 
Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.
 2005-04-18 05:21:44 +04:00
sergefp@mysql.com
39f412d329 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug9439
 2005-04-17 20:56:36 +04:00
sergefp@mysql.com
5147f85c62 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-look-range
 2005-04-17 02:06:17 +04:00
sergefp@mysql.com
2ef1963c91 Fix for BUG#9348: when computing union of two intervals set lower bound to 
minimum of lower bounds of two joined intervals.
 2005-04-17 02:05:09 +04:00
sergefp@mysql.com
6b4e759cf7 Fix for BUG#9439: 
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)
 2005-04-16 23:35:39 +04:00
ingo@mysql.com
e0e3def7c7 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug9188
 2005-04-16 17:44:04 +02:00
ingo@mysql.com
990ebef7f6 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug9188
 2005-04-15 17:16:42 +02:00
serg@serg.mylan
b07b5f7a6d Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-04-14 22:09:38 +02:00
serg@serg.mylan
4757803662 merged 2005-04-14 21:31:22 +02:00
serg@serg.mylan
533e0551f2 TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode 
bug#8151
 2005-04-14 18:14:54 +02:00
mleich@mysql.com
7880393b39 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/matthias/Arbeit/mysql-4.1/src-clean
 2005-04-14 10:48:43 +02:00
jimw@mysql.com
0162702290 Fix ctype_ucs_binlog test when ucs2 not available 2005-04-13 09:02:12 -07:00
mleich@mysql.com
d1806d7870 Minor improvements + new option needed for WL#2520 Upgrade/Downgrade Test Plan 2005-04-13 11:47:28 +02:00
jimw@mysql.com
3dcfc31e76 Remove references to result.es files 2005-04-12 18:04:32 -07:00
serg@serg.mylan
98601055b6 backport kill.test fix from 5.0 2005-04-11 22:36:07 +02:00
dlenev@mysql.com
b0dd388190 Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796 
into mysql.com:/home/dlenev/src/mysql-4.1-merges
 2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274 Fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 
function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
 2005-04-11 00:30:23 +04:00
bar@mysql.com
16e186779f ctype_collate.result, ctype_collate.test, union.result, union.test: 
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
 2005-04-10 12:40:33 +05:00
ingo@mysql.com
3add511de7 Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145) 
Since 4.1 keys are compared with trailing spaces. 
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did.
 2005-04-08 14:13:02 +02:00
mskold@mysql.com
817f2c6a13 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-08 11:39:22 +02:00
mskold@mysql.com
813cc0eaf0 Added more tests for auto_increment 2005-04-08 11:38:40 +02:00