1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Commit Graph

6830 Commits

Author SHA1 Message Date
evgen@moonbone.local
3065cc0edf Manual merge 2005-09-15 22:21:30 +04:00
evgen@moonbone.local
1685040e2b Fix bug#12887 Distinct is not always applied after rollup
For queries with GROUP BY and without hidden GROUP BY fields DISTINCT is
optimized away becuase such queries produce result set without duplicates.
But ROLLUP can add rows which may be same to some rows and this fact was
ignored.

Added check so if ROLLUP is present DISTINCT can't be optimized away.
2005-09-15 21:34:11 +04:00
evgen@moonbone.local
fcfcc016bd Merge 2005-09-15 20:50:10 +04:00
dlenev@mysql.com
2a96aa110f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2
2005-09-15 03:57:59 +04:00
dlenev@mysql.com
e231ebe5fb Fix for bug #12704 "Server crashes during trigger execution".
This bug occurs when some trigger for table used by DML statement is created
or changed while statement was waiting in lock_tables(). In this situation
prelocking set which we have calculated becames invalid which can easily lead
to errors and even in some cases to crashes.

With proposed patch we no longer silently reopen tables in lock_tables(),
instead caller of lock_tables() becomes responsible for reopening tables and
recalculation of prelocking set.
2005-09-15 03:56:09 +04:00
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