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
27625 commits 2784 branches 343 tags 1.6 GiB
Commit graph

8793 commits

Author SHA1 Message Date
petr@mysql.com
9333902613 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-10-16 19:37:21 +04:00
petr@mysql.com
1b0566c20b portability fix: sh does not support "==". This resulted in IM tests failing on range of platforms. 2005-10-16 19:30:10 +04:00
kent@mysql.com
00b535280d mysql-test-run.pl: 
Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.
 2005-10-16 17:05:14 +02:00
kent@mysql.com
85ab53357b thread_registry.h, thread_registry.cc: 
Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files
 2005-10-16 06:49:19 +02:00
hf@deer.(none)
9910198aaf Additional fix for bug #12267 (Can't use POINT for primary key) 2005-10-15 22:23:13 +05:00
hf@deer.(none)
3f76925d06 Fix for bug #13573 (wrong data inserted for too big decimals) 2005-10-15 21:57:32 +05:00
hf@deer.(none)
7fb1ffd07e Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-15 21:05:29 +05:00
joerg@mysql.com
58f2a6aa64 Change the "Password" column type for the Perl suite running the tests. bug#14023 2005-10-14 13:35:36 +02:00
bar@mysql.com
a3eea8849c Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-10-14 14:02:21 +05:00
bar@mysql.com
3369f5bd89 Merge mysql.com:/usr/home/bar/mysql-4.1.b13145 
into  mysql.com:/usr/home/bar/mysql-4.1
 2005-10-14 13:57:38 +05:00
bar@mysql.com
7f734c168a Merge mysql.com:/usr/home/bar/mysql-5.0.b12547 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 13:37:19 +05:00
bar@mysql.com
25e40bd403 ctype_utf8.result: 
after merge fix
  ,
 2005-10-14 13:24:21 +05:00
bar@mysql.com
0bf436a058 Merge mysql.com:/usr/home/bar/mysql-4.1.b13751 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 12:07:13 +05:00
bar@mysql.com
5df9c6c2a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 11:54:10 +05:00
bar@mysql.com
58343bede3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
 2005-10-14 09:09:25 +05:00
bar@mysql.com
8bd1ccc642 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-14 08:20:02 +05:00
patg@krsna.patg.net
e13ffdae40 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
 2005-10-13 15:41:52 -07:00
jimw@mysql.com
bae1154235 Fix calculation of TIMESTAMPDIFF() of months and years. (Bug #13534) 2005-10-13 15:32:31 -07:00
evgen@moonbone.local
aff8dbe130 Fix bug #13855 select distinct with group by caused server crash 
DISTINCT wasn't optimized away and caused creation of tmp table in wrong
case. This result in integer overrun and running out of memory.

Fix backported from 4.1. Now if optimizer founds that in result be only 1
row it removes distinct.
 2005-10-14 01:22:24 +04:00
monty@mysql.com
3da5f1c223 Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects 
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge
 2005-10-14 00:04:52 +03:00
bell@sanja.is.com.ua
6d6e107f12 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236) 
- fixed test
 2005-10-14 00:02:38 +03:00
patg@krsna.patg.net
d86f40650f BUG# 13146 
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes 
when dumping triggers
 2005-10-13 13:42:56 -07:00
jimw@mysql.com
8ae2cfb0f7 Force a server restart for the not_embedded_server test to satisfy 
conditions of its first test. (Bug #13796)
 2005-10-13 11:10:45 -07:00
monty@mysql.com
6f5baa1eba Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2005-10-13 20:18:37 +03:00
bar@mysql.com
fee9c13568 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 22:18:35 +05:00
jani@ua141d10.elisa.omakaista.fi
3ef920a7c7 Merged from 4.1. 2005-10-13 19:34:15 +03:00
bar@mysql.com
bf1a3bc030 select.result, mysqldump-max.result: 
after merge fix.
range.result:
  fixing result accordingly
  ,
cast.result:
  after merge fix
range.test:
  Avoid SELECT'ing of BINARY column not to output 0x00 bytes.
 2005-10-13 21:28:44 +05:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-13 18:23:53 +03:00
hf@deer.(none)
27d8bc5b1f merging 2005-10-13 19:51:07 +05:00
hf@deer.(none)
62ffbea5e4 merging 2005-10-13 19:31:09 +05:00
bar@mysql.com
fa0dec7531 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-13 19:27:44 +05:00
bar@mysql.com
7c81d7fc69 ctype_utf8.result, ctype_utf8.test: 
New syntax: CHAR(x USING charset)
  Adding test case.
sql_yacc.yy:
  New syntax: CHAR(x USING charset)
  Adding new parser rule.
item_strfunc.h:
  New syntax: CHAR(x USING charset)
  Adding a new constructor.
 2005-10-13 19:24:47 +05:00
hf@deer.(none)
c933505d2d Fix for bug #3874 (Group by field is not considered) 2005-10-13 19:23:52 +05:00
bar@mysql.com
c229567887 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7 type_binary.result, type_binary.test: 
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.
 2005-10-13 19:16:19 +05:00
msvensson@neptunus.(none)
1fc54b1045 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug12698/my41-bug12698
 2005-10-13 15:53:02 +02:00
msvensson@neptunus.(none)
b81f3ef1ef Bug #12698 abnormal program termination running mysql_client_test 
- Move test for bug#93 from mysql_client_test.c to show_check.test
 - No need for test written in c
 2005-10-13 15:52:22 +02:00
evgen@moonbone.local
818c37ac68 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13535-bug-4.1-mysql
 2005-10-13 17:17:32 +04:00
evgen@moonbone.local
fbd5140f2b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/7672-bug-5.0-mysql
 2005-10-13 17:11:18 +04:00
kent@mysql.com
d0922679e0 Merge 2005-10-13 14:35:53 +02:00
kent@mysql.com
ab22636120 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-10-13 14:23:37 +02:00
evgen@moonbone.local
4d2a58f848 Manual merge of bug fix #7672 2005-10-13 16:00:26 +04:00
bar@mysql.com
ade90d49e5 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12547
 2005-10-13 16:21:35 +05:00
konstantin@mysql.com
5269826383 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-12736
 2005-10-13 14:46:57 +04:00
kent@mysql.com
7743016908 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-13 12:38:38 +02:00
kent@mysql.com
2747a73857 Merge 2005-10-13 12:23:50 +02:00
kent@mysql.com
5b448a8d9f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-13 12:09:39 +02:00
msvensson@neptunus.(none)
cf987efb35 Updated after testing 2005-10-13 11:28:06 +02:00
elliot@mysql.com
a93780b23d BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsistency) 
Updated more DDL statements to cause implicit commit.
 2005-10-13 05:12:17 -04:00
bar@mysql.com
ff3be543c9 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12547
 2005-10-13 14:07:41 +05:00
konstantin@mysql.com
f6899b0783 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-12736
 2005-10-13 12:17:20 +04:00
tomas@poseidon.ndb.mysql.com
93d8c03d16 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-10-13 10:17:19 +02:00
konstantin@mysql.com
b2ff38202d A fix and a test case for Bug#12736 "Server crash during a select". 
The bug was in JOIN::join_free which was wrongly determining that
all joins have been already executed and therefore all used tables
can be closed.
 2005-10-13 11:53:00 +04:00
bar@mysql.com
85243ffd70 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
 2005-10-13 11:25:08 +05:00
patg@krsna.patg.net
a46dd41255 BUG# 13052 
Clean application of patch - 
- Added --tz-utc to fix issue of dumping timestamp values between 
servers with different global time zone settings, particularly 
with regard to the day of DST changeover, which without this fix,
 would dump duplicate timestamp values.
 2005-10-12 22:44:42 -07:00
jimw@mysql.com
701a137844 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 16:07:16 -07:00
guilhem@mysql.com
1a45a2bc6f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-10-13 00:31:25 +02:00
guilhem@mysql.com
a6ceb59491 fixes after merge of 4.1. 2005-10-13 00:29:23 +02:00
jimw@mysql.com
f50e7466e3 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 14:38:32 -07:00
guilhem@mysql.com
fb3506f370 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-10-12 23:36:41 +02:00
eric@mysql.com
06043b519a replace port number with string identifier so that it may have different ports and still run 
(problem found by kent)
 2005-10-12 14:33:08 -07:00
guilhem@mysql.com
8d900e90f0 Merge mysql.com:/home/mysql_src/mysql-4.1 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-10-12 23:33:07 +02:00
evgen@moonbone.local
fb0074a6ad Manual merged 2005-10-13 01:14:58 +04:00
dlenev@mysql.com
ad7705fac5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-repl
 2005-10-13 01:04:52 +04:00
evgen@moonbone.local
551961b207 select.test, sql_select.cc, sql_lex.cc, item.cc: 
Bug #7672 after merge fix
 2005-10-13 00:58:59 +04:00
kent@mysql.com
94ea4f188a make_binary_distribution.sh: 
Copy *.cnf files in mysql-test/std_data/
Makefile.am:
  Added std_data/*.cnf to copy ndb config
 2005-10-12 22:49:33 +02:00
jimw@mysql.com
041ae69093 Merge mysql.com:/home/jimw/my/mysql-4.1-12136 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:29:49 -07:00
guilhem@mysql.com
11848b53d3 To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty. 2005-10-12 22:29:36 +02:00
jimw@mysql.com
cb0d8aba46 Merge mysql.com:/home/jimw/my/mysql-4.1-8731b 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:28:46 -07:00
jimw@mysql.com
626c8a1c8c Merge mysql.com:/home/jimw/my/mysql-4.1-13344 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:27:49 -07:00
jimw@mysql.com
6a19058c55 Merge mysql.com:/home/jimw/my/mysql-4.1-13619 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:26:49 -07:00
evgen@moonbone.local
902b06ecb1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13535-bug-4.1-mysql
 2005-10-13 00:16:33 +04:00
guilhem@mysql.com
4252b546b3 Merge mysql.com:/home/mysql_src/mysql-4.1 
into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
 2005-10-12 21:58:02 +02:00
dlenev@mysql.com
cfc5adaf13 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-repl
 2005-10-12 23:45:14 +04:00
dlenev@mysql.com
3ee7382703 Temporary solution for bug #13969 "Routines which are replicated from master 
can't be executed on slave". It will be possible to solve this problem
in more correct way when we will implement WL#2897 "Complete definer support
in the stored routines".
 2005-10-12 23:42:51 +04:00
pem@mysql.com
6a88684eb3 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/bug7049/mysql-5.0
 2005-10-12 16:39:39 +02:00
tomas@poseidon.ndb.mysql.com
e5b76bb229 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-10-12 15:31:00 +02:00
tomas@poseidon.ndb.mysql.com
a191d8cce1 postt review fixes 2005-10-12 15:19:51 +02:00
tomas@poseidon.ndb.mysql.com
fd0cd55652 Bug #13009 No gaps allowed in node id number sequence 
+ some small bugfixes in ndb_config
+ extending ndb_config to print connections and take shm option
 2005-10-12 14:17:39 +02:00
msvensson@neptunus.(none)
7d29c2a4a1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test
 2005-10-12 13:59:00 +02:00
msvensson@neptunus.(none)
0ac28d3187 Always test ssl and compress 
- Updated after review
 2005-10-12 13:56:07 +02:00
pem@mysql.com
171f83944f Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
 2005-10-12 13:37:36 +02:00
guilhem@mysql.com
ab05c75ea7 merge 2005-10-12 13:31:48 +02:00
guilhem@mysql.com
4c1c9db823 Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc; 
in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
the master though it's data-wise it's not).
 2005-10-12 13:29:55 +02:00
grog@mysql.com
c248a36e30 sql_yacc.yy: 
Bug #10308: Parse 'purge master logs' with subselect correctly.
subselect.test:
  Bug #10308: Test for 'purge master logs' with subselect.
subselect.result:
  Bug #10308: Test result for 'purge master logs' with subselect.
 2005-10-12 09:47:59 +02:00
evgen@moonbone.local
c16410d3a1 Manual merge, fix for bug #7672 2005-10-12 03:32:14 +04:00
monty@mysql.com
5513ab69b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-12 00:59:52 +03:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code 
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
 2005-10-12 00:58:22 +03:00
evgen@moonbone.local
38a470794d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13327-bug-5.0-mysql
 2005-10-12 00:12:54 +04:00
evgen@moonbone.local
50361f8b00 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13327-bug-5.0-mysql
 2005-10-11 23:31:32 +04:00
hf@deer.(none)
40bd22ef69 Fix for bug #13667 (Inconsistency for decimal(m,d) specification. 2005-10-11 21:18:04 +05:00
eric@mysql.com
6c80672c8a Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/eric/dev/mysql-5.0
 2005-10-11 09:13:27 -07:00
jimw@mysql.com
c8a6c2c614 Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how 
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731)
 2005-10-11 09:12:12 -07:00
pem@mysql.com
9d16659d10 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/bug7049/mysql-5.0
 2005-10-11 15:57:27 +02:00
pem@mysql.com
2456c0c668 Fixed BUG#13510: Setting password local variable changes current password 
Disallow conflicting use of variables named "password" and "names". If such
  a variable is declared, and "SET ... = ..." is used for them, an error is
  returned; the user must resolve the conflict by either using `var` (indicating
  that the local variable is set) or by renaming the variable.
  This is necessary since setting "password" and "names" are treated as special
  cases by the parser.
 2005-10-11 15:01:38 +02:00
hf@deer.(none)
cb7d5f4488 Merging 2005-10-11 16:39:35 +05:00
hf@deer.(none)
be0917049b Merging 2005-10-11 14:58:25 +05:00
bar@mysql.com
735f424b5c Bug#12547: Inserting long string into varchar causes table crash in cp932 
ctype-cp932.c:
  Decrement for "pos" variable disappered somehow.
  Restoring it back.
ctype_cp932.test: ctype_cp932.result:
  Adding test case.
 2005-10-11 12:09:38 +05:00
jimw@mysql.com
083c032ec3 Fix minimum value of query_prealloc_size to be the same as its default. (Bug #13334) 2005-10-10 19:39:16 -07:00
eric@mysql.com
215ecd3322 BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE 2005-10-10 17:41:36 -07:00
lars@mysql.com
af951aa662 After merge fixes 2005-10-10 19:38:58 +02:00
hf@deer.(none)
83c103ed81 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.13372
 2005-10-10 21:09:34 +05:00
lars@mysql.com
57f36732ca Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-10-10 17:50:19 +02:00
evgen@moonbone.local
65325ecbbb Fix bug#13327 check_equality() wasn't checking view's fields 
check_equality() finds equalities among field items. It checks input items
to be Item_fields thus skipping view's fields, which are represented by
Item_direct_view_ref. Because of this index wasn't applied in all cases
it can be.

To fix this problem check_equality() now takes real item of
Item_direct_view_ref, except outer view refs (with depended_from set).
 2005-10-10 18:53:57 +04:00
lars@mysql.com
998380521f BUG#12618: Removing fake locking 2005-10-10 15:10:14 +02:00
kent@mysql.com
82615d8b9d Makefile.am: 
Copy "disabled.def"
 2005-10-10 00:21:10 +02:00
evgen@moonbone.local
1b15a2d482 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into moonbone.local:/work/7672-bug-4.0-mysql
 2005-10-09 23:12:12 +04:00
evgen@moonbone.local
6bfc2d4b89 Fix bug#7672 Unknown column error in order clause 
When fixing Item_func_plus in ORDER BY clause field c is searched in all
opened tables, but because c is an alias it wasn't found there.

This patch adds a flag to select_lex which allows Item_field::fix_fields() 
to look up in select's item_list to find aliased fields.
 2005-10-09 23:05:44 +04:00
kent@mysql.com
9bca1b9124 func_group.test: 
Test requires innodb
 2005-10-09 01:32:09 +02:00
serg@serg.mylan
ba169f81e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-08 16:59:41 +02:00
serg@serg.mylan
da625424e0 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-10-08 16:59:08 +02:00
serg@serg.mylan
510d5c3583 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-08 16:56:10 +02:00
serg@serg.mylan
ae293f9ac5 Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE" 
don't allow STOP SLAVE if global read lock is in taken
 2005-10-08 14:46:04 +02:00
monty@mysql.com
17d7ba931d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-08 03:37:23 +03:00
ramil@mysql.com
fcc51afb6a Populate t1 in order to get more predictable explain results. 2005-10-07 20:14:34 +05:00
gluh@eagle.intranet.mysql.r18.ru
a31a4d4b9b after merge fix 2005-10-07 15:09:44 +05:00
gluh@mysql.com
041eab4663 4.1 -> 5.0 merge 2005-10-07 14:26:32 +05:00
gluh@eagle.intranet.mysql.r18.ru
b2b8d8b276 Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails 
allow select into outfile from I_S tables
  it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
  as we use 'any_db' for 'check_access' function in places where FILE_ACL is required
 2005-10-07 14:16:44 +05:00
sergefp@mysql.com
140dea1426 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13484
 2005-10-07 11:14:40 +04:00
bar@mysql.com
62ad8922b8 ctype_utf8.result, ctype_utf8.test: 
Adding test case.
item_func.cc:
  Bug#13751 find_in_set: Illegal mix of collations.
  Character set conversion was forgotten in find_in_set.
 2005-10-07 09:52:15 +05:00
monty@mysql.com
3f73d25fba Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2005-10-07 04:02:53 +03:00
monty@mysql.com
82855517a1 Review of new code since last pull 
- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null
 2005-10-07 03:12:15 +03:00
jimw@mysql.com
77fbc72f47 Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619) 2005-10-06 16:15:53 -07:00
monty@mysql.com
78e828d32f Review of code pushed since last 5.0 pull: 
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
 2005-10-06 17:54:43 +03:00
gluh@eagle.intranet.mysql.r18.ru
fbc621e545 Fix for bug#13605 'rpl_openssl' test hangs 2005-10-06 19:51:08 +05:00
msvensson@msdesk.(none)
5da6a6c8a1 Merge msdesk.(none):/home/msvensson/mysql-4.1 
into  msdesk.(none):/home/msvensson/mysql-5.0
 2005-10-06 14:40:18 +02:00
pekka@mysql.com
45dcaf968d ndb - prelim perl scripts to autotest 2005-10-06 09:44:25 +02:00
serg@serg.mylan
2356401750 Bug#12935 Local and XA transactions not mutually exclusive 2005-10-05 19:58:16 +02:00
serg@serg.mylan
10953a6d8c Bug#13143 - formatID should not affect XID's uniqueness 2005-10-05 16:38:53 +02:00
bar@mysql.com
5931927708 Bug#12476 Some big5 codes are still missing. 
ctype-big5.c:
  Adding extra cp950 characters into Unicode mapping.
ctype_big5.result, ctype_big5.test:
  Adding test case
 2005-10-05 19:20:49 +05:00
bar@mysql.com
a98e6dfe44 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-10-05 11:28:08 +05:00
serg@serg.mylan
3edd6c016a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-04 21:43:56 +02:00
serg@serg.mylan
bbdb6c9147 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-04 21:37:51 +02:00
serg@mysql.com
30077692dc innodb.result: 
somehow it didn't get into the previous changeset
 2005-10-04 21:37:50 +02:00
msvensson@neptunus.(none)
cb96f195c8 Improved testing of ssl and compression 
- Added show status variable "compression" for checking that compression is turned on.
 - Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.  
 - Setup server to accept ssl connections from clients ig that is supported by server
 - New tests 
   - ssl - Run with ssl turned on
   - ssl_compress - Run with ssl and compression turned on
   - compress - Run with compression turned in 
 - Updated test 
   - openssl_1, rpl_openssl1 - Changed to run if server supports ssl
 2005-10-04 15:43:55 +02:00
brian@zim.(none)
11be8401a7 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/fix-5.0
 2005-10-03 21:09:01 -07:00
kent@mysql.com
fe26e59d70 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-04 04:03:48 +02:00
brian@zim.(none)
2a42afd132 Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers. 
May changes were to simplify storage engine setup and support for legacy call to show storage engines.
 2005-10-03 18:42:30 -07:00
evgen@moonbone.local
5a10244d8b Fix bug#13535 Incorrect result from SELECT statement after SHOW TABLE STATUS 
After SHOW TABLE STATUS last_insert_id wasn't cleaned, and next select
erroneously rewrites WHERE condition and returs a row;
5.0 isn't affected because of different SHOW TABLE STATUS handling.

last_insert_id cleanup added to mysqld_extend_show_tables().
 2005-10-03 23:22:46 +04:00
timour@mysql.com
233e68e205 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-13410
 2005-10-03 22:02:22 +03:00
kent@mysql.com
f49ac24a0f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-03 10:39:35 +02:00
msvensson@neptunus.(none)
25cf17f695 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
 2005-10-03 10:08:02 +02:00
kent@mysql.com
a7afd91e97 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-01 18:03:39 +02:00
kent@mysql.com
44f94ed2c9 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-01 17:24:13 +02:00
kent@mysql.com
d8b9f5be41 init_db.sql: 
mysql.user.password doesn't need utf8
 2005-10-01 17:21:09 +02:00
sergefp@mysql.com
90414dcaaf BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the function 
that compares key images.
 2005-10-01 11:56:01 +04:00
timour@mysql.com
77cf84186e Fix for BUG#13410 - qualified reference to a view column in the HAVING clause cannot be resolved. 
The problem was then when a column reference was resolved to a view column, the new Item
created for this column contained the name of the view, and not the view alias.
 2005-10-01 09:35:30 +03:00
eric@mysql.com
b2f5281929 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/eric/dev/hton-mysql-5.0
 2005-09-30 16:28:47 -07:00
eric@mysql.com
5008a5f208 Move handler specific options into handlerton flag check 
BUG#13108
 2005-09-30 16:26:48 -07:00
anozdrin@mysql.com
d3c0fd2bce WL#2789 "Instance Manager: test using mysql-test-run testing framework" 
Add Instance Manager tests.
 2005-10-01 01:14:50 +04:00
anozdrin@mysql.com
c73e03ff22 WL#2789 "Instance Manager: test using mysql-test-run testing framework" 
1) Add support to testing Instance Manager in daemon mode;
2) Don't run Instance Manager tests when running with --ps-protocol option;
 2005-10-01 01:12:14 +04:00
kent@mysql.com
aef1f4cd2e Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-09-30 22:37:55 +02:00
kent@mysql.com
185b5636f4 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-09-30 22:01:34 +02:00
serg@serg.mylan
bef3c587c6 Bug#11238 
"SELECT ... FOR UPDATE executed as consistent read inside LOCK TABLES"
Do not discard lock_type information as handler::start_stmt() may require knowledge.
(fixed by Antony)
 2005-09-30 20:20:10 +02:00
msvensson@neptunus.(none)
92b1d080c9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
 2005-09-30 16:51:35 +02:00
kent@mysql.com
7b2e04d5a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-09-30 16:37:02 +02:00
timour@mysql.com
1740f72305 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-13597
 2005-09-30 17:01:55 +03:00
kent@mysql.com
ea3baa035f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-09-30 14:34:39 +02:00
kent@mysql.com
f3cb039c0b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-09-30 14:06:08 +02:00
sergefp@mysql.com
e9f2f9437a BUG#12915: Added single-table UPDATE/DELTE ... ORDER BY ... LIMIT 
optimization: now can use index to find records to update/delete
when there is no WHERE clause.
 2005-09-30 15:21:37 +04:00
jonas@perch.ndb.mysql.com
aa10174652 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-30 12:27:39 +02:00
jonas@perch.ndb.mysql.com
6169d529e5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-09-30 12:25:46 +02:00
jonas@perch.ndb.mysql.com
b43d0f0495 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-30 12:25:39 +02:00
jonas@perch.ndb.mysql.com
f334a14952 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-09-30 12:24:56 +02:00
jonas@perch.ndb.mysql.com
6cff2db932 ndb 
Add support/test for using my.cnf [cluster_config]
 2005-09-30 12:19:15 +02:00
serg@serg.mylan
fff2737b0e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-30 12:04:10 +02:00
serg@serg.mylan
8c813c0a16 duplicate error message removed 2005-09-30 12:01:39 +02:00
jonas@perch.ndb.mysql.com
1e6f19074e Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2005-09-30 11:42:33 +02:00
jonas@perch.ndb.mysql.com
a30faa3b34 ndb - 
add support for reading config.ini from ndb_config
 (as alternative to contacting ndb_mgmd)
 2005-09-30 11:39:49 +02:00
guilhem@mysql.com
fd9a6f9750 Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle. 2005-09-30 10:58:24 +02:00
serg@serg.mylan
69909c460a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-30 09:40:49 +02:00
timour@mysql.com
638198e17d Fix for BUG#13597 - columns in ON condition not resolved if references a table in a nested right join. 
The problem was in that when finding the last table reference in a nested join tree,
the procedure doing the iteration over the right-most branches of a join tree
was testing for RIGHT JOINs the table reference that represents the join, and not
the second operand of the JOIN. Currently the information whether a join is LEFT/RIGHT
is stored not on the join object itself, but on one of its operands.
 2005-09-30 10:39:17 +03:00
ramil@mysql.com
63fa48c0f6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-09-30 12:30:32 +05:00
sergefp@mysql.com
10860b1108 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13455
 2005-09-30 07:07:50 +04:00
sergefp@mysql.com
e0268dbcfd Adjust test results changed because of fix for BUG#13455 2005-09-30 07:06:04 +04:00
kent@mysql.com
d50b5920e0 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-09-30 02:15:36 +02:00
acurtis@xiphis.org
2e4a1862da Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5
 2005-09-30 00:09:51 +01:00
acurtis@xiphis.org
39bbba6e55 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/usr/home/antony/work2/p2-bug10586.5
 2005-09-29 23:54:46 +01:00
kent@mysql.com
822a4ac5bb mtr_report.pl: 
Text formatting, adjust table header
mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysqldump.test:
  Removed ending ';' from --exec line
 2005-09-30 00:52:18 +02:00
sergefp@mysql.com
7d383eecb5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13455
 2005-09-30 01:38:04 +04:00
sergefp@mysql.com
71d8990f8e Fix for BUG#13455: Make "ref" optimizer able to make this inference: 
"t.key BETWEEN c1 AND c2" and c1 = c2 -> can access table t using "t.key = c1".
 2005-09-30 01:34:19 +04:00
pem@mysql.com
613a494c47 Updated result after manual merge of sp.test. 2005-09-29 17:30:15 +02:00
pem@mysql.com
9ca73fac4a Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-09-29 16:59:25 +02:00
ramil@mysql.com
920e456549 fix for bug #13545: Server crash caused by select query. 2005-09-29 19:34:21 +05:00
pem@mysql.com
f85dd7cee5 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 15:53:28 +02:00
pem@mysql.com
f78ea0265d Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-09-29 15:06:08 +02:00
pem@mysql.com
9f20feea5b Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 14:35:08 +02:00
gluh@eagle.intranet.mysql.r18.ru
cac5b085cd after merge fix 2005-09-29 17:21:32 +05:00
ingo@mysql.com
0af6e68acf Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-29 14:07:32 +02:00
ingo@mysql.com
5c93e799d8 Merge mysql.com:/home/mydev/mysql-4.0-4000 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-29 13:44:17 +02:00
ingo@mysql.com
1af69fca94 Bug#9112 - Merge table with composite index producing invalid results with some queries 
Second platform fix for floating point rounding.
 2005-09-29 13:37:30 +02:00
gluh@mysql.com
b36f63e3ab 4.1 -> 5.0 merge 2005-09-29 16:35:50 +05:00
jan@hundin.mysql.fi
36edcbf4fa Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/mysql-5.0
 2005-09-29 14:30:05 +03:00
gluh@eagle.intranet.mysql.r18.ru
f9762c47d0 Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment 
"CHARACTER SET", "COLLATE", and "DEFAULT" are always
  printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
  "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
  if NO_FIELD_OPTIONS is not set.
 2005-09-29 16:17:45 +05:00
bar@mysql.com
7fe434098e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-09-29 16:07:33 +05:00
jan@hundin.mysql.fi
81f51fd47b Fix incorrectly merged changeset, these may not be before a first 5.0 test 
i.e. range test.
 2005-09-29 13:50:27 +03:00
pem@mysql.com
f641fdb640 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 12:39:28 +02:00
jan@hundin.mysql.fi
43b2dc617b Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/mysql-5.0
 2005-09-29 13:15:09 +03:00
pem@mysql.com
66fa4ffbdf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-29 11:37:28 +02:00
msvensson@neptunus.(none)
9b7a3bec70 Bug #13231 mysqltest: fails to dectect when mysql_next_result fails 
- Packets out of order when reading cached data stored by a normal select from a ps or vice versa.
 - Add pkt_nr to query cache flags
 2005-09-29 10:25:44 +02:00
serg@serg.mylan
e5dd31e1da the test changed to be, simpler, faster, and easier to read 2005-09-29 09:41:30 +02:00
ingo@mysql.com
824dbfe34b Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-29 09:37:21 +02:00
ingo@mysql.com
68bc5a31e4 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-29 09:36:44 +02:00
jan@hundin.mysql.fi
6734ca6cbe Fixed a bug checksum table locks the InnoDB table and does not use a 
consistent read (Bug #12669). This fixes InnoDB part of the bug.
 2005-09-29 08:34:38 +03:00
kent@mysql.com
656b0cc15a Merge 2005-09-29 03:20:31 +02:00
kent@mysql.com
7e6a78a1ae mtr_process.pl: 
Append to some of the log files, not overwrite
 2005-09-28 23:53:31 +02:00
kent@mysql.com
7d33bdeffa mysql-test-run.pl: 
Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.
 2005-09-28 23:52:10 +02:00
kent@mysql.com
fdeceae81f mysql-test-run.pl: 
Pass on all --skip-* to mysqld
 2005-09-28 23:24:44 +02:00
ingo@mysql.com
904723d7c5 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-28 20:09:52 +02:00
ingo@mysql.com
a9a38f815e Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-28 20:09:13 +02:00
evgen@moonbone.local
1bf2fbdb35 select.result, item.cc: 
After merge fix for bug#13356
 2005-09-28 21:30:10 +04:00
msvensson@neptunus.(none)
13161c2a84 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 15:32:05 +02:00
ingo@mysql.com
b3c3db08f0 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-28 14:10:02 +02:00
msvensson@neptunus.(none)
324f4be3d4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-09-28 13:45:42 +02:00
kent@mysql.com
99ce6f0b76 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-09-28 13:37:58 +02:00
msvensson@neptunus.(none)
26793f3039 Correct merge error, warning ended up after new tests from 4.1 2005-09-28 13:29:13 +02:00
kent@mysql.com
07a9052bce Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-09-28 13:23:57 +02:00
jan@hundin.mysql.fi
dc80450410 Fixed a bug checksum table locks the InnoDB table and does not use a 
consistent read (Bug #12669).
 2005-09-28 14:14:49 +03:00
msvensson@neptunus.(none)
fbf4a5e079 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-09-28 11:34:53 +02:00
bar@mysql.com
6e88f14eea Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-09-28 11:51:03 +05:00
patg@krsna.patg.net
acdc193a45 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-5.0
 2005-09-27 15:04:26 -07:00
evgen@moonbone.local
4f4711bd49 Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items. 
resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.

This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.
 2005-09-28 00:58:12 +04:00
guilhem@mysql.com
f5fc8f315e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-09-27 21:19:50 +02:00
serg@serg.mylan
6716d16bc7 CHECKSUM TABLE now allows concurrent inserts 2005-09-27 20:11:09 +02:00
pem@mysql.com
2f3682db7e Fixed BUG#12589: Assert when creating temp. table from decimal stored 
procedure variable
  Second version, after review.
  Keep the unsigned_flag in Item_decimal updated. Note that this also changed
  the result of several old test results - creating tables from decimal
  templates now gives unsigned columns and different sizes. (Several tests
  had Length > Max_length before.)
 2005-09-27 17:07:28 +02:00
guilhem@mysql.com
ff99183051 Fix for BUG#13527 "mysql-test-run.pl truncates var/log/*.err several times during one testsuit run" 2005-09-27 16:55:23 +02:00
msvensson@neptunus.(none)
1105d4293d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
 2005-09-27 16:48:41 +02:00
ingo@mysql.com
a3618b128b Merge mysql.com:/home/mydev/mysql-4.0-4000 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-27 15:42:14 +02:00
ingo@mysql.com
d005299a57 Bug#9112 - Merge table with composite index producing invalid results with some queries 
Reduced the precision of the test numbers.
Not all platforms could reproduce the exact numbers.
 2005-09-27 15:26:16 +02:00
hf@deer.(none)
f0dfa19548 additional fix for bug #13372 (decimal union) 2005-09-27 16:23:37 +05:00
hf@deer.(none)
9b88d25247 additional fix to the bug #13372 (decimal union) 2005-09-27 15:31:38 +05:00
hf@deer.(none)
7f3e2dc48d Fix for bug #13372 (decimal union) 2005-09-27 15:11:39 +05:00
igor@rurik.mysql.com
6e2fb27af6 item.cc: 
Fixed bug #13410.
  Fixed name resolution for qualified reference to a view column
  in the HAVING clause.
view.result, view.test:
  Added a test case for bug #13410.
 2005-09-26 23:29:02 -07:00
patg@krsna.patg.net
8864a9b3c4 BUG #7815 
Changes per serg to http://lists.mysql.com/internals/30281

Re-enabled --delayed-insert
 2005-09-26 22:43:09 -07:00
igor@rurik.mysql.com
75c43f9663 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-09-26 20:28:49 -07:00
igor@rurik.mysql.com
a43b341c8a sql_base.cc, item.cc: 
Fixed bug #13411.
  Fixed name resolution for non-qualified reference to a view column
  in the HAVING clause.
view.result, view.test:
  Added a test case for bug #13411.
 2005-09-26 20:18:59 -07:00
pem@mysql.com
6a84506af7 Fixed BUG#7049: Stored procedure CALL errors are ignored 
Search the chain of sp_rcontexts recursively for handlers. If one is found,
  it will be detected in the sp_head::execute() method at the corresponding
  level.
 2005-09-26 18:46:31 +02:00
pem@mysql.com
6ac4c47f7b Fixed BUG#6127: Stored procedure handlers within handlers don't work 
Replaced the dumb in-handler/not-in-handler check with a proper recursion
    check of handlers being executed.
    (Re-commit in a different tree, to make push possible.)
 2005-09-26 18:22:00 +02:00
evgen@moonbone.local
0061782cd0 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13424-bug-5.0-mysql
 2005-09-26 19:45:05 +04:00
evgen@moonbone.local
0032165acf Fix bug #13424 locking view with query cache enabled crashes server 
For LOCK view is opened but not prepared thus leaving 'table' field set to
NULL. invalidate_locked_for_write() wasn't checking that and call to 
invalidate_table(NULL) crashes server.

To invalidate_locked_for_write() added check that ensures that table is
completely opened.
 2005-09-26 19:08:26 +04:00
ingo@mysql.com
2ebea0d31b Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-26 13:13:29 +02:00
hf@deer.(none)
836bc2638e Fix for bug #12267 (primary key over GEOMETRY field) 2005-09-26 14:55:52 +05:00
hf@deer.(none)
953848b855 Merging 2005-09-26 14:17:30 +05:00
hf@deer.(none)
6890eae9e5 Merging 2005-09-26 13:15:01 +05:00
ingo@mysql.com
6c70281789 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-09-26 09:56:18 +02:00
ingo@mysql.com
f8203e8765 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-26 09:18:31 +02:00
monty@mysql.com
ea6d5f9ec3 Fixed error found during review of new pushed code 2005-09-25 21:22:23 +03:00
serg@serg.mylan
4b24f83f8f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-25 16:07:13 +02:00
ingo@mysql.com
95fa3340c6 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-09-25 15:51:28 +02:00
serg@serg.mylan
86ad035270 test case fixed to pass w/o innodb 2005-09-25 15:44:05 +02:00