database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
38,460 Commits 3,270 Branches 1,096 Tags
c36f165629803437fecc90b6d82ee51a1801caa4
Commit Graph

14133 Commits

Author SHA1 Message Date
ramil/ram@mysql.com/myoffice.izhnet.ru
d3f503a0bd Fix for bug #20204: "order by" changes the results returned 
Item_substr's results are improperly stored in a temporary table due to       
wrongly calculated max_length value for multi-byte charsets if two            
arguments specified.
 2006-09-21 16:05:01 +05:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c34601adec If mysqlslap schema does not exists, it should be an error, so no need for IF EXISTS 
Setting default database back to 'test', so that next test case don't use the wrong database
 2006-09-21 13:04:33 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
588ab714ff Added master-slave synchronization to make sure truncate happen before slave manipulations on every platform 2006-09-21 11:45:16 +02:00
istruewing@chilla.local
f083782c42 Merge chilla.local:/home/mydev/mysql-5.0--main 
into  chilla.local:/home/mydev/mysql-5.0-toteam
 2006-09-21 10:55:23 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
43194fad43 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-4.1-maint
 2006-09-21 09:35:17 +05:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fe782f92d6 Vertical printout in test to make easier to read 2006-09-21 03:32:42 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
00ba129e51 Version 5.1 needs one connection less 2006-09-21 02:44:58 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
bc8207c9b8 Result file fixes after merge 2006-09-21 02:39:47 +02:00
lars/lthalmann@dl145j.mysql.com
a397c1805c Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 01:15:28 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
6aded45614 Fix of result files from merge 2006-09-21 00:59:48 +02:00
lars/lthalmann@dl145j.mysql.com
0f85f6f760 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 00:53:47 +02:00
lars/lthalmann@dl145j.mysql.com
57a74ea4af Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-21 00:23:20 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
d20e326504 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-21 00:05:56 +02:00
mskold/marty@mysql.com/linux.site
9707d43cc3 bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated reslt file 2006-09-20 20:04:58 +02:00
igor@rurik.mysql.com
2e2c5a20c0 Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-09-20 09:47:36 -07:00
igor@rurik.mysql.com
d957636471 Fixed bug #20108. 
Any default value for a enum fields over UCS2 charsets was corrupted
when we put it into the frm file, as it had been overwritten by its
HEX representation.
To fix it now we save a copy of structure that represents the enum
type and when putting the default values we use this copy.
 2006-09-20 09:46:12 -07:00
msvensson@shellback.(none)
c74ebcc176 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-20 18:02:42 +02:00
msvensson@shellback.(none)
7029074c24 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-20 18:02:11 +02:00
igor@rurik.mysql.com
20b3e8a2f8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-09-20 08:10:21 -07:00
igor@rurik.mysql.com
f2225cab27 Fixed bug #22015: crash with GROUP_CONCAT over a derived table 
that returns the results of aggregation by GROUP_CONCAT.
The crash was due to an overflow happened for the field
sortoder->length.
The fix prevents this overflow exploiting the fact that the
value of sortoder->length cannot be greater than the value of
thd->variables.max_sort_length.
 2006-09-20 08:08:57 -07:00
mskold/marty@linux.site
d6d0208dfb Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-20 16:49:06 +02:00
mskold/marty@mysql.com/linux.site
99a4f96535 Bug#18976 CRBR: multiple binlog, second binlog may miss schema log events:Change test back to verify again 2006-09-20 16:46:54 +02:00
msvensson@shellback.(none)
0c429abd29 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-20 15:45:42 +02:00
msvensson@shellback.(none)
339cd91a98 Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10 
since the $opt_valgrind variable was initialised to 0, thus being "defined"
 2006-09-20 15:41:46 +02:00
istruewing@chilla.local
77d610c2b4 Merge chilla.local:/home/mydev/mysql-5.1--team 
into  chilla.local:/home/mydev/mysql-5.1-tomain
 2006-09-20 14:36:32 +02:00
Kristofer.Pettersson@naruto.
3599c87654 Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-09-20 12:21:49 +02:00
gkodinov/kgeorge@rakia.(none)
8618353374 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B21540-5.0-opt
 2006-09-20 12:03:56 +03:00
gkodinov/kgeorge@rakia.(none)
8577d7913e fixed merge 2006-09-20 12:02:58 +03:00
msvensson@neptunus.(none)
f4c0e4efac Fix check of parameter type in mysqld_start. 2006-09-20 07:43:03 +02:00
stewart@willster.(none)
6a98b6c39e Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073
 2006-09-20 15:27:45 +10:00
brian@zim.(none)
63d78a7659 Removed ifdef need. 
Cleaned up test to no longer need have_
 2006-09-19 13:58:12 -07:00
igor@rurik.mysql.com
0279c91d99 Post-merge corrections. 2006-09-19 12:18:24 -07:00
msvensson@shellback.(none)
21892f4161 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 20:06:18 +02:00
msvensson@shellback.(none)
1c4c34bc39 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 20:04:42 +02:00
msvensson@shellback.(none)
30e3cce970 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 20:01:40 +02:00
msvensson@shellback.(none)
9cb40c6e91 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 20:00:01 +02:00
msvensson@shellback.(none)
be1187e171 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 19:58:51 +02:00
msvensson@shellback.(none)
5a912955d5 Increase suite timeout even more - 6 times - when running with valgrind 2006-09-19 19:41:41 +02:00
msvensson@shellback.(none)
d3d7c74954 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 19:11:41 +02:00
msvensson@shellback.(none)
bd6fc1ce66 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 19:10:31 +02:00
igor@rurik.mysql.com
25368c359e Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-09-19 10:09:02 -07:00
msvensson@shellback.(none)
d8870f2bb3 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 18:41:48 +02:00
msvensson@shellback.(none)
883a3809c9 Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on 2006-09-19 18:39:04 +02:00
gkodinov/kgeorge@rakia.(none)
2da037c7d5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B21540-5.0-opt
 2006-09-19 19:18:52 +03:00
msvensson@shellback.(none)
ee5ca6e231 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-19 17:47:53 +02:00
msvensson@shellback.(none)
1b3094187a Fix warnings in mysql-test-run.pl 2006-09-19 17:45:27 +02:00
igor@rurik.mysql.com
294c0ccaa9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-4.1-opt
 2006-09-19 08:42:58 -07:00
msvensson@shellback.(none)
1515818276 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-19 17:40:49 +02:00
msvensson@shellback.(none)
0e7d18d8e4 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-19 17:08:07 +02:00
msvensson@shellback.(none)
895d986266 Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed. 
The pid file will be removed later when var/ directory is recreated.
 2006-09-19 16:48:01 +02:00