mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23679 commits 2781 branches 343 tags 1.6 GiB
Commit graph

5611 commits

Author SHA1 Message Date
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
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)
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
ef9ef1f958 Fix partial keys when converting VARCHAR to TEXT. (Bug #10543) 2005-05-25 18:11:47 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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@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
gluh@mysql.com
efaeb069e7 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Devel/mysql-5.0
 2005-05-10 18:35:11 +00:00
gbichot@quadita2.mysql.com
0fe9b5474a Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-10 14:04:02 +02:00
jani@ibmlab.site
e7c02801a0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ibmlab.site:/home/my/bk/mysql-5.0
 2005-05-10 13:34:17 +03:00
gbichot@quadita2.mysql.com
d6e1e5b417 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-10 11:31:46 +02:00
bar@noter.(none)
8a5c6502ca bug#10344: some string function fail for UCS2 
substr fix
 2005-05-10 14:13:58 +05:00
msvensson@neptunus.(none)
f3890e9440 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-10 10:49:50 +02:00
jani@ibmlab.site
0b5cedca79 Fixed Bug#10232: update with subquery, precision math, 
another column gets rotten value.
 2005-05-10 09:25:25 +03: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
jimw@mysql.com
cde9f56b45 Merge 2005-05-09 11:28:57 -07:00
gluh@mysql.com
2ae1faaf4b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9404
 2005-05-09 18:28:53 +00:00
gluh@mysql.com
03234c48cf manual merge 2005-05-09 17:21:44 +00:00
mskold@mysql.com
145f7b2983 Fix for Bug #9246 Condition pushdown and left join, wrong result 2005-05-09 18:56:29 +02:00
gluh@mysql.com
12085567de Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries 2005-05-09 16:22:49 +00: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
bell@book.sanja.is.com.ua
e4fe89fab2 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-09 15:34:41 +03:00
dlenev@mysql.com
e7f29e1904 Manual merge of fix for bug #9913 into 5.0 tree. 2005-05-09 16:21:57 +04: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
ramil@ram-book.(none)
2d21a31b60 Brian's mysqldump test modifications made on Ramil's laptop. 2005-05-09 12:21:19 +05:00
ramil@mysql.com
948ae47bc2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/5.0
 2005-05-09 12:06:42 +05:00
ramil@ram-book.(none)
1092c4d8b4 Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs(). 2005-05-09 11:43:52 +05:00
brian@zim.(none)
8636468466 Merge 2005-05-08 16:19:06 -07:00
bell@book.sanja.is.com.ua
4c984c7cc6 merge 2005-05-09 02:06:18 +03:00
bell@book.sanja.is.com.ua
91dccaa36f Item::fix_field need correct pointer on item reference to chnge it if itis need, so support of correct item address added to SP commands (BUG#5963) 
some optimisation of IF/NOT IF ptomised to Pem
 2005-05-09 01:59:10 +03: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
antony@ltantony.mysql.com
3dce5fa432 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-5.0
 2005-05-07 22:58:09 +01: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
joerg@trift-lap.fambruehe
25cf90edbd Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into trift-lap.fambruehe:/MySQL/M50/mysql-5.0
 2005-05-07 18:23:36 +02:00
joerg@trift-lap.fambruehe
84af50133b Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB). 2005-05-07 18:06:02 +02:00
antony@ltantony.mysql.com
4fe845e8d0 Merge 2005-05-07 16:50:22 +01:00
gbichot@quadita2.mysql.com
a85ecdb670 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-05-07 17:26:01 +02:00
jimw@mysql.com
8c7d487ae7 Fix tests after merge 2005-05-07 08:25:59 -07:00
jimw@mysql.com
80933d9f95 Merge 2005-05-07 08:25:58 -07:00
gluh@mysql.com
3ce315ce33 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10261
 2005-05-07 15:25:57 +00:00
gluh@mysql.com
f6bf2680b2 Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user 
I_S table columns information is available for any user
 2005-05-07 15:14:34 +00:00
jimw@mysql.com
d398b6eb51 Add support for slave_compressed_protocol, slave_load_tmpdir, and 
slave_skip_errors in SHOW VARIABLES. (Bug #7800)
 2005-05-07 06:55:47 -07:00
holyfoot@mysql.com
1d71dece3e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.9527
 2005-05-07 18:55:47 +05:00
gluh@mysql.com
64cbbf1463 Fix for bug #9838: INFORMATION_SCHEMA.COLUMNS columns of granted views missing 2005-05-07 13:55:46 +00: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
gluh@mysql.com
a8febcd7d2 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897
 2005-05-07 12:21:48 +00:00
gluh@mysql.com
d76be7ab3f Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement 
thd->lex->derived_tables should be zero(it may be changed if we open a view)
 2005-05-07 12:17:54 +00: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
holyfoot@hf-ibm.(none)
0dcb4707a0 Test case added for bug #9527 (negative zero is a nonsence) 2005-05-07 14:52:03 +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
holyfoot@hf-ibm.(none)
7ca35c2f66 Small fix for the test 2005-05-07 12:11:05 +05:00
holyfoot@mysql.com
fb37258872 Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into mysql.com:/home/hf/work/mysql-5.0.10004
 2005-05-07 02:26:45 +05:00
gluh@mysql.com
5dee7cfc70 Fix for bug #10018:use INFORMATION_SCHEMA works, but show tables in it returns error 2005-05-06 19:06:10 +00:00
gbichot@quadita2.mysql.com
ea1bc59ed9 Dmitri please review. Fix for BUG#10417 "CREATE TRIGGER not written to binlog": 
writing DROP and CREATE TRIGGER to binlog, disabling binlogging
of substatements, testing.
 2005-05-06 18:52:19 +02:00
holyfoot@mysql.com
3474ae5aac merging 2005-05-06 20:31:50 +05:00
ramil@mysql.com
0316492d77 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/ram/work/mysql-5.0
 2005-05-06 20:11:02 +05: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
ramil@mysql.com
def8eb631c Merge mysql.com:/home/ram/work/mysql-4.1 
into mysql.com:/home/ram/work/mysql-5.0
 2005-05-06 20:11:01 +05:00
holyfoot@hf-ibm.(none)
ad863d40fa Fix for bug #10004 (Decimal operation crashes server) 2005-05-06 20:06:25 +05:00
jani@ibmlab.site
56a98396ab Fixed bugs 9820, 9799 and 9800. 2005-05-06 17:32:46 +03:00
holyfoot@hf-ibm.(none)
5aa0edf34c Trimmed fix for bug #9546 (Crashing with huge decimals) 2005-05-06 19:04:58 +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
jimw@mysql.com
ff2d0938dd Support quoted identifiers containing single and double quotes in 
mysqltest. (Bug #10251)
 2005-05-06 05:48:46 -07:00
jani@ibmlab.site
0e91a7131f Merge ibmlab.site:/home/my/bk/mysql-4.1 
into ibmlab.site:/home/my/bk/mysql-5.0
 2005-05-06 13:42:30 +03: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
ramil@ram-book.(none)
50579df606 A fix (bug #10404: select 0/0 returns 0). 2005-05-06 13:31:48 +05:00
dlenev@mysql.com
917cb3dfbc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg9841
 2005-05-06 11:18:37 +04:00