mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53738 commits 2791 branches 343 tags 1.7 GiB
Commit graph

53738 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@dipika.(none)
84de43cda6 Remove dead code. 2008-04-08 20:31:40 +04:00
kostja@dipika.(none)
a9fff11f49 Fix a compilation warning (unused variable). 2008-04-07 23:57:47 +04:00
kostja@dipika.(none)
63944ed537 A fix for Bug#32724 "innodb_mysql.test fails randomly". 
Enable back the disabled test case.
 2008-04-07 15:42:32 +04:00
dlenev@mockturtle.local
44fe33f011 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-symlink
 2008-04-07 13:46:56 +04:00
kostja@dipika.(none)
968b1a0810 Review and update WL#4165 and WL#4166 test coverage. 2008-04-07 13:35:42 +04:00
dlenev@mockturtle.local
15fd42b7dd Fix for bug #35733 "main.symlink.test fails". 
The problem was that symlink.test failed due to debug assertions or
due to errors emitted for wrong statements (in non-debug builds)
if 6.0 version of server was run with --thread-handling=pool-of-threads
option.

The above problems were caused by that on the one hand code mi_create()
which handles case when error is returned relies on my_errno being set
to appropriate non-0 value, but on the other it has not done this
in case when error was emitted due to discovery that share for table
which we are going to create is already present in the list of open
shares. Running server with pool-of-threads option just exposed this
bug since in this scheduler mode my_errno is reset to 0 when connection
(THD) is reattached to the "real" thread.

This fix ensures that code in mi_create() properly sets my_errno in
the case described above.

Since original reason that caused this bug to be exposed in 6.0 tree
might also under very special conditions lead to incorrect behavior
of earlier versions of server (i.e. to errors emitted for wrong
statements) this patch is also being pushed into 5.1 tree.

No test case is present as this code is already covered by a test
case + pushbuild options combination in 6.0.
 2008-04-07 12:59:57 +04:00
thek@adventure.(none)
e392f406f5 Bug#26208 a typo (wrong variable name) in mysql_prepare_update function's source code? 
This is a code clean up.
Removed redundant (and unused) TABLE_LIST variable intended as an IN-
parameter for setup_order.
 2008-04-01 14:41:13 +02:00
thek@adventure.(none)
052d0426f4 Merge adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2008-04-01 11:21:09 +02:00
thek@adventure.(none)
1cc64d4eab Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2008-04-01 10:44:56 +02:00
davi@endora.local
ad6d59e9b2 Merge mysql.com:/Users/davi/mysql/bugs/ps-cleanup-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2008-03-31 09:54:36 -03:00
kostja@dipika.(none)
ad4113f72f Remove some unused code. 2008-03-31 14:52:41 +04:00
anozdrin/alik@quad.opbmk
73345d0fbd Fix for Bug#32748: Inconsistent handling of assignments to 
general_log_file/slow_query_log_file.

The problem was that log file path was rejected if directory
path was empty. The fix is to reject log file path only if it
is entirely empty.
 2008-03-28 21:46:18 +03:00
anozdrin/alik@quad.opbmk
d02459cbae A patch for Bug#34820: log_output can be set to illegal value. 
We have "set" variables, which can accept empty values
(like sql_mode), and which can not (like log_output). The problem
was that the code does not distinguish them and allow empty
values for every set variable.

The fix is to introduce an attribute of a set variable telling
whether it can accept empty values.
 2008-03-28 18:10:04 +03:00
anozdrin/alik@quad.opbmk
83b5f82e3f Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-03-28 14:40:11 +03:00
tnurnberg@white.intern.koehntopp.de
963f86f879 Merge mysql.com:/misc/mysql/mysql-5.0-opt 
into  mysql.com:/misc/mysql/mysql-5.1-opt
 2008-03-28 00:46:43 +01:00
tnurnberg@white.intern.koehntopp.de
282825af33 Merge mysql.com:/misc/mysql/mysql-5.0 
into  mysql.com:/misc/mysql/mysql-5.0-opt
 2008-03-27 23:35:56 +01:00
tnurnberg@white.intern.koehntopp.de
a3df2a4cf4 Merge mysql.com:/misc/mysql/mysql-5.1 
into  mysql.com:/misc/mysql/mysql-5.1-opt
 2008-03-27 23:34:12 +01:00
gshchepa/uchum@host.loc
02235ace7b Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 20:07:05 +04:00
gshchepa/uchum@host.loc
931582bb58 Merge host.loc:/home/uchum/work/mysql-5.0 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 20:05:51 +04:00
joerg@trift2.
fe0bff70e0 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 13:32:55 +01:00
joerg@trift2.
6d8e1832e0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 13:28:00 +01:00
joerg@trift2.
dc00a52464 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2008-03-27 13:21:34 +01:00
joerg@trift2.
2db55bf938 Merge trift2.:/MySQL/M51/ndb-decl-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 13:20:24 +01:00
gshchepa/uchum@host.loc
5713f9d150 Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 16:07:01 +04:00
df@pippilotta.erinye.com
334e647e3a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2008-03-27 13:04:16 +01:00
df@pippilotta.erinye.com
7297fe1950 BUG#25340 2008-03-27 13:02:59 +01:00
gshchepa/uchum@host.loc
faf4737bce Merge host.loc:/home/uchum/work/4.1-opt 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 16:00:26 +04:00
gshchepa/uchum@host.loc
810059404e Merge host.loc:/home/uchum/work/mysql-5.1 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 15:54:45 +04:00
joerg@trift2.
e2b2520450 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 12:53:58 +01:00
gshchepa/uchum@host.loc
7edeebc9ab Merge host.loc:/home/uchum/work/mysql-5.0 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 15:52:55 +04:00
joerg@trift2.
e7e5311ce4 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-03-27 12:45:16 +01:00
joerg@trift2.
270aaa17b2 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2008-03-27 12:38:21 +01:00
anozdrin/alik@quad.opbmk
652f99d0f1 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-03-27 14:25:35 +03:00
anozdrin/alik@quad.opbmk
8010fa87a4 Disable cast.test due to Bug#35594. 2008-03-27 13:42:42 +03:00
tsmith@rhel5-ia64-a.mysql.com
c7cd786ef8 Merge rhel5-ia64-a.mysql.com:/data0/tsmith/build/50 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:59:47 +01:00
tsmith@rhel5-ia64-a.mysql.com
95c8fb8db2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/50
 2008-03-27 08:50:54 +01:00
tsmith@rhel5-ia64-a.mysql.com
2ff69e74a4 Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:41:25 +01:00
tsmith@rhel5-ia64-a.mysql.com
3069db1da7 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
 2008-03-27 08:20:25 +01:00
tsmith@rhel5-ia64-a.mysql.com
c82d7ecfee Apply innodb-5.1-ss2360 snapshot 
Fixes:
- Bug #34920: auto_increment resets to 1 on foreign key creation
  We need to use/inherit the passed in autoinc counter for ALTER TABLE
  statements too.
 2008-03-27 02:40:45 +01:00
gshchepa/uchum@host.loc
60f750b9ed view.result: 
Post-merge fix (bug #35193).
 2008-03-27 00:55:13 +04:00
gshchepa/uchum@host.loc
57afe19c8b Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-27 00:51:29 +04:00
gshchepa/uchum@host.loc
792074bff0 Merge host.loc:/home/uchum/work/5.0-opt-35193 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-27 00:44:13 +04:00
istruewing@stella.local
ac130084c4 Post-merge fix. 
Query cache does now work with concurrent_insert=0. See
Bug 33756 - query cache with concurrent_insert=0 appears broken
 2008-03-26 20:27:23 +01:00
gshchepa/uchum@host.loc
2dcec449e0 Fixed bug #35193. 
View definition as SELECT ... FROM DUAL WHERE ... has
valid syntax, but use of such view in SELECT or
SHOW CREATE VIEW syntax causes unexpected syntax error.

Server omits FROM DUAL clause when storing view body
string in a .frm file for further evaluation.
However, syntax of SELECT-witout-FROM query is more
restrictive than SELECT FROM DUAL syntax, and doesn't
allow the WHERE clause.

NOTE: this syntax difference is not documented.


View registration procedure has been modified to
preserve original structure of view's body.
 2008-03-26 22:43:12 +04:00
cmiller@zippy.cornsilk.net
75da480f85 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-03-26 14:30:26 -04:00
cmiller@zippy.cornsilk.net
3af3e6963b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-03-26 14:24:10 -04:00
cmiller@zippy.cornsilk.net
cfb9c8458e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-03-26 12:39:22 -04:00
istruewing@stella.local
dd8a821e1d Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 17:37:04 +01:00
istruewing@stella.local
1ce57e889d Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 17:36:12 +01:00
istruewing@stella.local
830096fe16 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-26 16:48:46 +01:00