database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
46,936 Commits 3,279 Branches 1,097 Tags
a5011de0a82b29a982bed1bb18eea57d29121100
Commit Graph

18094 Commits

Author SHA1 Message Date
jamppa@bk-internal.mysql.com
82e4afb89f Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
 2007-04-17 15:52:03 +02:00
jamppa@bk-internal.mysql.com
b465b30847 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
 2007-04-17 15:45:35 +02:00
serg@janus.mylan
da240229f8 Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
 2007-04-17 15:44:30 +02:00
kent/mysqldev@mysql.com/production.mysql.com
c43a7b9bf7 Raise version number after cloning 5.0.40 2007-04-17 15:22:48 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f4060b4b81 Fix for bug #27515: DROP previlege is not required anymore for RENAME TABLE 
Added missed DROP privilege check on the original table for RENAME TABLE command.
 2007-04-17 16:52:50 +05:00
monty@narttu.mysql.fi
c33a5461d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/home/my/mysql-5.1
 2007-04-17 14:43:17 +03:00
monty@mysql.com/narttu.mysql.fi
0a35bd923f Fixed federated and some replication tests to not stop slave until it's up and running. 
(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs)
Marked federated_server as a '--big-test'
Change error in net_clear to 'Note', as it interfered with mysql-test-run.
 2007-04-17 14:41:16 +03:00
serg@janus.mylan
d5b1c3aea2 reverted the fix for Bug#5507 2007-04-17 12:32:01 +02:00
mats@romeo.(none)
792f01356a Fixing test case and result file for rpl_ndb_circular_simplex. 2007-04-17 08:36:14 +02:00
malff/marcsql@weblab.(none)
86c8ab00e0 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-04-16 21:20:38 -06:00
dkatz@damien-katzs-computer.local
9f4df9b91d Test result differences between mysql versions. 2007-04-16 14:37:38 -04:00
dkatz@damien-katzs-computer.local
227115fa2b Merge damien-katzs-computer.local:/Users/dkatz/50b 
into  damien-katzs-computer.local:/Users/dkatz/51merge
 2007-04-16 14:08:03 -04:00
dkatz@damien-katzs-computer.local
138f003738 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/50b
 2007-04-16 13:49:17 -04:00
aelkin@dl145j.mysql.com
5c53b59427 Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() 
refining the test with active innodb
 2007-04-16 19:20:46 +02:00
serg@janus.mylan
00479a441d wl#2936 post-merge fixes 2007-04-16 18:16:17 +02:00
aelkin@dl145j.mysql.com
b49cb4fbb4 Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() 
tests for the bug and associated is moved into another file because
they appeared to be binlog-format sensitive.
 2007-04-16 16:55:37 +02:00
monty@mysql.com/narttu.mysql.fi
72d135bec5 Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc) 
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
 2007-04-16 17:08:29 +03:00
mats@romeo.(none)
6aee6e29c0 Updating tests to eliminate some sporadic non-critical failures. 2007-04-16 15:52:56 +02:00
tomas@whalegate.ndb.mysql.com
5ee4948dec Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-04-16 14:51:55 +02:00
tomas@whalegate.ndb.mysql.com
a30755427a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-04-16 14:51:08 +02:00
tomas@whalegate.ndb.mysql.com
be01d89661 some more tests + drop stuff after done 2007-04-16 14:15:30 +02:00
tomas@whalegate.ndb.mysql.com
1bf8aad558 Bug #27710 Creating unique index fails during single user mode 
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
 2007-04-16 14:07:31 +02:00
tomas@whalegate.ndb.mysql.com
03c6d037fc Bug #27710 Creating unique index fails during single user mode 
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
 2007-04-16 13:08:09 +02:00
tomas@whalegate.ndb.mysql.com
2c723aa91f Bug #27712 Single user mode. Creating logfile group and tablespace is allowed 2007-04-16 11:43:14 +02:00
joerg@trift2.
d1d95cca9c Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-04-16 11:30:06 +02:00
serg@sergbook.mysql.com
6bc9bc92df Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
 2007-04-16 10:37:50 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e62dbcf746 Fix for 
bug #27715: mysqld --character-sets-dir buffer overflow
bug ##26851: Mysql Client --pager Buffer Overflow

Using strmov() to copy an argument may cause overflow 
if the argument's length is bigger than the buffer:
use strmake instead.
Also, we have to encrease the error message buffer size to fit 
the longest message.
 2007-04-16 12:28:02 +05:00
gni/root@dev3-221.dev.cn.tlan
648b03aa14 BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Map the 4009 ndb error code to 157 mysql error code 2007-04-16 15:15:47 +08:00
serg@sergbook.mysql.com
c53037af36 more wl#2936 fixes: removed implicit ha_thd() calls (too error-prone), 
fixed an assert crash
 2007-04-15 15:47:27 +02:00
evgen@moonbone.local
bfac9ea67e subselect.result: 
After merge fix.
 2007-04-15 12:16:32 +04:00
evgen@moonbone.local
392fb72f5c Merge moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
 2007-04-15 12:05:13 +04:00
evgen@moonbone.local
51badaddbc subselect.test, subselect.result: 
After merge fix.
 2007-04-15 09:22:45 +04:00
evgen@moonbone.local
922a5a969c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql
 2007-04-15 08:41:35 +04:00
evgen@moonbone.local
3113ce6383 Bug#27321: Wrong subquery result in a grouping select. 
The Item_outer_ref class based on the Item_direct_ref class was always used
to represent an outer field. But if the outer select is a grouping one and the 
outer field isn't under an aggregate function which is aggregated in that
outer select an Item_ref object should be used to represent such a field.
If the outer select in which the outer field is resolved isn't grouping then
the Item_field class should be used to represent such a field.
This logic also should be used for an outer field resolved through its alias
name.

Now the Item_field::fix_outer_field() uses Item_outer_field objects to
represent aliased and non-aliased outer fields for grouping outer selects
only.
Now the fix_inner_refs() function chooses which class to use to access outer
field - the Item_ref or the Item_direct_ref. An object of the chosen class
substitutes the original field in the Item_outer_ref object.
The direct_ref and the found_in_select_list fields were added to the
Item_outer_ref class.
 2007-04-15 08:31:34 +04:00
kostja@vajra.(none)
44fe1baefb A post-merge fix. 2007-04-14 19:43:43 -04:00
kostja@vajra.(none)
4eeee57c4b Merge vajra.(none):/opt/local/work/mysql-5.0-runtime 
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
 2007-04-14 18:35:09 -04:00
kostja@vajra.(none)
e0f0ba802f Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
 2007-04-14 18:31:43 -04:00
kostja@vajra.(none)
58823d3bdd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  vajra.(none):/opt/local/work/mysql-5.0-runtime
 2007-04-14 18:23:48 -04:00
holyfoot/hf@hfmain.(none)
13a7fdac24 Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-14 14:56:07 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8b49f27530 Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-14 14:54:59 +05:00
kostja@vajra.(none)
8b10ae74cc Fix rpl_events test failure in the runtime tree. 2007-04-13 23:53:05 -04:00
epotemkin@bk-internal.mysql.com
9e2dcb5e91 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-13 23:32:23 +02:00
serg@janus.mylan
3ecbb5a443 wl#2936 - fixing problems 2007-04-13 19:23:02 +02:00
msvensson@pilot.blaudden
2aef31fa51 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-13 15:13:12 +02:00
msvensson@pilot.blaudden
86a364319d Add option manual-ddd 
Change syntax for starting manual ddd or gdb to avoid having to
change working dir
 2007-04-13 15:06:05 +02:00
mats@romeo.(none)
06ee2fd79e Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 
into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl
 2007-04-13 14:59:49 +02:00
msvensson@pilot.blaudden
7df5e05b4d Add missing option --manual-ddd 
Change syntax to start manual gdb/ddd to avoid having to
cd to the mysql-test directory before calling the command
 2007-04-13 14:40:52 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
455b325b53 Avoid resetting a variable. Fixed grant.test. 2007-04-13 14:04:57 +03:00
mats@romeo.(none)
6044deb72e BUG#17095 (Cluster RBR in circle does not terminate): 
Updating result files with wrong server id for BEGIN and COMMIT
events.
 2007-04-13 12:03:01 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
defddfd255 Merged from 5.0 2007-04-13 12:47:44 +03:00