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

11860 commits

Author SHA1 Message Date
jimw@mysql.com
c61ce0d90d Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-15 18:59:18 -07:00
evgen@moonbone.local
52569ad519 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/mysql-4.1-bug-11868
 2005-07-16 05:59:17 +04:00
evgen@moonbone.local
81d93df1ae Fix bug#11868 NOT NULL ref optimization in subquery used in update must be 
disabled if ref is built with a key from the updated table

Problem was in add_not_null_conds() optimization function.
It contains following code:
JOIN_TAB *referred_tab= not_null_item->field->table->reginfo.join_tab;
...
add_cond_and_fix(&referred_tab->select_cond, notnull);
For UPDATE described in bug report referred_tab is 0 and dereferencing it
crashes the server.
 2005-07-16 05:31:16 +04:00
patg@krsna.patg.net
db1fb6a7e5 This is the same patch as 1.1937, with small variable declaration changes, memory 
deallocation cleanup
 2005-07-15 17:33:47 -07:00
jimw@mysql.com
6a18b7f1a2 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-15 16:29:15 -07:00
konstantin@mysql.com
68ab7f8e9f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2005-07-16 03:29:14 +04:00
jimw@mysql.com
d408fca40e Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-15 16:29:14 -07:00
reggie@linux.site
29ddf3af61 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  linux.site:/home/reggie/bk/bug7403
 2005-07-15 17:29:13 -06:00
konstantin@mysql.com
e08caeeee2 A fix and a test case for Bug#9359 "Prepared statements take snapshot 
of system vars at PREPARE time": implement a special Item
to handle system variables. This item substitutes itself with 
a basic constant containing variable value at fix_fields.
 2005-07-16 03:29:13 +04:00
evgen@moonbone.local
0298bc347a Fix bug#11482 4.1.12 produces different resultset for a complex query 
than in previous 4.1.x

Wrongly applied optimization were adding NOT NULL constraint which results in
rejecting valid rows and reduced result set.

The problem was that add_notnull_conds() while checking subquery were adding
NOT NULL constraint to left joined table, to which, normally, optimization 
don't have to be applied.
 2005-07-16 03:29:12 +04:00
bell@sanja.is.com.ua
b4a723e4d2 post merge changes: added safe_charset_converter to other static functions 2005-07-16 00:52:00 +03:00
bell@sanja.is.com.ua
8aad35f9d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
 2005-07-16 00:17:05 +03:00
bell@sanja.is.com.ua
6114bee47c stop evaluation constant functions in WHERE (BUG#4663) 
correct value of CURRENT_USER() in SP with "security definer" (BUG#7291)
 2005-07-16 00:01:44 +03:00
reggie@linux.site
95a5c8ef49 Merge linux.site:/home/reggie/bk/bug7403 
into  linux.site:/home/reggie/bk/mysql-5.0
 2005-07-15 12:15:45 -06:00
jimw@mysql.com
b4b874568b Merge mysql.com:/home/jimw/my/mysql-4.1-9979 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-15 10:52:22 -07:00
pem@mysql.com
7d7f34cf1c Fixed BUG#9538: SProc: Creation fails if we try to SET system variable 
using @@var_name in proc
  Made sure we don't lose the tokenizer state when swapping lex in during SET
  parsing.
 2005-07-15 17:24:19 +02:00
tomas@poseidon.ndb.mysql.com
d8a584f064 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-07-15 17:14:34 +02:00
tomas@poseidon.ndb.mysql.com
d0d82338cb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-07-15 15:40:15 +02:00
reggie@linux.site
f9adcc3cac Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  linux.site:/home/reggie/bk/bug7403
 2005-07-15 06:15:00 -06:00
tomas@poseidon.ndb.mysql.com
b144b920a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
 2005-07-15 14:14:59 +02:00
tomas@poseidon.ndb.mysql.com
f54afc792f Merge 2005-07-15 14:13:23 +02:00
tomas@poseidon.ndb.mysql.com
cd590a6a02 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
 2005-07-15 13:32:08 +02:00
ramil@mysql.com
cd20ee4361 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-07-15 16:27:59 +05:00
ramil@mysql.com
ffb7421955 NO_DEFAULT_VALUE_FLAG and BLOB_FLAG combined 2005-07-15 16:25:31 +05:00
ramil@mysql.com
b11d04e50a a fix (bug #9881: ALTER TABLE gives wrong error message with sql-mode TRADITIONAL). 2005-07-15 15:50:57 +05:00
reggie@linux.site
65a1d74fb1 added a comment referring to the bug report 2005-07-15 03:51:55 -06:00
konstantin@mysql.com
68fb78ca33 Improve a comment. 2005-07-15 13:21:08 +04:00
ramil@mysql.com
07d4f27195 Jim's fix for the #10443. 
Fix handling of floats and doubles when using prepared statements             
API in the embedded server.
 2005-07-15 11:17:57 +05:00
bell@sanja.is.com.ua
0f6e1380dc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-07-15 01:29:37 +03:00
bell@sanja.is.com.ua
a7834de02d take into account table lock mode when opening table: 
try to find most suitable table, to avouid pickup table with too low locking mode or occupy table with write mode for select when it will be need for update later
(BUG#9597)
 2005-07-15 01:22:14 +03:00
konstantin@mysql.com
60e7d6ff37 Post-merge fixes. 2005-07-15 00:41:58 +04:00
konstantin@mysql.com
3274b050bc Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-15 00:31:09 +04:00
konstantin@mysql.com
a2b11ff266 A fix and a test case for Bug#11299 "prepared statement makes wrong SQL 
syntax in binlog which stops replication":
disallow the use of parameter markers which can lead to generation
of malformed binlog queries.
 2005-07-15 00:01:49 +04:00
konstantin@mysql.com
4ede973594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
 2005-07-14 20:02:38 +04:00
konstantin@mysql.com
36810d25f3 Post-merge fixes. 2005-07-14 20:02:37 +04:00
konstantin@mysql.com
1da2b9b4d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
 2005-07-14 20:02:36 +04:00
konstantin@mysql.com
3f28ad8eb7 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 20:02:32 +04:00
konstantin@mysql.com
3892f1d298 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2005-07-14 20:02:31 +04:00
sergefp@mysql.com
86d3c07836 Merge mysql.com:/home/psergey/mysql-4.1-build-tree 
into mysql.com:/home/psergey/mysql-4.1-merge-from-build
 2005-07-14 16:02:30 +00:00
konstantin@mysql.com
9c6f14aa3d Get rid of checking for ETIME return value of pthread_cond_timedwait. 
ETIME was returned by cond_timedwait (sic, the pre-POSIX1001b function) on 
Solaris 2.6 and 2.7. pthread_cond_timedwait on Solaris returns ETIMEDOUT.
The standard requirement is that the only additional return value
of pthred_cond_timedwait compared to pthread_cond_wait is ETIMEDOUT.
Let us not bloat the application code with redundant checks,
and if we're ever to work on a platform that returns a non-standard 
value, we should write a wrapper for that platform (like we do, e.g., for
Windows).
 2005-07-14 19:42:56 +04:00
sergefp@mysql.com
0b3db181bf Fix for BUG#11869: In Item_func_match::fix_index() handle the case when there is no 
source table present (this happens for ORDER BY after UNION)
 2005-07-14 15:19:26 +00:00
sergefp@mysql.com
e1273aec6d Fix for BUG#11700: in add_not_null_conds(), call full fix_fields() for the created NOT NULL. 
This is needed because in some cases range optimization is performed twice and added 
  NOT NULL item must have correct const_table_map() value.
 2005-07-14 15:13:36 +00:00
bar@mysql.com
6fd6fa517b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-14 17:49:19 +05:00
bar@mysql.com
c64128cc58 item.cc: 
After merge fix.
 2005-07-14 17:48:17 +05:00
reggie@linux.site
adfa1a2596 Bug #7403 error "Forcing close of thread 1 user: 'xxx'" 
The problem was that on Windows, the socket was in a blocking state 
trying to read.  Setting killed=1 is not enough to break the 
socket out of it's read loop.   You have to cancel the read request
or close the socket (which close_connection does).
 2005-07-14 06:04:29 -06:00
konstantin@mysql.com
b51edd3775 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/media/sda1/mysql/mysql-5.0-10760-new
 2005-07-14 15:33:41 +04:00
konstantin@mysql.com
509531421c Implement MarkM optimization request to avoid redundnat packet exchange 
in cursors.
 2005-07-14 15:27:24 +04:00
konstantin@mysql.com
d4df2660c6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-root
 2005-07-14 15:14:40 +04:00
konstantin@mysql.com
62b8e6fdd1 A fix and a test case for Bug#9735. 
No separate typecode for MEDIUMTEXT/LONGTEXT is added, as we
have no sound decision yet what typecodes and for what types are
sent by the server (aka what constitutes a distinct type in MySQL).
 2005-07-14 15:13:23 +04:00
bar@mysql.com
7d405e3c65 Merge mysql.com:/usr/home/bar/mysql-4.1.num-conv 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-14 16:11:55 +05:00
gluh@eagle.intranet.mysql.r18.ru
f302759522 valgrind error fix(uninitialiased variable) 
removed unnecessary operation
 2005-07-14 15:42:36 +05:00
stewart@mysql.com
0e304e4d02 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-14 17:43:35 +10:00
stewart@mysql.com
dab8149226 Merge mysql.com:/home/stewart/Documents/MySQL/4.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
 2005-07-14 17:35:41 +10:00
stewart@mysql.com
d5cb88cec2 BUG#11384 drop database causes mysqld to core 
Only reproducable in 5.1-wl2325, although the missing code is missing from 4.0 and up.
 2005-07-14 17:33:35 +10:00
bar@mysql.com
1b612b0006 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.num-conv
 2005-07-14 10:46:15 +05:00
konstantin@mysql.com
3cf9a4c4fc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-14 01:39:40 +04:00
dlenev@mysql.com
200c751df8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-14 00:11:15 +04:00
dlenev@mysql.com
14b93bf18a Now when we create or drop trigger we will open only subject table and not 
all tables suggested by prelocking algorithm.
Added test for bug #11889 "Server crashes when dropping trigger using stored
routine" (which was fixed by previous patch).
 2005-07-13 23:51:09 +04:00
konstantin@mysql.com
b6da7f6227 Merge mysql.com:/opt/local/work/mysql-4.1-9379 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 23:49:45 +04:00
konstantin@mysql.com
1755df7649 A fix and a test case for Bug#9379 (collation of a parameter marker is 
binary).
 2005-07-13 23:43:46 +04:00
konstantin@mysql.com
f913594343 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 18:15:29 +04:00
konstantin@mysql.com
618f7d9449 Merge mysql.com:/opt/local/work/mysql-4.1-11458 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-07-13 18:05:57 +04:00
konstantin@mysql.com
374b9182af Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/opt/local/work/mysql-4.1-11458
 2005-07-13 17:39:48 +04:00
konstantin@mysql.com
bef558b7ee - a fix for Bug#11458 "Prepared statement with subselects return random 
data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in 
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong 
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.
 2005-07-13 17:38:55 +04:00
marko@hundin.mysql.fi
bf7b47d92e sql_update.cc: 
mysql_update(): Call handler::unlock_row()
  also in the first while loop.
  This patch is from Heikki,
  and it was approved by Sergei Golubchik.
 2005-07-13 16:13:36 +03:00
dlenev@mysql.com
4a5c65e146 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-13 16:43:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
acf417a7e6 Post-merge fix 2005-07-13 16:08:14 +05:00
dlenev@mysql.com
8a28d604f5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-mysqlproc
 2005-07-13 15:08:13 +04:00
gluh@mysql.com
b0ec1cd84e Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-07-13 16:08:13 +05:00
dlenev@mysql.com
f334ea1fc6 Implementation of Monty's idea: Now we can open mysql.proc table for lookup 
of stored routines definitions even if we already have some tables open and
locked. To avoid deadlocks in this case we have to put certain restrictions
on locking of mysql.proc table.

This allows to use stored routines safely under LOCK TABLES without explicitly
mentioning mysql.proc in the list of locked tables. It also fixes bug #11554
"Server crashes on statement indirectly using non-cached function".
 2005-07-13 13:48:13 +04:00
gluh@eagle.intranet.mysql.r18.ru
672e1f20cb Bug #9854 hex() and out of range handling 
added out of range handling
 2005-07-13 14:23:09 +05:00
gluh@eagle.intranet.mysql.r18.ru
9c3349f5c6 Fix for bug#11685 SHOW TABLES; doesn't update Com_show_tables 2005-07-13 13:30:39 +05:00
bar@mysql.com
5150fdcc04 ctype_utf8.result: 
adding test case
sql_table.cc:
  sql_table.cc:
  - do not create a new item when charsets are the same
  - return ER_INVALID_DEFAULT if default value cannot
    be converted into the column character set.
item.cc:
  - Allow conversion not only to Unicode,
    but also to and from "binary".
  - Adding safe_charset_converter() for Item_num
    and Item_varbinary, returning a fixed const Item.
 2005-07-13 13:00:17 +05:00
lars@mysql.com
30b76e5d78 Manual merge 2005-07-13 04:00:55 +02:00
lars@mysql.com
ca2e52a34f Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-13 02:39:24 +02:00
kent@mysql.com
aab8220342 Merge 2005-07-13 02:39:23 +02:00
evgen@moonbone.local
693c7272f0 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11709
 2005-07-13 04:39:22 +04:00
lars@mysql.com
6db2602ad0 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-13 02:13:04 +02:00
evgen@moonbone.local
bb1f81607c Merge 2005-07-12 23:24:35 +04:00
evgen@moonbone.local
de016ca78a Fix bug#11709 View was ordered by wrong column. 
When searching column to sort on, item was compared to field under view
column, but not the column itself. Because names of view column and underlaid
field may differ, it leads to possibly choosing wrong column for sorting on.

This patch makes Item_direct_view_ref::eq(Item *item,...) compare
item's name with it's own name proir to comparing to *ref item.
 2005-07-12 23:22:08 +04:00
igor@igor-inspiron.creware.com
db28fb113e view.test, view.result: 
Expanded the test case for bug #6120 to cover
  DROP VIEW / CREATE VIEW scenario.
sql_view.cc:
  Expanded the fix for bug #6120 to cover the case of
  DROP VIEW / CREATE_VIEW.
 2005-07-12 10:44:32 -07:00
igor@igor-inspiron.creware.com
7725eb3141 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-07-12 10:44:31 -07:00
sergefp@mysql.com
83b84bc393 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug11821-merge
 2005-07-12 17:44:30 +00:00
sergefp@mysql.com
32a4e52d97 Fix for BUG#11821 manually merged 2005-07-12 17:11:24 +00:00
evgen@moonbone.local
7d20cad2db Merge 2005-07-12 20:49:43 +04:00
evgen@moonbone.local
dc5949b336 Fix bug #11399 Column alias was lost during view preraration. 
New item created in find_field_in_table() to fix view's item, was created 
without taking into account original item's alias. This patch checks if alias 
is set to the original item and if so sets it to newly created item.
 2005-07-12 20:45:34 +04:00
reggie@linux.site
c31d71c065 Fixed some vio code that was using ___WIN__ instead of __WIN__ 2005-07-12 10:31:09 -06:00
jimw@mysql.com
60368919f9 Merge mysql.com:/home/jimw/my/mysql-4.1-11643 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-12 09:31:07 -07:00
lars@mysql.com
7d78f53e1c Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 18:31:05 +02:00
sergefp@mysql.com
55e70fd1f6 Fix for BUG#11821: Make Item_type_holder be able to work with MIN(field), 
MAX(field).
 2005-07-12 16:30:45 +00:00
reggie@linux.site
8a68788c39 Bug #7142 Show Fields from fails using Borland's dbExpress interface 
The problem here is that columns that have an especially long type 
such as an enum type with many options would be longer than 40 chars
but the type column returned from show columns always was defined
as varchar(40).

This is fixed in 5.0 using info schema.
 2005-07-12 08:35:30 -06:00
igor@igor-inspiron.creware.com
a0f594a8ef Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-07-12 05:31:06 -07:00
igor@igor-inspiron.creware.com
26ee0b2ef8 view.result, view.test: 
Added a test case for bug #11771.
item.h:
  Fixed bug #11771.
  Added method reset_query_id_processor to be able to adjust
  query_id for fields generated from * in queries like this:
  SELECT * FROM <view> ...
sql_base.cc:
  Fixed bug #11771.
  Adjusted query_id for fields generated from * in queries
  like this: SELECT * FROM <view> ...
 2005-07-12 05:18:05 -07:00
igor@igor-inspiron.creware.com
36945e144c Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-07-12 03:18:43 -07:00
bar@mysql.com
2204effda1 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-12 13:18:25 +05:00
lars@mysql.com
dc55af92ff BUG#6987: Added note when stat is failing on relay log, added mutex for log rotatation. 2005-07-12 06:01:26 +02:00
pem@mysql.com
8e7951a1c4 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-11 19:11:52 +02:00
pem@mysql.com
ee81c73a0d Post-review fix. 2005-07-11 19:10:51 +02:00
pem@mysql.com
b268a17866 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-11 19:01:14 +02:00
reggie@linux.site
7de0a01800 ha_archive.cc: 
Added cast to fix windows compile error
 2005-07-11 06:14:42 -06:00
bar@mysql.com
1042a275fe field_conv.cc: 
Identation fix
 2005-07-11 16:51:39 +05:00
pem@mysql.com
6f54e27e5e Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-11 12:46:42 +02:00
reggie@linux.site
d502f28f1c sql_insert.cc: 
Added cast to bool to fix windows compile problem
 2005-07-11 04:33:19 -06:00
bar@mysql.com
45fe5e74d8 field_conv.cc: 
Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
ctype_utf8.result, ctype_utf8.test:
  adding test case
 2005-07-11 13:20:07 +05:00
brian@brian-akers-computer.local
054e0e1712 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/optimize-5.0
 2005-07-10 22:27:36 -07:00
brian@brian-akers-computer.local
2ff7ce856b Fixed 32bit issue, reworked error logic for open tables, and redid the repair table code so that it uses the extended optimize table code. 2005-07-10 21:17:03 -07:00
brian@brian-akers-computer.local
85e2b662bf Refactoring of write_row() into two parts to allow future additions. Also rewrote the OPTIMIZE TABLE code, to add new extended optimize. This form of optimize rebuilds not only the file, but each individual row. 2005-07-10 18:19:37 -07:00
brian@zim.(none)
5b65be7b14 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/foo-5.0
 2005-07-10 10:04:13 -07:00
dlenev@mysql.com
4e8c22f296 Manual fixes after merging patch for bug #8406 "Triggers crash if referencing 
a table" with main tree.
 2005-07-09 23:11:17 +04:00
dlenev@mysql.com
75b8d4fa08 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg8406
 2005-07-09 22:04:18 +04:00
dlenev@mysql.com
923fe817e0 Enable support of access to tables from triggers. Thus fix bug #8406 "Triggers 
crash if referencing a table" and several other related bugs.
Fix for bug #11834 "Re-execution of prepared statement with dropped function
crashes server." which was spotted during work on previous bugs.

Also couple of nice cleanups:
- Replaced two separate hashes for stored routines used by statement with one.
- Now instead of doing one pass through all routines used in statement for
  caching them and then doing another pass for adding their tables to table
  list, we do only one pass during which do both things.
 2005-07-09 21:51:59 +04:00
brian@zim.(none)
9bd74f7e81 Fixed indention issue, made scan_rows an ha_rows type, and fixed show table status so archive rows are displayed as being compressed. 2005-07-09 08:57:08 -07:00
pem@mysql.com
5ce9198f20 Fixed BUG#11365: Stored Procedure: Crash on Procedure operation 
Two separate problems. A key buffer was too small in sp.cc for multi-byte
  fields, and the creation and fixing of mysql.proc in the scripts hadn't been
  updated with the correct character sets and collations (like the other
  system tables had).
  Note: No special test case, as the use of utf8 for mysql.proc will make
  any existing crash (if the buffer overrrun wasn't fixed).
 2005-07-08 16:33:15 +02:00
igor@igor-inspiron.creware.com
3c98b0132e Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/mysql-4.1
 2005-07-08 06:37:09 -07:00
kent@mysql.com
8295cec7bc sql_insert.cc: 
Use the test() macro instead of assigning a pointer to a bool
 2005-07-08 14:59:02 +02:00
pem@mysql.com
ce93689940 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-08 11:32:13 +02:00
jimw@mysql.com
de9909faec Fix crash caused by calling DES_ENCRYPT() without the --des-key-file 
option having been passed to the server. (Bug #11643)
 2005-07-07 11:49:44 -07:00
hf@deer.(none)
c7940aeb86 Fix for bug #8449(Silent column changes) 2005-07-07 21:47:18 +05:00
msvensson@neptunus.(none)
a8efd33aec Merge neptunus.(none):/home/msvensson/mysql/bug11635/my41-bug11635 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-07-07 18:21:20 +02:00
hf@deer.(none)
3ddd2771d6 Fix for bug #11708 (real function returns wrongly rounded decimal) 2005-07-07 20:28:47 +05:00
msvensson@neptunus.(none)
50133499b5 BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexes 
- Change output from SHOW CREATE TABLE to use USING instead of TYPE
 2005-07-07 14:44:28 +02:00
pem@mysql.com
312ea035ba Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-07 09:13:49 +02:00
bell@sanja.is.com.ua
bb9a634e5c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-07-07 09:25:16 +03:00
jimw@mysql.com
8e731bbede Fix typos that crept into ChangeSet for fix for Bug #11045. 2005-07-06 18:56:10 -07:00
jimw@mysql.com
f1ac600a7e Merge jwinstead@production.mysql.com:my/mysql-5.0-11045 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-06 16:49:04 -07:00
bell@sanja.is.com.ua
9f30fa2ce5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-07-06 23:24:51 +03:00
igor@igor-inspiron.creware.com
07db9dc85a Merge igor-inspiron.creware.com:/home/igor/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
 2005-07-06 09:14:44 -07:00
igor@igor-inspiron.creware.com
e5bd22ff06 view.result, view.test: 
Added a test case for bug #6120.
sql_view.cc:
  Fixed bug #6120.
  The SP cache must be invalidated when a view is altered.
 2005-07-06 09:00:17 -07:00
pem@mysql.com
18d6dd56ef Fixed BUG#7088: Stored procedures: labels won't work if character set is utf8. 
We used 'IDENT' for labels as a temporary fix for the  parser conflicts
  introduced if the proper rule 'ident' was used. Now a specially tailored
  'label_ident' rule is used for labels instead.
 2005-07-06 16:37:57 +02:00
bell@sanja.is.com.ua
8b71793766 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-07-06 16:59:56 +03:00
bell@sanja.is.com.ua
94ec658d6f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1
 2005-07-06 15:20:51 +03:00
mskold@mysql.com
9ef31a2825 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-06 13:10:12 +02:00
mskold@mysql.com
58703a4380 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-07-06 11:50:05 +02:00
mskold@mysql.com
458618d102 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-06 11:47:48 +02:00
mskold@mysql.com
fe73e69b4e Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-06 11:39:48 +02:00
marko@hundin.mysql.fi
e27338ac23 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0-current
 2005-07-06 12:29:20 +03:00
mskold@mysql.com
7063d85bf9 Fixed handling of failed primary key update in INSERT .. ON DUPLICATE KEY UPDATE .. 2005-07-06 11:23:36 +02:00
bell@sanja.is.com.ua
c41c8accd7 Merge 2005-07-06 11:36:27 +03:00
kent@mysql.com
f07ac780f8 init_db.sql: 
add new table privileges
Makefile.am:
  Include path to regex dir was accidently removed
 2005-07-06 10:16:36 +02:00
kent@mysql.com
512d130110 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-07-06 10:03:07 +02:00
marko@hundin.mysql.fi
006bb7bbc9 InnoDB: Make the srv_thread_concurrency checks more consistent. 2005-07-06 09:38:31 +03:00
dlenev@mysql.com
8a924ac456 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11394
 2005-07-06 10:21:27 +04:00
jimw@mysql.com
af5f5ab3ed Merge mysql.com:/home/jimw/my/mysql-5.0-6903 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-05 17:05:31 -07:00
jimw@mysql.com
2669b86612 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-05 15:23:13 -07:00
kent@mysql.com
ca420edc21 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-07-06 00:15:55 +02:00
kent@mysql.com
8e3b393d5c Merge 2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a Makefile.am: 
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
 2005-07-05 23:24:48 +02:00
jimw@mysql.com
9f654b806a Merge mysql.com:/home/jimw/my/mysql-4.1-11440 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-05 12:54:12 -07:00
jimw@mysql.com
81e50844b3 Merge mysql.com:/home/jimw/my/mysql-4.1-11330 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-05 12:51:16 -07:00
jimw@mysql.com
485f2c93c2 Merge mysql.com:/home/jimw/my/mysql-5.0-10214 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-05 09:47:20 -07:00