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

15802 commits

Author SHA1 Message Date
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
33eccd0c1e WL 2826: Error handling of ALTER TABLE for partitioning 
Fixed merge issue
 2006-04-22 04:38:19 -04:00
dlenev@mysql.com
5e7076ce95 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg15153-2
 2006-04-22 11:56:15 +04:00
dlenev@mysql.com
c77d5a0ed1 Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs". 
Error was emitted when one tried to select information from view which used
merge algorithm and which also had CONVERT_TZ() function in its select list.

This bug was caused by wrong assumption that global table list for view
which is handled using merge algorithm begins from tables belonging to
the main select of this view. Nowadays the above assumption is not true only
when one uses convert_tz() function in view's select list, but in future
other cases may be added (for example we may support merging of views
with subqueries in select list one day). Relying on this false assumption
led to the usage of wrong table list for field lookups and therefor errors. 

With this fix we explicitly use pointer to the beginning of main select's
table list.
 2006-04-22 11:54:25 +04:00
jimw@mysql.com
99b2d44c9c Bug #18607: LOAD DATA FROM MASTER fails because of INFORMATION_SCHEMA database 
Simply exclude INFORMATION_SCHEMA from LOAD DATA FROM MASTER just like
  we exclude the `mysql` database.

  There's no test for this, because it requires an unfiltered 'LOAD DATA
  FROM MASTER' which is too likely to cause chaos (such as when running
  the test suite against an external server).
 2006-04-21 18:26:39 -07:00
elliot@mysql.com
35041a35bd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge
 2006-04-21 21:04:43 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fd799cf6f5 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 16:26:34 -04:00
elliot@mysql.com
c13fc693fe After merge fixes. 2006-04-21 14:21:17 -04:00
andrey@lmy004.
c10865e929 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-new-clean
 2006-04-21 20:49:54 +03:00
elliot@mysql.com
b02185c5bd Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge
 2006-04-21 13:20:15 -04:00
tomas@poseidon.ndb.mysql.com
7bbf39cd0f ndb: minor modification in replication timer code 
added missing setting of latest applied epoch
 2006-04-21 18:28:00 +02:00
igor@rurik.mysql.com
510ab81362 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  rurik.mysql.com:/home/igor/mysql-4.1
 2006-04-21 08:22:03 -07:00
igor@rurik.mysql.com
639e875032 Post merge fixes 2006-04-21 08:19:38 -07:00
kroki@mysql.com
b0c1e49a11 Bug#15728: LAST_INSERT_ID function inside a stored function returns 0 
Do not reset value of LAST_INSERT_ID() in sub-statement.
 2006-04-21 18:55:04 +04:00
tomas@poseidon.ndb.mysql.com
e38f6bc590 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 16:42:31 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fa3c74b420 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 09:30:05 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
4d0a4e1199 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-21 08:57:53 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dc8a0bd64d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
 2006-04-21 08:55:01 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
fe46ee9111 BUG#18962: Crash of ALTER TABLE .. DROP PARTITION ... 
Review fixes
 2006-04-21 08:37:09 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
6473c10445 WL 2826: Error handling of ALTER TABLE for partitioning 
Final review fixes
 2006-04-21 08:35:25 -04:00
pem@mysql.com
8532fa29f4 Post-push fix for BUG#18344: DROP DATABASE does not drop associated routines 
Fixed windows compile error in sql/sp.cc (missing cast to byte*)
 2006-04-21 14:30:44 +02:00
ramil@production.mysql.com
aed861fd86 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18643
 2006-04-21 13:56:40 +02:00
tomas@poseidon.ndb.mysql.com
7dbc18bd07 ndb: corrected install dir 
ndb: corrected initialization of records
 2006-04-21 13:51:58 +02:00
tomas@poseidon.ndb.mysql.com
fa21279e8e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-21 11:32:25 +02:00
pem@mysql.com
8c5ae25ff5 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18344/mysql-5.0-runtime
 2006-04-21 10:22:06 +02:00
igor@rurik.mysql.com
37ac782206 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-21 00:36:20 -07:00
ramil@mysql.com
b9fc8e1f69 Bug #17896: MIN of CASE WHEN returns non-minimum value! 
- after review fixes
 2006-04-21 11:48:00 +05:00
igor@rurik.mysql.com
fd3e924164 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-04-20 22:34:37 -07:00
igor@rurik.mysql.com
fc7514151f Fixed bug #18767. 
The bug caused wrong result sets for union constructs of the form
(SELECT ... ORDER BY order_list1 [LIMIT n]) ORDER BY order_list2.
For such queries order lists were concatenated and limit clause was
completely neglected.
 2006-04-20 22:15:38 -07:00
jimw@mysql.com
ec00b92f48 Bug #12792: @@system_time_zone is not SELECTable 
Bug #15684: @@version_* are not all SELECTable

  Added the appropriate information as read-only system variables, and
  also removed some special-case handling of @@version along the way.

  @@version_bdb was added, but isn't included in the test because it
  depends on the presence of BDB.
 2006-04-20 21:56:53 -07:00
jimw@mysql.com
4d392fb9f4 Bug #16195: SHOW VARIABLES doesn't report correctly sql_warnings and sql_notes values 
SQL_WARNINGS and SQL_NOTES were being displayed with SHOW_BOOL, but they
  are system variables that need SHOW_SYS to be used.
 2006-04-20 20:41:12 -07:00
brian@zim.(none)
f48b10f340 Dean noticed that constant flush calls caused the archive stream file to flush empty buffers. This patch removes that behavior. 2006-04-20 18:23:04 -07:00
igor@rurik.mysql.com
1afc70d03e Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-2
 2006-04-20 17:00:29 -07:00
igor@rurik.mysql.com
0a65106cfb Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-20 16:14:17 -07:00
evgen@moonbone.local
663fee9c05 Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode. 
The SQL standard doesn't allow to use in HAVING clause fields that are not 
present in GROUP BY clause and not under any aggregate function in the HAVING
clause. However, mysql allows using such fields. This extension assume that 
the non-grouping fields will have the same group-wise values. Otherwise, the 
result will be unpredictable. This extension allowed in strict 
MODE_ONLY_FULL_GROUP_BY sql mode results in misunderstanding of HAVING 
capabilities.

The new error message ER_NON_GROUPING_FIELD_USED message is added. It says
"non-grouping field '%-.64s' is used in %-.64s clause". This message is
supposed to be used for reporting errors when some field is not found in the
GROUP BY clause but have to be present there. Use cases for this message are 
this bug and when a field is present in a SELECT item list not under any 
aggregate function and there is GROUP BY clause present which doesn't mention 
that field. It renders the ER_WRONG_FIELD_WITH_GROUP error message obsolete as
being more descriptive.
The resolve_ref_in_select_and_group() function now reports the 
ER_NON_GROUPING_FIELD_FOUND error if the strict mode is set and the field for 
HAVING clause is found in the SELECT item list only.
 2006-04-21 01:52:59 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
a3f152cc6e Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962
 2006-04-20 14:16:27 -04:00
konstantin@mysql.com
f14040e4d8 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-04-20 20:49:41 +04:00
igor@rurik.mysql.com
18149be57c Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-20 07:24:34 -07:00
tnurnberg@mysql.com
d91e49d5d8 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/mysql-5.0-maint
 2006-04-20 16:17:36 +02:00
pem@mysql.com
2dc3026c08 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime
 2006-04-20 16:00:33 +02:00
tomas@poseidon.ndb.mysql.com
c73d00dcf9 Bug #19214 running mysqld without binlog causes 10s timeout to drigger on schema ops 
- binlog thread should not wait for apply status share if binlog is not enabled
 2006-04-20 14:44:16 +02:00
mskold@mysql.com
15ca6daf6f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-20 11:11:21 +02:00
igor@rurik.mysql.com
692da27388 Post merge fix 2006-04-20 00:42:12 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14d75e5b9f WL 2826: Error handling of ALTER TABLE for partitioning 
Fixed up create_handler_files call
 2006-04-19 21:43:30 -04:00
igor@rurik.mysql.com
7b0373a557 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:27:18 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
09e95da616 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-19 21:22:35 -04:00
tomas@poseidon.ndb.mysql.com
78f91e4cc1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-20 03:20:03 +02:00
igor@rurik.mysql.com
27cc6f4bc3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:08:15 -07:00
tomas@poseidon.ndb.mysql.com
2d74fc6d50 ndb uncomitted row count cont'd, applying new fix since last one was no good 2006-04-20 03:05:50 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c9085e5189 WL2826: Error handling of ALTER TABLE for partitioning 
Actual error reported in my_errno from my_delete
 2006-04-19 20:57:42 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
dd257b22dc WL 2826: Error handling of ALTER TABLE for partitioning 
Various bug fixes (mostly mixed to and from in replace methods)
 2006-04-19 20:04:00 -04:00
tnurnberg@mysql.com
cd5af2ba70 Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()" 
fixlet corrects return to DBUG_RETURN to restore the balance.
 2006-04-20 01:02:33 +02:00
tnurnberg@mysql.com
f08eb57b26 debugging a BK issue 2006-04-20 00:55:30 +02:00
tomas@poseidon.ndb.mysql.com
4bd495e595 small correction in thd_ndb hash_init 2006-04-19 23:49:51 +02:00
jimw@mysql.com
b57eb9e17c Merge mysql.com:/home/jimw/my/mysql-5.0-17043 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-19 14:18:35 -07:00
tnurnberg@mysql.com
d42d01b9ea Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()" 
fixlet corrects return to DBUG_RETURN to restore the balance.
 2006-04-19 22:56:48 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
0a053c3d8c Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-wl2826 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
 2006-04-19 16:19:21 -04:00
jimw@mysql.com
ff7717e090 Merge mysql.com:/home/jimw/my/mysql-5.1-old-scripts 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-19 13:11:58 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
f78195049d WL 2826: Error handling of ALTER TABLE for partitioning 
Fixed a number of bugs
 2006-04-19 16:08:59 -04:00
tomas@poseidon.ndb.mysql.com
b091805e01 corrected wrong usage of hash 2006-04-19 21:30:22 +02:00
tomas@poseidon.ndb.mysql.com
65cee73399 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 19:56:52 +02:00
svoj@april.(none)
806cd41529 Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption 
After a locking error the open table(s) were not fully
cleaned up for reuse. But they were put into the open table
cache even before the lock was tried. The next statement
reused the table(s) with a wrong lock type set up. This
tricked MyISAM into believing that it don't need to update
the table statistics. Hence CHECK TABLE reported a mismatch
of record count and table size.

Fortunately nothing worse has been detected yet. The effect
of the test case was that the insert worked on a read locked
table. (!)

I added a new function that clears the lock type from all
tables that were prepared for a lock. I call this function
when a lock failes.

No test case. One test would add 50 seconds to the
test suite. Another test requires file mode modifications.
I added a test script to the bug report. It contains three
cases for failing locks. All could reproduce a table
corruption. All are fixed by this patch.

This bug was not lock timeout specific.
 2006-04-19 22:54:25 +05:00
igor@rurik.mysql.com
a6be98b8a8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-19 10:45:06 -07:00
konstantin@mysql.com
6d277eb89d Merge mysql.com:/opt/local/work/tmp_merge 
into  mysql.com:/opt/local/work/mysql-5.1-merge
 2006-04-19 21:12:24 +04:00
tomas@poseidon.ndb.mysql.com
a1a8db8444 removed use of local data in local cache in preparation for removing local cache usage all together 2006-04-19 18:29:25 +02:00
mikron@c-2709e253.1238-1-64736c10.cust.bredbandsbolaget.se
f3452dfd4d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-wl2826 
into  c-2709e253.1238-1-64736c10.cust.bredbandsbolaget.se:/Users/mikron/wl2826
 2006-04-19 18:05:45 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
22ed19e434 WL 2826: Error handling of ALTER TABLE for partitioning 
Moved error inject from being flags to compiler to being part of config.h
Also error inject only defined if debug is also defined
+Small fixes
 2006-04-19 12:05:44 -04:00
dlenev@mysql.com
19e558a09d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg16021
 2006-04-19 19:35:32 +04:00
tomas@poseidon.ndb.mysql.com
0ebba697d8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-19 14:58:42 +02:00
tomas@poseidon.ndb.mysql.com
928514cf80 BUG#18094 Slave caches invalid table definition after atlters causes select failure 
- return correct object status from ndb dictionary
- check for validity of index retrieved from index, and retry if invalid
 2006-04-19 14:54:39 +02:00
mats@mysql.com
04fc2d9eb8 Merge mysql.com:/home/bkroot/mysql-5.1-new 
into  mysql.com:/home/bk/b17400-mysql-5.1-new
 2006-04-19 10:58:44 +02:00
bar@mysql.com
a26f115a13 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 11:42:41 +05:00
bar@mysql.com
9686848d64 item_xmlfunc.cc: 
After review minor fixes for bug#16319
  Thanks to Gluh for suggestions.
 2006-04-19 11:11:47 +05:00
bar@mysql.com
cedafc30e8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 09:50:17 +05:00
bar@mysql.com
004854fbdd Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-19 09:22:04 +05:00
andrey@lmy004.
48027b2dbc fix for bug #19170 (Event creation leads to 100% CPU usage) 2006-04-18 22:21:43 +03:00
msvensson@neptunus.(none)
210af244b2 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564
 2006-04-18 17:07:35 +02:00
mikron@c-ae09e253.1238-1-64736c10.cust.bredbandsbolaget.se
eb60344d78 WL 2826: Error handling of ALTER TABLE for partitioning 
Use \0 to indicate frm-file
Add more comments
Add more #ifdef code missing previously
 2006-04-18 16:58:12 +02:00
pem@mysql.com
9eb230f9bd Fixed BUG#18344: DROP DATABASE does not drop associated routines 
We must use the db key length in sp_drop_db_routines (and not the
  number of characters), or long db names will be truncated in the key.
 2006-04-18 16:01:01 +02:00
pem@mysql.com
868ffcca86 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18787/mysql-5.0-runtime
 2006-04-18 11:20:18 +02:00
pem@mysql.com
504bbe4917 Post-review fix for BUG#18787. Renamed a local variable in 
Item_func_sp::tmp_table_field() to something more descriptive.
 2006-04-18 11:16:39 +02:00
pem@mysql.com
a6fbde9db7 Fixed BUG#18949: Test case sp-goto is disabled 
Removed sp-goto.test, sp-goto.result and all (disabled) GOTO code.
  Also removed some related code that's not needed any more (no possible
  unresolved label references any more, so no need to check for them).
  NB: Keeping the ER_SP_GOTO_IN_HNDLR in errmsg.txt; it might become useful
      in the future, and removing it (and thus re-enumerating error codes)
      might upset things. (Anything referring to explicit error codes.)
 2006-04-18 11:07:34 +02:00
msvensson@neptunus.(none)
030de4f912 Merge 192.168.0.20:mysql/bug13310/my50-bug13310 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-18 10:55:57 +02:00
msvensson@shellback.(none)
13062cbad6 BUG#13310 incorrect user parsing by SP 
- Strip surrounding ''s from username when a new user connects. There
   is no user 'a@', it should be a@
 2006-04-18 10:46:17 +02:00
mskold@mysql.com
a8d4eb8c34 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-18 09:00:02 +02:00
mskold@mysql.com
2a924b8c15 Invalidate old table at rename 2006-04-18 08:57:37 +02:00
petr@mysql.com
de97f94a49 fix for Bug#18848 "SIGHUP crashes the server" (v2) 2006-04-18 08:43:13 +04:00
jimw@mysql.com
c104ea0960 Delete unused (and unmaintained) scripts. 2006-04-17 20:01:07 -07:00
igor@rurik.mysql.com
e178ec2fc8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-17 16:40:16 -07:00
jimw@mysql.com
7e573aa5d0 Merge mysql.com:/home/jimw/my/mysql-5.1-19059 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-17 10:06:17 -07:00
jimw@mysql.com
80b8563690 Bug #19059: Failure to get version information when running from source tree 
Fix the way that instance manager finds the version number of instances,
  so that it works properly when the executable name isn't the same as what
  the instance-manager launched, such as when wrapping a libtool-wrapped
  executable from the source tree.

  This removes the 'Ver ' reported in the version column output by
  'SHOW INSTANCE STATUS ...', but the format of this column is not
  documented (and is pretty free-form to begin with).
 2006-04-17 09:38:50 -07:00
bar@mysql.com
a9e3092102 item_timefunc.cc: 
5.0 additional fix for b#18691
  Handle DECIMAL the same with INT and REAL.
 2006-04-17 15:36:25 +05:00
bar@mysql.com
3fef2ba6aa Merge mysql.com:/usr/home/bar/mysql-4.1.b18691 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-04-17 15:01:55 +05:00
bar@mysql.com
faee72a936 Bug#18170: XML: ExtractValue(): XPath expression can't use QNames (colon in names) 
Problem source:
Qualified names (aka QName) didn't work as tag names and attribute names,
because the parser lacked a real rule to scan QName, so it understood
only non-qualified names without prefixes.

Solution:
New rule was added to check both "ident" and "ident:ident" sequences.
 2006-04-17 11:49:20 +05:00
brian@zim.(none)
98f2cd4468 Fixed a few pieces around support for data directory. 2006-04-16 21:55:02 -07:00
brian@zim.(none)
79a50551cb Adding back support for loadable engines. 2006-04-16 13:08:14 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
8ae26a2868 WL 2826: Error handling of ALTER TABLE for partitioning 
After review changes
 2006-04-15 21:49:13 -04:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
svoj@april.(none)
8a7adb196d Merge april.(none):/home/svoj/devel/mysql/BUG17917/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/BUG17917/mysql-5.0
 2006-04-15 16:08:03 +05:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
d73e985ac1 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-14 17:50:32 -04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd868aecbb Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
 2006-04-14 17:48:27 -04:00
cmiller@zippy.(none)
4671650387 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

(With hand-merged tests.)
 2006-04-14 11:38:09 -04:00
evgen@moonbone.local
bc1f457194 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14169-bug-4.1-mysql
 2006-04-14 17:25:58 +04:00
bar@mysql.com
e75d52711a Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-14 13:57:46 +05:00
bar@mysql.com
ed6899c64f Merge mysql.com:/usr/home/bar/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-14 13:34:18 +05:00
bar@mysql.com
941e529c59 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b18691
 2006-04-14 13:30:47 +05:00
bell@sanja.is.com.ua
5c7955bd54 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-14 02:02:28 +03:00
konstantin@mysql.com
b5863b3987 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-14 02:38:41 +04:00
bell@sanja.is.com.ua
8136b25811 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-14 00:17:50 +03:00
bell@sanja.is.com.ua
efb8b990e4 The check for recursive view definitions added. (BUG#14308) 2006-04-13 23:12:26 +03:00
konstantin@mysql.com
6f51b4199f Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-14 00:07:04 +04:00
aelkin@dl145j.mysql.com
b6992dd4c5 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
 2006-04-13 20:55:51 +02:00
igor@rurik.mysql.com
dbd87b39c0 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-13 08:41:15 -07:00
ingo@mysql.com
56d414b057 Bug#18129 - Fast (online) add index leaves temporary table frm in case of errors 
ALTER TABLE temporarily creates a new table with a .frm
file and optionally other files. For fast ALTER TABLE
only the .frm file is created. If the operation succeeds,
The temporary files are renamed to their final target.

In case of an error, the temporary file was forgotten to
remove.

Manually tested. The test requires to look at files,
which I think cannot be done portably with the test suite.
The test file is attached to the bug report.
 2006-04-13 16:19:19 +02:00
serg@serg.mylan
3acc678101 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-04-13 15:34:39 +02:00
bell@sanja.is.com.ua
014914cbcf Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-13 16:01:08 +03:00
bell@sanja.is.com.ua
cb81389aef Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-13 15:07:50 +03:00
grog@mysql.com
da6210ee61 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/MySQL/5.0-Bug-17248a
 2006-04-13 21:37:49 +09:30
sergefp@mysql.com
34b2ed5f7f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.0-csc9139
 2006-04-13 16:07:48 +04:00
sergefp@mysql.com
1d3a0c0ec8 BUG#19021, Crash in ROR-index_merge optimizer: 
get_best_covering_ror_intersect() was copying ror_scans starting from the 
end of the array and not from its beginning.
 2006-04-13 16:05:32 +04:00
ramil@mysql.com
2398882097 Fix for bug #18643: crazy UNCOMPRESS(). 2006-04-13 16:19:21 +05:00
konstantin@mysql.com
b915f054cf Fix a typo in the help message. 2006-04-13 14:06:46 +04:00
tomas@poseidon.ndb.mysql.com
07753c59a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-13 10:48:24 +02:00
serg@serg.mylan
e3b9c80449 fix for distcheck 2006-04-13 09:57:51 +02:00
grog@mysql.com[grog]
3eb783813f foo2 2006-04-13 17:22:56 +09:30
grog@mysql.com[grog]
b2cd3a963a foo1 2006-04-13 17:20:33 +09:30
tomas@poseidon.ndb.mysql.com
66f745cd01 wrong ndb object used to drop event operation causing DBUG_ASSERT in shutdown/cleanup 2006-04-13 09:37:43 +02:00
bar@mysql.com
45293fc346 Bug#18691: Converting number to UNICODE string returns invalid result. 
Conversion from int and real numbers to UCS2 didn't work fine: 
CONVERT(100, CHAR(50) UNICODE)
CONVERT(103.9, CHAR(50) UNICODE)

The problem appeared because numbers have binary charset, so,
simple charset recast binary->ucs2 was performed
instead of real conversion.

Fixed to make numbers pretend to be non-binary.
 2006-04-13 10:55:48 +05:00
igor@rurik.mysql.com
316eeff690 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-12 16:14:20 -07:00
konstantin@mysql.com
c49e6f8869 Post-merge fixes. Add a new error message for max_prepared_stmt_count 
limit.
 2006-04-13 01:46:44 +04:00
igor@rurik.mysql.com
fb75fcde65 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-04-12 13:23:11 -07:00
mats@mysql.com
405ebbf231 Bug#17400 (Cluster Replication: Delete and update of row w/o PK fails): 
Restarting scan after call to delete_row().
 2006-04-12 21:19:24 +02:00
evgen@moonbone.local
ac54aa2aee Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was 
used

In a simple queries a result of the GROUP_CONCAT() function was always of 
varchar type.
But if length of GROUP_CONCAT() result is greater than 512 chars and temporary
table is used during select then the result is converted to blob, due to
policy to not to store fields longer than 512 chars in tmp table as varchar
fields.

In order to provide consistent behaviour, result of GROUP_CONCAT() now
will always be converted to blob if it is longer than 512 chars.
Item_func_group_concat::field_type() is modified accordingly.
 2006-04-12 23:05:38 +04:00
tomas@poseidon.ndb.mysql.com
4a5f9b47b9 ndb: 
freeing non freed objects on server shutdown
corrected timeout handling on schema events
 2006-04-12 18:01:19 +02:00
kroki@mysql.com
c8e22ff70b Bug#16461: connection_id() does not work properly inside trigger 
CONNECTION_ID() was implemented as a constant Item, i.e. an instance of
Item_static_int_func class holding value computed at creation time.
Since Items are created on parsing, and trigger statements are parsed
on table open, the first connection to open a particular table would
effectively set its own CONNECTION_ID() inside trigger statements for
that table.

Re-implement CONNECTION_ID() as a class derived from Item_int_func, and
compute connection_id on every call to fix_fields().
 2006-04-12 19:31:00 +04:00
konstantin@mysql.com
75792fc0dc Merge mysql.com:/opt/local/work/mysql-4.1-16365 
into  mysql.com:/opt/local/work/mysql-5.0-merge
 2006-04-12 18:30:54 +04:00
msvensson@neptunus.(none)
9cdd78078e Bug#18564 Test failure due to test not checking preconditions 
- Add variable "have_dynamic_loading" and use it to check if the udf test should be run.
 2006-04-12 15:13:16 +02:00
aelkin@mysql.com
a219eb292e #BUG18715 create view with replicate*ignore-table 
Fixed in parser. rpl_view gained no changes but rpl_view-slave.opt.
 2006-04-12 12:50:12 +03:00
mskold@mysql.com
a9123eeb13 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-12 08:48:50 +02:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
fa5e50943d BUG#18962: DROP PARTITION fails when partitions dropped for subpartitions with default naming procedure 
Fixed naming procedures for default partitioning and default subpartitioning
 2006-04-11 23:35:48 -04:00
jimw@mysql.com
b02463c15a Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-11 16:03:49 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
62d289a091 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
 2006-04-11 18:25:13 -04:00
jimw@mysql.com
7e96d6eeef Merge mysql.com:/home/jimw/my/mysql-5.1-17139 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-11 12:06:49 -07:00
marty@linux.site
7696f11b6c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/marty/MySQL/mysql-5.1-new
 2006-04-11 21:06:48 +02:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
77860367af Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
 2006-04-11 15:00:06 -04:00
igor@rurik.mysql.com
abc16b5b00 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-11 11:46:28 -07:00
ramil@mysql.com
62b85c1388 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14360
 2006-04-11 23:46:27 +05:00
aivanov@mysql.com
cb011af0b0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/bugs/mysql-5.0-merge
 2006-04-11 22:46:26 +04:00
igor@rurik.mysql.com
dfd8f0211c Fixed bug #18618. 
If the second or the third argument of a BETWEEN predicate was
a constant expression, like '2005.09.01' - INTERVAL 6 MONTH,
while the other two arguments were fields then the predicate 
was evaluated incorrectly and the query returned a wrong
result set.
The bug was introduced in 5.0.17 when in the fix for 12612.
 2006-04-11 10:03:37 -07:00
ingo@mysql.com
750af5a848 Merge mysql.com:/home/mydev/mysql-4.0 
into  mysql.com:/home/mydev/mysql-4.0-bug5390
 2006-04-11 18:55:24 +02:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
838254be52 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
 2006-04-11 09:36:02 -04:00