mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26682 commits 2784 branches 343 tags 1.6 GiB
Commit graph

6724 commits

Author SHA1 Message Date
elliot@mysql.com
588af40cda Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
 2005-09-14 16:16:04 -04:00
bell@sanja.is.com.ua
87a8fb4807 fixed portability 2005-09-14 23:12:01 +03:00
evgen@moonbone.local
ac32450609 Fix bug #11416 Server crash if using a view that uses function convert_tz 
When parser parses function convert_tz it loads available timezone tables in
thd->lex->time_zone_tables_used. But view have another lex that main query.
Thus time_zone_tables_used of main query left uninitialized.
When Item_func_conver_tz is fixed it takes timezone tables from main query
and later when it executed it assumes that timezone tables are loaded and
failed that assertion.
 2005-09-15 00:08:12 +04:00
elliot@mysql.com
86882cc8f9 Merge mysql.com:/home/emurphy/src/work/mysql-5.0-bug-12870 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
 2005-09-14 14:44:48 -04:00
elliot@mysql.com
8e7e17166c BUG#12870 (CREATE PROCEDURE followed by ROLLBACK is not replicated) 
Fixed by making CREATE/ALTER/DROP PROCEDURE cause implicit commit.
 2005-09-14 14:42:39 -04:00
aivanov@mysql.com
a42b5000ca Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-13000
 2005-09-14 20:32:59 +04:00
aivanov@mysql.com
53e90b53bc Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(), 
DAYOFWEEK(), and WEEKDAY().
 2005-09-14 20:25:00 +04:00
tulin@dl145c.mysql.com
129c98179b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-09-14 17:27:01 +02:00
bell@sanja.is.com.ua
d1c4241aa5 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-14 17:28:28 +03:00
tulin@dl145c.mysql.com
a8eb0f176b enabled mysqldump hex-blob option for bit fields 2005-09-14 15:46:31 +02:00
sasha@asksasha.com
a9a612f1b6 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
 2005-09-14 06:37:52 -06:00
sasha@asksasha.com
00eae49b5c fix for BUG#11139 (multi-delete with alias breaking replication if table rules are 
present): the problem originally was that the tables in auxilliary_tables did not have 
the correct real_name, which caused problems in the second call to tables_ok(). 
The fix corrects the real_name problem, and also sets the updating flag properly, 
which makes the second call to tables_ok() unnecessary.
 2005-09-14 06:31:38 -06:00
tulin@dl145c.mysql.com
f1e6ee04bc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-09-14 13:27:57 +02:00
petr@mysql.com
c1348ec13a Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-09-14 14:54:48 +04:00
bell@sanja.is.com.ua
4a18f890e6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-14 13:37:40 +03:00
tulin@dl145c.mysql.com
415ec2bf89 Bug #13152 bit fields and fileds that follow become corrupted when dumped from NDB tables 2005-09-14 11:41:36 +02:00
bell@sanja.is.com.ua
9388f7277c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-14 12:26:09 +03:00
pem@mysql.com
f698d25b3a Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-14 10:54:52 +02:00
pem@mysql.com
9cf77e404e Post-review fix for BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers 2005-09-14 10:54:02 +02:00
petr@mysql.com
d019da7dd8 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-09-14 12:42:23 +04:00
bell@sanja.is.com.ua
914b961d01 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
 2005-09-14 11:07:04 +03:00
bell@sanja.is.com.ua
71ffbbf81b part 1 (ver 2, postreview fix) of WL#2787 
view definer information syntax/storage/replication
fixed SOURCE field of .frm
 2005-09-14 10:53:09 +03:00
gluh@mysql.com
5549bc3329 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml
 2005-09-14 12:46:03 +05:00
pem@mysql.com
d825ed1a6b Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-14 09:43:02 +02:00
msvensson@neptunus.(none)
d5ae0825d9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
 2005-09-14 09:35:56 +02:00
gluh@mysql.com
2184915127 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.cml
 2005-09-14 12:11:19 +05:00
eric@mysql.com
ef06401549 Improvement to federated for BUG#12659 
Now many direct references to my_error() have been removed.
 2005-09-13 23:31:17 -07:00
msvensson@neptunus.(none)
7d78749320 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
 2005-09-14 08:10:18 +02:00
petr@mysql.com
5a097459f1 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-09-14 07:30:04 +04:00
petr@mysql.com
e8946265fc fix for Bug #12979 Stored procedures: crash if inout decimal parameter 2005-09-14 07:25:32 +04:00
monty@mishka.mysql.fi
31d8027e94 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.mysql.fi:/home/my/mysql-5.0
 2005-09-14 04:18:38 +03:00
monty@mishka.mysql.fi
e7d7b2c757 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.mysql.fi:/home/my/mysql-5.0
 2005-09-14 03:18:05 +03:00
monty@mishka.mysql.fi
d6ebc3bb34 Fixed wrong merge 2005-09-14 03:16:25 +03:00
monty@mishka.mysql.fi
9f22a16972 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.mysql.fi:/home/my/mysql-5.0
 2005-09-14 01:47:38 +03:00
monty@mishka.mysql.fi
f348f62cc3 Added option --valgrind-mysqltest to mysql-test-run 
Added flag to Field::store(longlong) to specify if value is unsigned.
This fixes bug #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
Fixed warning from valgrind in CREATE ... SELECT
Fixed double free of mysql.options if reconnect failed
 2005-09-14 01:41:44 +03:00
serg@serg.mylan
deb23f8691 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-13 23:26:54 +02:00
serg@serg.mylan
c74b0b0d0f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-13 22:04:06 +02:00
eric@mysql.com
671d63b6eb Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/eric/mysql-5.0
 2005-09-13 11:52:05 -07:00
evgen@moonbone.local
62fa6c5eae Merge 2005-09-13 22:22:51 +04:00
serg@serg.mylan
8427a10c01 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-13 19:51:13 +02:00
serg@serg.mylan
43ff196ada after pull review - many bugs in mysqldump --routines 2005-09-13 19:32:37 +02:00
eric@mysql.com
9944cbf8f6 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/eric/mysql-5.0
 2005-09-13 10:17:40 -07:00
petr@mysql.com
8f12dc9378 after-merge fix 2005-09-13 19:59:26 +04:00
msvensson@neptunus.(none)
0b8f8c2e6d Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
 2005-09-13 17:55:41 +02:00
pem@mysql.com
f31095f3d5 Fixed BUG#12712: SET AUTOCOMMIT should fail within SP/functions/triggers 
Second version after review. Allow 'set autocommit' in procedures, but not
  functions or triggers. Can return error in run-time (when a function calls
  a procedure).
 2005-09-13 17:16:12 +02:00
petr@mysql.com
e7c2da63da Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-09-13 18:54:47 +04:00
pem@mysql.com
5b8bfd4d95 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-13 15:40:04 +02:00
pem@mysql.com
b145ca0694 Fixed BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error 
get strange result
  according to Monty's suggestions, fixing the SELECT behaviour on errors
  with SP handlers. Note that some warnings from SELECT still shows up when
  the handler has caught - this is an effect of another known bug (BUG#7049).
 2005-09-13 15:32:42 +02:00
petr@mysql.com
dd036077ff Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-09-13 17:05:17 +04:00
msvensson@neptunus.(none)
1ea86dddce Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
 2005-09-13 14:46:42 +02:00
ramil@mysql.com
9a64991030 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-09-13 16:54:08 +05:00
ramil@mysql.com
f402871a5e Print a dummy section in order not to interference 
with /etc/my.cnf and ~/.my.cnf [client] section.
 2005-09-13 16:41:39 +05:00
petr@mysql.com
e9659d2159 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-09-13 15:17:52 +04:00
petr@mysql.com
d2b9085df8 Fix for Bug #13124 Stored Procedure using SELECT INTO crashes server 2005-09-13 15:15:38 +04:00
gluh@eagle.intranet.mysql.r18.ru
cc395fc0c2 Bug#9683 INFORMATION_SCH: Creation of temporary table allowed in 
Information_schema DB 
Bug#9846 Inappropriate error displayed while
         dropping table from 'INFORMATION_SCHEMA'
Bug#10734 Grant of privileges other than 'select' and 
         'create view' should fail on schema 
Bug#10708 SP's can use INFORMATION_SCHEMA as ROUTINE_SCHEMA

 cumulative fix for bugs above(after review, 2nd version)
 added privilege check for information schema db & tables
 2005-09-13 16:07:38 +05:00
pem@mysql.com
2865184ea2 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.0
 2005-09-13 12:53:12 +02:00
timour@mysql.com
dc935404c3 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-09-13 13:51:25 +03:00
pem@mysql.com
c76d5768a7 Fixed BUG#13133: Local variables in stored procedures are not initialized correctly. 
Have to init. all local variables in their frames, not just once at the beginning
  of invocation.
 2005-09-13 12:50:21 +02:00
msvensson@neptunus.(none)
8a296476c0 BUG#10713 mysqldump includes database in create view and referenced tables 
- Update test results
 - Updates after review
 2005-09-13 12:43:43 +02:00
msvensson@neptunus.(none)
d612caf39a Merge neptunus.(none):/home/msvensson/mysql/bug10713 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
 2005-09-13 09:41:01 +02:00
eric@mysql.com
1a79e25537 Made changes to add federated CONNECTION information to the .frm file 
(per Monty's patch).
Remove references to the "COMMENT" field.
WL#2414
 2005-09-12 18:02:17 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
cb55497bdb Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-13 01:11:55 +03:00
jmiller@mysql.com
9f573f0ac8 Adding comment for force manual merge 5.0 -> wl1012 2005-09-12 22:47:15 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
01ce8a8aa9 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-12 20:18:49 +03:00
timour@mysql.com
d0f585f11f BUG#12943 - post-merge fix 2005-09-12 19:18:17 +03:00
timour@mysql.com
54db60c080 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-12943
 2005-09-12 19:05:55 +03:00
gluh@mysql.com
c398940326 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
 2005-09-12 20:49:48 +05:00
monty@mishka.mysql.com
bdc33e2356 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mishka.mysql.com:/home/my/mysql-4.1
 2005-09-12 18:49:47 +03:00
monty@mishka.mysql.com
0965bfa832 Review fixes since last pull 
Fix for bug #13025; Server crash in filesort because wrong call to handler::position()
 2005-09-12 18:48:17 +03:00
bar@mysql.com
2315c4f224 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-09-12 19:38:53 +05:00
bar@mysql.com
833bccfe57 Many files: 
Adding esperanto collation
 2005-09-12 19:35:50 +05:00
timour@mysql.com
9d862db743 Fix for BUG#6808. 
The problem was in that add_table_to_list was testing for duplicate tables
in a list of tables that included the created view.
 2005-09-12 17:01:17 +03:00
gluh@mysql.com
d91fb61b37 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
 2005-09-12 17:33:21 +05:00
tulin@dl145c.mysql.com
e382a0fb12 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-09-12 14:11:28 +02:00
gluh@eagle.intranet.mysql.r18.ru
d9bd3c11e4 Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS 
produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists
 2005-09-12 17:09:19 +05:00
ramil@mysql.com
fa2cb2ae82 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12917
 2005-09-12 15:38:21 +05:00
bar@mysql.com
2f13c5c12c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12891
 2005-09-12 14:09:44 +05:00
lars@mysql.com
683edc6599 Reverted old fix with sync_slave_with_master and added a replace commands 
to eliminate nondeterminism in slave start
 2005-09-12 10:50:42 +02:00
ramil@mysql.com
c4ea0e2bf8 merging 2005-09-12 12:09:44 +05:00
timour@mysql.com
7205d3716c Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-dbg
 2005-09-12 09:34:58 +03:00
timour@mysql.com
6a528590d9 Fix for BUG#13067 "JOIN ... USING is case sensitive". 2005-09-12 08:28:53 +03:00
evgen@moonbone.local
75841099ca Fix bug #12993 View column rename broken in subselect 
When view column aliased in subselect alias is set on ref which represents
field. When tmp table is created for subselect, it takes name of original field
not ref. Because of this alias on view column in subselect is lost. Which
results in reported error.

Now when alias is set on ref, it's set on ref real item too.
 2005-09-12 02:46:35 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
afb613bd8e Merged from 4.1 2005-09-11 22:10:04 +03:00
lars@mysql.com
e5503c277f Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
 2005-09-11 13:46:36 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
91b6fe2679 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-11 11:07:56 +03:00
lars@mysql.com
f8594113cf Merge mysql.com:/users/lthalmann/bk/mysql-4.1-one_shot 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-09-11 01:23:08 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2917515afc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-09-10 18:41:37 +03:00
timour@mysql.com
7d24bdac22 Fix for BUG#12943. 
The problem was that in the first production in rule 'join_table', that
processes simple cross joins, the parser was processing the second join operand
before the first one due to unspecified priorities of JOINs. As a result in the
case of cross joins the parser constructed a tree with incorrect nesting:
the expression "t1 join t2 join t3 on some_cond" was interpreted as
"t1 join (t2 join t3 on some_cond)" instead of
"(t1 join t2) join t3 on some_cond".
Because of this incorrect nesting the method make_join_on_context picked an
incorrect table as the first table of the name resolution context.

The solution assignes correct priorities to the related production.
 2005-09-10 15:01:54 +03:00
patg@radha.local
f41aa04b59 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
 2005-09-10 01:50:38 +02:00
evgen@moonbone.local
94f5e80c86 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/12695-bug-4.1-mysql
 2005-09-10 02:31:42 +04:00
evgen@moonbone.local
99c0bf333c insert_select.result, insert_select.test: 
Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
 2005-09-10 02:30:26 +04:00
patg@radha.local
15bbf4d215 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
 2005-09-09 21:03:11 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ac95c9096b Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type 
Added test case.
 2005-09-09 20:02:13 +03:00
patg@radha.local
9faaeb2508 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
 2005-09-09 18:19:47 +02:00
serg@serg.mylan
3d7844ca89 merged 2005-09-09 12:43:25 +02:00
serg@serg.mylan
f16bb5da7e aftermerge 2005-09-09 12:15:25 +02:00
andrey@lmy004.
06fe0537c3 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 11:27:21 +02:00
sergefp@mysql.com
98fee7f289 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-merge
 2005-09-09 12:57:41 +04:00
sergefp@mysql.com
cd813a0911 Post-merge fixes 2005-09-09 12:57:00 +04:00
serg@serg.mylan
b69f49c0d5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-09 10:49:09 +02:00
andrey@lmy004.
13d3cf8ff6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 10:27:58 +02:00
ramil@mysql.com
9730b5369a A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client binaries). 2005-09-09 12:51:43 +05:00
sergefp@mysql.com
57c3ed9e1c Post-merge fixes 2005-09-09 11:50:38 +04:00
andrey@lmy004.
b7440b7a55 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 09:46:13 +02:00
serg@serg.mylan
c7eaac52b3 merged 2005-09-09 09:44:58 +02:00
andrey@lmy004.
f93c54205d Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 09:10:56 +02:00
sergefp@mysql.com
3d6759d190 Merge 4.1->5.0 2005-09-09 10:54:59 +04:00
sergefp@mysql.com
eac4388caf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12943
 2005-09-09 10:08:46 +04:00
serg@serg.mylan
819db2471c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-09-09 01:04:54 +02:00
igor@rurik.mysql.com
6bbdd66e89 olap.result, olap.test: 
Added a test case with VIEW for bug #12885.
 2005-09-08 15:45:31 -07:00
patg@radha.local
06d1582b98 BUG #12597 This is a complete patch (2nd) containing fixes per Serg's review 2005-09-09 00:03:07 +02:00
serg@serg.mylan
7e9646f05d Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-09-08 23:11:15 +02:00
serg@serg.mylan
a7f2179c29 BUG#12695: Item_func_isnull::update_used_tables did not update const_item_cache 2005-09-08 22:57:27 +02:00
igor@rurik.mysql.com
b2f0f9085f Manual merge 2005-09-08 13:45:49 -07:00
igor@rurik.mysql.com
bcae525685 Manual merge 2005-09-08 13:44:36 -07:00
patg@radha.local
4171c7435a Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
 2005-09-08 22:29:13 +02:00
igor@rurik.mysql.com
19192328f2 sql_select.cc: 
Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.
olap.test, olap.result:
  Added test case for bug #12885.
 2005-09-08 12:37:16 -07:00
andrey@lmy004.
1a46ea1057 fix for bug #12651 (item of a prepared query allocated on non-permanent 
are thus dangling later)
 2005-09-08 21:30:05 +02:00
timour@mysql.com
13d8179157 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-09-08 21:02:19 +03:00
patg@radha.local
4cb63e6b8b BUG #9056 Changes to patch #2 per Serg's review 2005-09-08 19:45:25 +02:00
timour@mysql.com
818e2a3e89 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-09-08 19:52:47 +03:00
petr@mysql.com
4a28ddac1c fix for Bug #12849 Stored Procedure: Crash on procedure call with CHAR type 'INOUT' parameter 
(recommit with the right Bug#)
 2005-09-08 18:25:42 +02:00
hf@deer.(none)
9ccb36049b Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12938
 2005-09-08 14:34:01 +05:00
timour@mysql.com
7fc6216e73 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-09-08 11:32:14 +03:00
timour@mysql.com
912aef9579 Fix for BUG#12977. 2005-09-08 11:29:52 +03:00
osku@127.(none)
1fd3dd53c3 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql/5.0/clean
 2005-09-08 11:28:54 +03:00
osku@127.(none)
08126a3688 Merge 127.(none):/home/osku/mysql/5.0/clean 
into  127.(none):/home/osku/mysql/5.0/12084
 2005-09-08 11:27:13 +03:00
SergeyV@selena.
95b5f7de0f Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  selena.:H:/MYSQL/src/#12517-mysql-4.1
 2005-09-08 12:12:21 +04:00
SergeyV@selena.
668f0e10fa Modified test case for bug #12517 2005-09-08 12:09:30 +04:00
igor@rurik.mysql.com
80484114d4 Manual merge 2005-09-07 18:06:14 -07:00
igor@rurik.mysql.com
1e6736b543 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-09-07 16:33:12 -07:00
aivanov@mysql.com
9c51a97e90 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-09-07 23:44:23 +04:00
evgen@moonbone.local
ff588b4732 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/12922-bug-5.0-mysql
 2005-09-07 23:33:32 +04:00
anozdrin@mysql.com
c1e570a441 Fix for Bug#12995: Inside function "Table 't4' was not locked with LOCK TABLES" 
Any form of HANDLER statement is forbidden from usage in stored procedures/functions.
 2005-09-07 23:03:56 +04:00
evgen@moonbone.local
f2d6282f6b Manual merge 2005-09-07 22:55:49 +04:00
evgen@moonbone.local
80c3a0b1b6 Fix bug #12922 if(sum(),...) with group from view returns wrong results 
Fields of view represented by Item_direct_view_ref. When complex expression
such as if(sum()>...,...) is splited in simpler parts by refs was ignored.
Beside this direct ref doesn't use it's result_field and thus can't store
it's result in tmp table which is needed for sum() ... group.
All this results in reported bug.

Item::split_sum_func2() now converts Item_direct_view_ref to Item_ref to
make fields from view being storable in tmp table.
 2005-09-07 22:38:36 +04:00
sergefp@mysql.com
e5b4252481 Fix for BUG#12637: Make SPs+user variables replication work: 
* Allocate thd->user_var_events elements on appropriate mem_root
* If several SP statements are binlogged as a single statement, collect all user var
  accesses they make (grep for StoredRoutinesBinlogging for details)
 2005-09-07 19:39:47 +04:00
aivanov@mysql.com
d6398c1aae Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-0
 2005-09-07 18:58:58 +04:00
aivanov@mysql.com
6ff3befd32 Merge mysql.com:/home/alexi/mysql-4.1 
into  mysql.com:/home/alexi/dev/mysql-4.1-0
 2005-09-07 18:55:33 +04:00
msvensson@neptunus.(none)
cb3d610148 BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn" 
- Improved solution
 2005-09-07 16:39:16 +02:00
bar@mysql.com
d261e1f5c5 Merge mysql.com:/usr/home/bar/mysql-4.1.b12611 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-09-07 16:32:15 +05:00
bar@mysql.com
a0ddff9c6e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12611
 2005-09-07 16:29:53 +05:00
bar@mysql.com
33d1833994 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-09-07 16:13:57 +05:00
gluh@eagle.intranet.mysql.r18.ru
f077477dca Fix for bug#12905 show fields from view behaving erratically with current database 
use saved view db name in case of view
 2005-09-07 16:11:53 +05:00
gluh@eagle.intranet.mysql.r18.ru
01afb3390b Fix for bug#11775 Variable character_set_system does not exist (sometimes). 
Variable character_set_system is selectable now
  More accurate error message results during 
  update of character_set_system and some other read only variables
 2005-09-07 15:38:09 +05:00
bar@mysql.com
cd5cd2bf79 Merge mysql.com:/usr/home/bar/mysql-4.1.b12829 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-09-07 14:57:27 +05:00
sergefp@mysql.com
83b5f1a338 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug12941
 2005-09-07 12:13:12 +04:00
bar@mysql.com
2ff61bd697 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12829
 2005-09-07 13:12:29 +05:00
sergefp@mysql.com
99870f616d Fix for BUG#12941: in create_tmp_field(), if the passed item is an Item_ref, put newly 
created item into item->result_field, not *(item->ref)->result_field.
 2005-09-07 11:50:41 +04:00
igor@rurik.mysql.com
af9740d0fd func_gconcat.result, func_gconcat.test: 
Added test cases for bug #12863.
item_sum.cc, item_sum.h:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.
 2005-09-06 22:20:11 -07:00