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

7121 commits

Author SHA1 Message Date
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
monty@mysql.com
8c1c166487 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 18:31:38 +03:00
monty@mysql.com
e43cbebc59 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 16:54:56 +03:00
igor@rurik.mysql.com
6ee824705e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-06 06:15:09 -07:00
igor@rurik.mysql.com
f2405d71eb sp.test, sp.result: 
Added a test case for bug #6866.
sql_select.cc:
  Fixed bug #6866.
  Bug was due to the fact that on_expr was not backed up
  for the second execution of the stored procedure.
 2005-06-06 06:05:11 -07:00
bar@mysql.com
2df945d87b Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 
UPPER/LOWER now can return a string with different length.

mi_test1.c:
  Adding new arguments.
Many files:
  Changeing caseup/casedn to return a result with different
  length than argument.
sql_string.h:
  Removing unused method,
mysql_priv.h:
  Removing unused method
 2005-06-06 16:54:15 +05:00
monty@mysql.com
db4dc60d5c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 14:36:21 +03:00
monty@mysql.com
e18bb16ee5 Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file) 
This fixed bug #11039: InnoDB: Warning: using a partial-field key prefix in search
 2005-06-06 14:03:33 +03:00
ramil@mysql.com
c956ed5494 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10539
 2005-06-06 13:14:20 +05:00
lenz@mysql.com
ae97cc1c92 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-06-06 08:46:15 +02:00
ramil@mysql.com
592d8f8d41 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10539
 2005-06-06 11:30:15 +05:00
ramil@mysql.com
417447ae82 Merge 2005-06-06 10:39:21 +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
monty@mysql.com
4b7882dc73 merge 2005-06-05 17:19:50 +03:00
monty@mysql.com
25a2c4a71e Cleanup during review 
Simple optimization for 2 argument usage to function of variable arguments
Fix stack overrun when using 1+1+1+1+1+1+1+....
Update crash-me results for 5.0
Don't call post_open if pre_open() fails (optimization)
 2005-06-05 17:01:20 +03: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
jimw@mysql.com
0f8c2e2a4b Merge mysql.com:/home/jimw/my/mysql-5.0-10590 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-03 16:06:51 -07: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
lenz@mysql.com
852a57300d - include/config-win.h: removed double HAVE_CHARSET_cp932 #define 
- mysql-test/Makefile.am: added a pattern match for t/*.sql 
  (t/mysql_delimiter.sql was missing from the source distribution)
 2005-06-03 18:20:25 +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
msvensson@neptunus.(none)
8c0f0c7b2b BUG#9998 MySQL client hangs on "USE database" 
Use open_normal_and_derived_tables instead of open_and_lock_tables when reading metadata for a table.
 Add two test cases, one for "USE database" and one for "SHOW COLUMNS FROM table"
 2005-06-03 15:29:05 +02:00
bar@mysql.com
4876612ae3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-06-03 11:20:43 +05:00
bar@mysql.com
618934fe5f Merge 2005-06-03 09:44:13 +05: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
mskold@mysql.com
6720cb7d69 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-02 20:55:32 +02:00
jimw@mysql.com
d147e69bb7 Additional tweak to fix for bug #10543, to prevent a change in 
behavior when extending fields that were fully part of a
multi-part key.
 2005-06-02 10:00:36 -07:00
mskold@mysql.com
9cebe281bb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-06-02 17:06:51 +02:00
igor@igor-inspiron.creware.com
380411607a Merge igor-inspiron.creware.com:/home/igor/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
 2005-06-02 07:33:31 -07:00
igor@igor-inspiron.creware.com
186e8c5891 item_func.h: 
Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
  Fixed bug #9939: a wrong conversion of arguments
  for functions COALESCE and IFNULL.
  Item_func_coalesce and Item_func_ifnull now
  inherit from a modified Item_func_numhybrid.
case.test, case.result:
  Added test cases for bug #9939.
 2005-06-02 07:27:02 -07:00
evgen@moonbone.local
f89352602c Fix bug #9669 Ordering on IF function with FROM_UNIXTIME function fails 
Integer overflow results in wrong field sortlength.
 2005-06-02 17:00:07 +04:00
mskold@mysql.com
cc524b4fda Removed bug introduced when implementing support for IN and BETWEEN 2005-06-02 14:46:58 +02:00
bar@mysql.com
95484f7996 Merge mysql.com:/usr/home/bar/mysql-4.1.sysvar 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-06-02 17:13:37 +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
gluh@eagle.intranet.mysql.r18.ru
477feba00f Fix for bug#10964: Information Schema:Authorization check on(2nd version, after review) 
privilege tables is improper
    added privilege check for USER_PRIVILEGES, SCHEMA_PRIVILEGES,
    TABLE_PRIVILEGES, COLUMN_PRIVILEGES tables
 2005-06-02 15:33:53 +05:00
jimw@mysql.com
5a271e2c12 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-01 16:13:24 -07: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
mronstrom@mysql.com
e6f01bf647 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/mikron/bug10837
 2005-06-01 17:40:00 +02:00
mronstrom@mysql.com
5b54fcab6a Renamed bugs.test to default.test 
Moved enabling of warnings to ensure that no warnings are generated
when this test case is executed on a clone where InnoDB is not
activated. This would fail the test case in those clones otherwise.
 2005-06-01 17:36:21 +02: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
pem@mysql.com
f711a3d7c1 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-06-01 15:50:52 +02:00
pem@mysql.comhem.se
5afef58364 Fixed BUG#10969: Stored procedures: crash if default() function 
Return an error if default() is used on a local variable.
  This is actaully a side-effect of BUG#5967: Stored procedure declared
  variable used instead of column (to be fixed later), so this is really a
  workaround until that is fixed.
 2005-06-01 15:42:40 +02:00
monty@mysql.com
a69f432115 Code cleanups during code reviews 
Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge
 2005-06-01 16:35:09 +03:00
ramil@mysql.com
086d81207b A fix (bug #10568: Function 'LAST_DAY(date)' does not return NULL for invalid argument). 2005-06-01 17:09:46 +05:00
pem@mysql.comhem.se
85f19d5da5 Fixed BUG#10961: Stored procedures: crash if select * from dual 
Have to catch errors from SELECT when opening a cursor.
 2005-06-01 12:18:41 +02:00
mskold@mysql.com
e8613e53b9 Fixed handling of condition pushdown to storage engine of NO BETWEEN and NOT IN 2005-06-01 11:56:47 +02:00
ingo@mysql.com
0a1e38b7ed Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement. 
Manual merge from 4.1.
 2005-06-01 11:15:21 +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
pem@mysql.comhem.se
76073d7bf5 Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name 
during creation.
  Although it returns an error, consistent with the behaviour for other objects.
  (Unclear why we would allow the creation of SPs with truncated names.)
 2005-05-31 18:36:32 +02:00
igor@rurik.mysql.com
da6c4bd5b1 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-05-31 06:00:41 -07:00
igor@rurik.mysql.com
a7d28e20aa olap.result: 
Fixed bug #10982.
item.cc:
  Fixed bug #10982. In the function Item_ref::val_decimal
  by mistake the method Item_ref::val_decimal was used
  instead of Item_ref::val_decimal_result.
 2005-05-31 05:56:22 -07:00
monty@mysql.com
e253b7815a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-31 15:22:44 +03:00
igor@rurik.mysql.com
13351aae48 olap.result: 
Post merge corrections.
 2005-05-31 04:49:52 -07:00
pem@mysql.com
53abbdc39b Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-05-31 12:07:16 +02:00
monty@mysql.com
bfcf3c6ac9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-31 12:29:24 +03: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
gluh@eagle.intranet.mysql.r18.ru
ddf91f0689 Fix for bug#10059: SHOW TABLE STATUS FROM information_schema; reports uppercase table names 
information schema table names are always upper case table names
 2005-05-31 13:15:23 +05: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
monty@mysql.com
7538ce70d5 Fixed bug in multiple-table-delete where some rows was not deleted 2005-05-30 20:48:40 +03:00
konstantin@mysql.com
ca6645d852 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-7306-new
 2005-05-30 21:47:20 +04:00
konstantin@mysql.com
e315f903d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-7306-new
 2005-05-30 20:56:11 +04:00
konstantin@mysql.com
2d6a70c42a Preparatory (and the most problematic) patch for Bug#7306 
"the server side preparedStatement error for LIMIT placeholder",
which moves all uses of LIMIT clause from PREPARE to OPTIMIZE
and later steps.
After-review fixes.
 2005-05-30 20:54:37 +04:00
dlenev@mysql.com
90d97c1d0b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-ttdf
 2005-05-30 18:59:24 +04:00
dlenev@brandersnatch.localdomain
abfc5b3903 Added test for bug #5894 "Triggers with altered tables cause corrupt 
databases" and basic handling of errors which happen in triggers.
(The bug itself was fixed by several previous patches).
Fixed bug in multi-delete which were exposed by these tests.
 2005-05-30 18:55:56 +04:00
igor@rurik.mysql.com
f987085aa4 Manual post merge 2005-05-30 05:47:50 -07: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
pem@mysql.com
e496b24304 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-05-30 11:06:31 +02:00
evgen@moonbone.local
329d974df7 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/mysql-5.0-bug-9593
 2005-05-30 03:34:20 +04:00
evgen@moonbone.local
077086cd96 Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock the 
server"
Bug appears only on Windows platform. Freeing memory in 
TMP_TABLE_PARAM::cleanup() allocated by new Copy_fields[0] in 
setup_copy_fields() results in memory destruction. In test IF used instead 
of CONCAT because IF have more stable crash.
 2005-05-30 03:32:50 +04:00
serg@serg.mylan
6ef172efb8 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-05-28 10:44:49 +02:00
patg@radha.local
019288c623 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into radha.local:/Users/patg/mysql-5.0
 2005-05-28 09:00:29 +02:00
jimw@mysql.com
2f0c098ef5 Fix '%h', '%I', and '%l' format specifiers in TIME_FORMAT() 
to handle large time values as documented. (Bug #10590)
 2005-05-27 16:41:53 -07:00
serg@serg.mylan
29d6af8d9a merged 2005-05-28 01:28:18 +02:00
patg@radha.local
d3d727e328 Comment and test changes per review request by Timour. All tests pass on production with this code. 2005-05-27 22:07:46 +02:00
msvensson@neptunus.(none)
a07d8b1951 Merge neptunus.(none):/home/msvensson/mysql/bug9993 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-27 17:22:19 +02:00
pem@mysql.comhem.se
4c49970e0f Fixed BUG#8409: Stored procedure crash if function contains FLUSH 
by simply disabling FLUSH for stored functions. (I can't really work.)
 2005-05-27 16:19:25 +02:00
pem@mysql.comhem.se
fcb3b0326e Fixed BUG#9559: Functions: Numeric Operations using -ve value gives incorrect 
results.
  Actually a problem when converting decimal to int for user variables.
 2005-05-27 14:48:33 +02:00
msvensson@neptunus.(none)
aa99b05be7 Fix rpl_log and rpl_rotate_logs test result 
- Remove the expected warrnings when "show binary logs" are called on zero size binary log files.
 2005-05-27 12:01:41 +02:00
msvensson@neptunus.(none)
ed6b9812f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-27 10:10:16 +02: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
monty@mysql.com
f8cb00640f Fix broken test case (after merge) 2005-05-26 23:33:20 +03:00
joreland@mysql.com
7be75f0a79 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-26 21:30:26 +02:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +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
joerg@mysql.com
5178c84bef Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-05-26 18:12:56 +02:00
bell@sanja.is.com.ua
b186d8b4f9 merge 2005-05-26 18:33:57 +03:00
joerg@mysql.com
76b25fc194 Corrected merge error in 'mysql-test/r/select.result': two test blocks inserted in wrong order. 2005-05-26 16:47:44 +02:00
msvensson@neptunus.(none)
8401cd5d79 BUG#9993 2 unexpected warnings when dropping a routine and --skip-grant-tables 
- Dont perform automatic privilege handling for stored procedures when server is started --skip-grant-tables
 - Renamed view_skip_grants to skip_grants and added test cases for this
 2005-05-26 16:44:46 +02: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
joreland@mysql.com
8bba533f86 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-26 14:07:31 +02:00
joerg@mysql.com
f39f049041 Merge 2005-05-26 12:55:31 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02: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
msvensson@neptunus.(none)
128074d91a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/bug9879
 2005-05-26 11:25:25 +02:00
joreland@mysql.com
cdac1d9c07 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-26 06:49:07 +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
jimw@mysql.com
ef9ef1f958 Fix partial keys when converting VARCHAR to TEXT. (Bug #10543) 2005-05-25 18:11:47 -07:00
kent@mysql.com
e2955a2f13 init_db.sql: 
Updated test data in system tables
 2005-05-26 02:07:13 +02:00
kent@mysql.com
3d4a494189 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-05-26 01:38:29 +02:00
tulin@mysql.com
264de67fc6 Bug #10838 CREATE TABLE produces strange DEFAULT value 2005-05-25 17:54:36 +02:00
msvensson@neptunus.(none)
0ed2e57731 Use one err file for each master 2005-05-25 11:10:10 +02:00
joreland@mysql.com
4bedcb7cab Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-25 09:27:46 +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
patg@radha.local
a6af23a046 changes to fix joins not working (bug #10848). New tests, as well as table->status being set in index_read_idx 2005-05-25 02:15:09 +02:00
acurtis@xiphis.org
248a6934bb Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/usr/home/antony/work2/p3-bug7241.6
 2005-05-24 22:51:02 +01:00
acurtis@xiphis.org
9c8b4c93bb Fix after merge 2005-05-24 22:31:57 +01: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
mskold@mysql.com
bf7f0508e2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-05-24 21:18:07 +02:00
dlenev@mysql.com
1449d44e1c Manual merge of patch fixing several trigger related bugs with main tree. 2005-05-24 22:35:41 +04:00
dlenev@brandersnatch.localdomain
007a205918 Fix for bugs: 
#5860 "Multi-table UPDATE does not activate update triggers"
 #6812 "Triggers are not activated for INSERT ... SELECT"
 #8755 "Trigger is not activated by LOAD DATA".
This patch also implements proper handling of triggers for special forms
of insert like REPLACE or INSERT ... ON DUPLICATE KEY UPDATE. 
Also now we don't call after trigger in case when we have failed to
inserted/update or delete row. Trigger failure should stop statement
execution.

I have not properly tested handling of errors which happen inside of
triggers in this patch, since it is simplier to do this once we will be
able to access tables from triggers.
 2005-05-24 22:19:33 +04: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
joreland@mysql.com
4d06497f50 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-24 17:03:43 +02:00
acurtis@xiphis.org
4a77febaab Merge 2005-05-24 15:52:48 +01: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
3979bd6da7 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-24 16:50:01 +02: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
gluh@mysql.com
ce5d59d380 Merge gluh@gluh:/home/gluh/release/mysql-5.0-build 
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
 2005-05-24 15:35:24 +05:00
gluh@gluh.mysql.r18.ru
077346c746 Fix for bug #10659: information_schema_db fail on Mac OS 2005-05-24 14:35:23 +04: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
gbichot@bk-internal.mysql.com
a49ccfe6f0 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 
into bk-internal.mysql.com:/data0/bk/mysql-5.0
 2005-05-24 00:31:28 +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
mskold@mysql.com
82490f1492 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-05-23 07:26:55 +02:00
igor@rurik.mysql.com
2433210829 join_outer.test, join_outer.result: 
Added test cases for bug #9938.
item.h:
  Fixed bug #9938: missing method not_null_tables for Item_ref.
 2005-05-21 08:44:50 -07:00
igor@rurik.mysql.com
fdb6c661a3 range.result, range.test: 
Added test cases for optimization request #10561.
opt_range.cc, sql_select.cc:
  Fixed bug #10561: an optimization request to allow
  range analysis for NOT IN and NOT BETWEEN.
 2005-05-21 06:11:44 -07:00
reggie@mdk10.(none)
21133df02a fixed conflicts 2005-05-20 16:34:59 -05: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
pem@mysql.comhem.se
4c69f7fb4e Fixed BUG#10537: Server crashes while loading data file into table through 
procedure.
  by simply disabling 'load' in stored procedures, like it's already disabled
  for prepared statements. (They must be made "re-execution" safe before
  working with either PS or SP.)
 2005-05-20 17:47:08 +02:00
monty@mysql.com
f5f92ce146 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-20 17:32:35 +03:00
gluh@gluh.mysql.r18.ru
d3833fa4ff Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0
 2005-05-20 18:32:34 +04:00
brian@zim.(none)
6182241268 Additions for --add-drop-database 2005-05-20 06:56:02 -07:00
monty@mysql.com
2229d9a964 Add missing test result 2005-05-20 16:31:46 +03:00
bell@sanja.is.com.ua
77735f2f35 do not try to use equal field from outer query as field of local join (BUG#6384) 2005-05-20 16:01:41 +03:00
gluh@gluh.mysql.r18.ru
075a730328 Merge gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0-build 
into gluh.mysql.r18.ru:/home/gluh/release/mysql-5.0
 2005-05-20 16:55:00 +04:00
gluh@gluh.mysql.r18.ru
68317fcb0c addition of "REFERENCED_TABLE_SCHEMA", 
"REFERENCED_TABLE_NAME", "REFERENCED_COLUMN_NAME" fields into
  KEY_COLUMN_USAGE table
 2005-05-20 16:39:28 +04:00
msvensson@neptunus.(none)
720b8f4242 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-20 00:05:24 +02:00
msvensson@neptunus.(none)
2849769fbe Merge mysqldev@production.mysql.com:my/mysql-5.0-build 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
 2005-05-19 22:23:59 +02:00
ramil@mysql.com
b06181bccd hf's fix for bug #9060 (FORMAT returns incorrect result) 
we need proper rounding there
 2005-05-20 01:04:08 +05:00
serg@serg.mylan
ade7854b4a after merge 2005-05-19 20:54:37 +02:00
msvensson@neptunus.(none)
920c16c055 BUG#9626 valgrind warnings 
- after review fixes
 2005-05-19 20:38:48 +02:00
serg@serg.mylan
23a59c9857 merged 2005-05-19 15:20:10 +02:00
ramil@mysql.com
eed75b052d a fix (bug #10599: Numeric function 'abs' make server crash). 2005-05-19 17:59:14 +05: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
ramil@mysql.com
c7fd7a3c6a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b6961
 2005-05-19 14:03:41 +05:00
ramil@mysql.com
4630afa4b7 a fix (bug #10599: Numeric function 'abs' make server crash). 2005-05-19 13:35:13 +05: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
ramil@mysql.com
c09975eb96 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b6961
 2005-05-19 12:06:40 +05:00
monty@mysql.com
1edd387dab portablity fix 2005-05-19 05:54:31 +03:00
jimw@mysql.com
d5ee234917 Fixes to merge from 4.1 2005-05-18 15:40:34 -07:00
jimw@mysql.com
b7079ed027 Resolve merge from 4.1 2005-05-18 13:54:36 -07: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
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07: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
ramil@mysql.com
8add105ff5 Merge mysql.com:/usr/home/ram/work/mysql-5.0-build 
into mysql.com:/usr/home/ram/work/mysql-5.0
 2005-05-18 18:15:14 +05:00
mskold@mysql.com
e3b0643098 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-05-18 14:34:42 +02:00
mskold@mysql.com
0b8de7cfce Added support for BETWEEN and IN in condition pushdown to ndbcluster by rewriting them as AND and OR expressions 2005-05-18 14:32:05 +02:00
ramil@mysql.com
44a2007111 a fix (bug #10539: When inserting out of range value in BIT, different engines behaves differently). 2005-05-18 17:30:11 +05: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
ramil@mysql.com
7b3a9212df Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10339
 2005-05-18 16:06:01 +05:00
gbichot@quadita2.mysql.com
56dbfc99ba mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that, 
to easily check the storage engine supports DELAYED).
 2005-05-18 13:02:09 +02:00
ramil@mysql.com
f32c4cbdb5 A fix (bug #10703: rpl_variables.test failure). 2005-05-18 15:10:43 +05:00
ramil@mysql.com
e08c287c93 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10339
 2005-05-18 14:50:57 +05:00
gluh@mysql.com
4047905d8e Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286
 2005-05-18 14:48:04 +05:00
ramil@mysql.com
66b6bbfaea Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10339
 2005-05-18 14:46:05 +05: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
ramil@ram-book.(none)
6737c2f67c test result change: now "enum... not null" doesn't print default value. 2005-05-18 14:02:03 +05:00
serg@serg.mylan
48377eb7c4 test fixes 2005-05-18 10:57:07 +02:00
gluh@mysql.com
053f753a0d Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286
 2005-05-18 12:52:02 +05:00
gluh@eagle.intranet.mysql.r18.ru
b44a474449 Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables(for 5.0) 2005-05-18 12:47:45 +05:00
ramil@mysql.com
86538b338b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0.b6267
 2005-05-18 12:41:36 +05:00
jimw@mysql.com
b2b9485a94 Merge mysql.com:/home/jimw/my/mysql-5.0-10251 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-17 16:59:39 -07:00
msvensson@neptunus.(none)
02bd2cf049 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-17 22:58:13 +02:00
msvensson@neptunus.(none)
d37ca8bfa7 BUG#9879 delimiter command discrepancy (4.1 vs. 5.0, mysql vs. mysqltest) 
- Added testcases to test delimiters in 5.0
 - In 5.0 it's allowed to have a up to 16 byte string as delimiter, everything after the delimiter token will be treated as the delimiter. It's even allowed to set delimiter to 'delimiter', ':;' or'MySQL'
 2005-05-17 21:14:01 +02:00
acurtis@xiphis.org
11a174302b Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/usr/home/antony/work2/p1-bug10246.1
 2005-05-17 19:57:27 +01:00
acurtis@xiphis.org
8df5887ad5 Bug#10246 - Parser: bad syntax for GRANT EXECUTE 
Rename some functions
  more fine-grained sp privileges
  make grant/revoke sp grammar less ambigious
 2005-05-17 19:54:20 +01:00
msvensson@neptunus.(none)
02a3295a60 Merge neptunus.(none):/home/msvensson/mysql/bug9535 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-17 20:32:00 +02:00
msvensson@neptunus.(none)
e6ba48b942 BUG#9535 Warning for "create table t as select uuid();" 
- Set max_length of Item_func_uuid to max_length*system_charset_info->mbmaxlen
  Note! Item_func_uuid should be set to use 'ascii' charset when hex(), format(), md5() etc will use 'ascii'
 2005-05-17 20:31:26 +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
serg@serg.mylan
56fa40e558 sql_yacc.yy: 
missing semicolon added
sql_base.cc:
  bad merge fixed
sp_head.cc, view.test, view.result:
  Correct restoring view name in SP table locking BUG#9758
configure.in:
  restore -fno-implicit-templates -fno-exceptions -fno-rtti in configure
 2005-05-17 17:08:43 +02:00
jimw@mysql.com
be4920cd81 Merge mysql.com:/home/jimw/my/mysql-5.0-7800 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-05-16 14:33:46 -07: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
monty@mysql.com
5641664de7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-16 15:26:40 +03:00
monty@mysql.com
d06bb6fa39 After merge fixes 2005-05-16 15:21:35 +03:00
monty@mysql.com
bacc512193 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/my/mysql-5.0
 2005-05-16 13:36:17 +03:00
monty@mysql.com
7d70579917 Fixed failing tests for not 32 bit intel machines 
Fixed bug in mysql_stmt_fetch() when retrieving rows to return
 2005-05-16 13:34:23 +03: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
0d73975517 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-15 20:53:19 +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
7858004c51 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-15 17:36:36 +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
e2d7efb238 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-15 07:38:42 +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
bd70ce726b Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-05-15 07:06:47 +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@mishka.local
567712b9e7 Portability fix (for 64 bit intel) 2005-05-15 00:30:23 +03:00
monty@mysql.com
9db45adb60 Merge with 4.1 2005-05-14 18:31:22 +03:00
monty@mysql.com
beb5867dfb After merge fixes 2005-05-14 16:24:36 +03:00
konstantin@mysql.com
6b90352eac More post-merge fixes. 2005-05-14 14:42:25 +04:00
konstantin@mysql.com
aa57e40df6 A post-merge fix. 2005-05-14 13:26:01 +04:00
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04: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@mishka.local
3ff39b3704 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-13 22:20:07 +03:00
ramil@ram-book.(none)
d85e052d71 a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than other data types). 
the behavior of enum changed to be consistent.
 2005-05-13 16:44:14 +05:00
ramil@mysql.com
122c72e248 a fix (bug #10339: Incorrect error is displayed if try to set value of internal ' warning_count '). 2005-05-13 16:18:27 +05:00
monty@mysql.com
b54d7d04bd Fixes during review 2005-05-13 14:04:32 +03:00
monty@mishka.local
2d4a417330 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mishka.local:/home/my/mysql-5.0
 2005-05-13 13:36:02 +03:00
monty@mishka.local
2d25da2a4b concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file 
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
 2005-05-13 12:08:08 +03:00
ramil@mysql.com
524b988260 a fix (bug #6961: Traditional: assignment of string to numeric column should fail). 2005-05-13 13:22:27 +05: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
bell@book.sanja.is.com.ua
6e71a81915 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-bug-5.0
 2005-05-13 09:22:48 +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
jani@a193-229-222-105.elisa-laajakaista.fi
187ee4712b Fixed bug 10465. 2005-05-12 17:37:38 +03:00
ramil@mysql.com
152f751831 fix (Bug #8295 and #8296: varchar and varbinary conversion) 
select, gis & gis-tree tests fails at the moment, but
I will push this CS because it was tested before and I'm absolutely
sure it's right.
 2005-05-12 15:56:04 +05:00
joreland@mysql.com
7ab84a3deb Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-12 11:14:33 +02:00
igor@rurik.mysql.com
3351233349 Manual merge 2005-05-10 16:41:47 -07:00
igor@rurik.mysql.com
9d4b228b61 Many files: 
Fixed bug #8528.
  Representation for single-table views was made similar to
  representation for multi-table views.
view.test:
  Added test case for bug #8528.
view.result:
  Added test case for bug #8528. Fixed other test cases.
 2005-05-10 16:31:13 -07:00
gbichot@quadita2.mysql.com
3c81444476 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-10 20:35:12 +02:00