database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
38,849 Commits 3,280 Branches 1,098 Tags
e52bd4be2bdacb45a71223444860c36faeee0216
Commit Graph

14271 Commits

Author SHA1 Message Date
evgen@moonbone.local
894092becf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/19077-bug-5.0-mysql
 2006-05-18 16:01:13 +04:00
knielsen@mysql.com
339afc620f After-merge fix. 2006-05-18 13:35:15 +02:00
svoj@april.(none)
da1fdb8a5f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
 2006-05-18 16:13:32 +05:00
msvensson@shellback.(none)
8a781c23c7 Merge bk-internal:/home/bk/mysql-5.1-new 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-05-18 13:12:52 +02:00
msvensson@shellback.(none)
0c7246d688 Move innodb dependent test from create to mysql_innodb 2006-05-18 12:55:34 +02:00
anozdrin@mysql.com
6699f81cc1 Test case for BUG#18037: Server crash when returning system 
variable in stored procedures.
 2006-05-18 14:44:15 +04:00
knielsen@mysql.com
a061c90d8a Merge mysql.com:/usr/local/mysql/tmp_merge 
into  mysql.com:/usr/local/mysql/merge-5.1
 2006-05-18 11:56:50 +02:00
gbichot@dl145j.mysql.com
dada106458 Merge gbichot@bk-internal:/home/bk/mysql-5.1-new 
into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new
 2006-05-18 10:08:43 +02:00
holyfoot@deer.(none)
f002088b7f test result fixed 2006-05-18 12:42:38 +05:00
bar@mysql.com
53bc4d5164 Bug#19392 Rename Database: Crash if case change 
Problem:
Renaming a database to itself crashed server.
It hapenned because of wrong DBUG_ASSERT.
Fix: removing wrong DBUG_ASSERT. Now it reports
a correct error message "database alreadt exists".
 2006-05-18 12:21:13 +05:00
holyfoot@mysql.com
812d152107 Merge bk@192.168.21.1:mysql-5.1-kt 
into mysql.com:/home/hf/work/mysql-5.1.14573
 2006-05-18 12:09:32 +05:00
igor@rurik.mysql.com
1802e6895a Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2006-05-17 20:56:52 -07:00
igor@rurik.mysql.com
9ec8101813 Fixed bug #19816. 
This bug was introduced when the patch resolving the
performance problem 17164 was applied. As a result
of that modification the not_null_tables attributes
were calculated incorrectly for constant OR conditions.
This triggered invalid conversion of outer joins into
inner joins.
 2006-05-17 20:48:48 -07:00
igor@rurik.mysql.com
0d069edaa2 Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-05-17 17:20:03 -07:00
kent@mysql.com
cd1bc46cf9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-05-18 01:10:09 +02:00
kent@mysql.com
4ab4c99eff type_newdecimal.result, case.result: 
Adjusted merge
 2006-05-18 00:42:07 +02:00
msvensson@shellback.(none)
206fe5f559 Parse test files to find out if it needs innodb or not, mark test as 'innodb_test' if it does and add "--skip-innodb" to master_opts if it does not. 2006-05-17 23:54:48 +02:00
kent@mysql.com
d48e55eefd Merge 2006-05-17 23:41:56 +02:00
kent@mysql.com
5842dcaa7d Merge mysql.com:/data0/mysqldev/my/tmp_merge 
into  mysql.com:/tmp/mysql-5.1-new
 2006-05-17 23:35:08 +02:00
evgen@moonbone.local
1d820585ae Fixed bug#19077: A nested materialized derived table is used before being populated. 
The convert_constant_item() function converts constant items to ints on
prepare phase to optimize execution speed. In this case it tries to evaluate
subselect which contains a derived table and is contained in a derived table. 
All derived tables are filled only after all derived tables are prepared.
So evaluation of subselect with derived table at the prepare phase will
return a wrong result.

A new flag with_subselect is added to the Item class. It indicates that
expression which this item represents is a subselect or contains a subselect.
It is set to 0 by default. It is set to 1 in the Item_subselect constructor
for subselects.
For Item_func and Item_cond derived classes it is set after fixing any argument
in Item_func::fix_fields() and Item_cond::fix_fields accordingly.
The convert_constant_item() function now doesn't convert a constant item
if the with_subselect flag set in it.
 2006-05-18 00:55:28 +04:00
gbichot@dl145j.mysql.com
09a1fca4a6 Merge bk://localhost:5556 
into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new
 2006-05-17 22:43:47 +02:00
guilhem@mysql.com
c1b11edfac Removing the binlog-show-xid option as it was only a temporary solution until we have replace-regex which we have now. 
That option was used to suppress the XID from the output of SHOW BINLOG EVENTS (to create a repeatable testsuite),
was available only in debug builds, and was explicitely marked as "may be removed in future versions" in mysqld --help.
Idea of the removal approved by the replication team.
 2006-05-17 22:16:51 +02:00
igor@rurik.mysql.com
62f61f527f Merge rurik.mysql.com:/home/igor/tmp_merge 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-05-17 11:46:21 -07:00
lars@mysql.com
7cbba084d7 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
 2006-05-17 15:14:07 +02:00
knielsen@mysql.com
bf153b66a3 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-05-17 15:09:40 +02:00
rburnett@bk-internal.mysql.com
3f694eaea2 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-17 15:03:17 +02:00
holyfoot@mysql.com
54a75ed1d5 Merge mysql.com:/home/hf/work/mysql-4.1.clean 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-17 18:01:05 +05:00
holyfoot@mysql.com
e5f04160d5 Merge bk@192.168.21.1:mysql-5.1-kt 
into mysql.com:/home/hf/work/mysql-5.1.14573
 2006-05-17 17:12:25 +05:00
ramil@mysql.com
7319ef4ef1 Fix for #16327: invalid TIMESTAMP values retrieved 2006-05-17 17:00:30 +05:00
gkodinov@mysql.com
9f9a76eb6e Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge 
into  mysql.com:/home/kgeorge/mysql/5.1/merge
 2006-05-17 13:29:20 +03:00
tomas@poseidon.ndb.mysql.com
0cb31d7d5f Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 2006-05-17 08:34:48 +02:00
igor@rurik.mysql.com
767d25dabd Fixed bug #19573. 
The select statement that specified a view could be
slightly changed when the view was saved in a frm file.
In particular references to an alias name in the HAVING
clause could be substituted for the expression named by
this alias.
This could result in an error message for a query of
the form SELECT * FROM <view>. Yet no such message
appeared when executing the query specifying the view.
 2006-05-16 22:19:44 -07:00
cmiller@zippy.(none)
593daae150 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-05-16 18:42:59 -04:00
kent@mysql.com
9fca0d766b mysql.spec.sh: 
Removed Berkeley DB
configure.in:
  Adjusted Netware support
basic.t.c:
  Change for Netware
Makefile.am:
  Use thread safe libmysqlclient_r if it was built
valgrind.supp:
  Hide report about strlen/_dl_init_paths
ha_tina.cc:
  Temporarely disable CSV engine on Netware,
  as the engine depends on mmap()
net_serv.cc:
  Include <sys/select.h> for Netware
 2006-05-16 22:47:22 +02:00
tulin@production.mysql.com
4d0169c6f6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/tulin/mysql-4.1
 2006-05-16 21:46:52 +02:00
tulin@production.mysql.com
b3d8b9bbd8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/tulin/mysql-5.0
 2006-05-16 21:46:00 +02:00
tomas@poseidon.ndb.mysql.com
86c898febe Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-16 20:58:19 +02:00
tomas@poseidon.ndb.mysql.com
c5987ab67a Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail 
- adoptions to handle binlog
 2006-05-16 20:56:45 +02:00
rburnett@bk-internal.mysql.com
d8d222f261 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-16 19:17:18 +02:00
aelkin@mysql.com
8648412531 Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-05-16 19:33:24 +03:00
aelkin@mysql.com
713d17d5e7 BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary 
fixing encoding example because of table names can not be in koi8r 
on some platforms.
 2006-05-16 16:50:05 +03:00
jmiller@mysql.com
44d1f74f99 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-16 15:39:41 +02:00
jmiller@mysql.com
d022cacbc1 Updated to fix bug in AIX 2006-05-16 15:38:21 +02:00
jmiller@mysql.com
46ad615f6e rpl_log.test: 
Fix for failure in aix52 failure during push build
 2006-05-16 14:59:44 +02:00
sergefp@mysql.com
c89fc77116 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug19618
 2006-05-16 15:34:23 +04:00
tomas@poseidon.ndb.mysql.com
b467bdfcdb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-05-16 12:33:24 +02:00
tomas@poseidon.ndb.mysql.com
a5686c3138 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
 2006-05-16 12:32:36 +02:00
andrey@lmy004.
743a57fda1 disable events_logs_tests 2006-05-16 12:05:15 +02:00
tulin@production.mysql.com
d4c739fda3 information_schema.result: 
corrected merge
 2006-05-16 12:00:17 +02:00
sergefp@mysql.com
b7c52881d1 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug19618
 2006-05-16 13:46:30 +04:00