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

32888 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@rurik.mysql.com
134b659ba2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  rurik.mysql.com:/home/igor/mysql-5.1
 2006-04-12 18:20:38 -07:00
igor@rurik.mysql.com
e6ce72fcef Fixes after manual merge. 2006-04-12 18:15:39 -07:00
igor@rurik.mysql.com
fb75fcde65 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
 2006-04-12 13:23:11 -07:00
jimw@mysql.com
86d6b16113 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-12 13:01:26 -07:00
petr@mysql.com
6a3bb50ce6 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/devel/5.1-im-sort-options
 2006-04-12 23:12:04 +04:00
petr@mysql.com
9ac5b32a5f cleanup: sort IM options alphabetically 2006-04-12 23:08:50 +04:00
kent@mysql.com
f07838a7f5 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-12 20:41:40 +02:00
kent@mysql.com
dcf3ac77c7 disabled.def: 
Disabled 'rpl_deadlock_innodb', randomly failing
 2006-04-12 20:38:08 +02:00
kent@mysql.com
ce6319cd21 Merge 2006-04-12 20:19:40 +02:00
jimw@mysql.com
688659df11 Support --debug/-# in instance manager. 2006-04-12 11:14:56 -07:00
kent@mysql.com
cfe9102791 disabled.def: 
To somplify merge later, make files more similar in format
 2006-04-12 20:06:15 +02:00
jimw@mysql.com
c490aff57e Merge mysql.com:/home/jimw/my/mysql-5.1-refactor 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-12 08:24:20 -07:00
holyfoot@mysql.com
6c49e2b9f2 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.18115
 2006-04-12 17:42:03 +05:00
holyfoot@deer.(none)
aa80bf659b mysql_upgrade.sh removed. 
client/mysql_upgrade bunary should be used instead
 2006-04-12 16:54:00 +05:00
bar@mysql.com
5cb592ac3b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-12 14:47:06 +05:00
bar@mysql.com
2b970995e3 Bug#18736 test case 'upgrade' fails 
"upgrade" failed on windows, because of lower_case_table_name.
This fix changes letters to lower case, not to depend on OS.

Note, this change does not affect coverage of 
Bug N 17142 "Crash if create with encoded name",
which the test war originally written for.
 2006-04-12 14:45:37 +05:00
guilhem@mysql.com
c0a2750096 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql_src/mysql-5.1-new
 2006-04-12 10:56:23 +02:00
guilhem@mysql.com
a2a4037c3f mysql-test-run.pl now creates an innodb data file of 10M:autoextend instead of 128M:autoextend. 
This is faster under gdb/valgrind (this should speed up work of people who have to run
a simple test 50 times to do debugging). Running without --big, which is the default, InnoDB tests
take at most 18MB so 128 was overkill. Running with --big, InnoDB tests take 450MB so 128
was not enough anyway.
 2006-04-12 10:55:26 +02:00
bar@mysql.com
f4eb0eb1dd Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18285
 2006-04-12 13:31:04 +05:00
msvensson@neptunus.(none)
dd34c82490 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-12 08:33:35 +02:00
msvensson@neptunus.(none)
cf0f40599c Merge neptunus.(none):/home/msvensson/mysql/my51-bug18415 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-12 08:32:02 +02:00
msvensson@neptunus.(none)
796445957e Bug#18415 mysql-test-run.pl does not run on ActiveState perl 
- Part 1, better handling of subprocess and stdout to be done
 2006-04-12 08:30:34 +02:00
jimw@mysql.com
cb051bfddc Remove Windows project files for mysql_test_run_new. 2006-04-11 18:59:43 -07:00
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new, 
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
 2006-04-11 18:54:24 -07:00
jimw@mysql.com
b02463c15a Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-11 16:03:49 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
62d289a091 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
 2006-04-11 18:25:13 -04:00
msvensson@neptunus.(none)
ee76a12c09 Protect from empty --query argument 2006-04-11 23:24:06 +02:00
msvensson@neptunus.(none)
52c9feff13 Bug#18012 mysqlslap fails if querystring starts with delimiter 
- Terminate loop not only when the limit is met, but alse when there is no more stmts
 2006-04-11 22:23:16 +02:00
msvensson@neptunus.(none)
0bdb9ff547 Fix syntax error 2006-04-11 22:10:11 +02:00
msvensson@neptunus.(none)
5848a4276d Bug#17478 mysqlslap not issuing any queries 
- Add more printouts it depending on verbose level
 - New common function 'run_query' to be used when executing a query
 2006-04-11 22:04:08 +02:00
jimw@mysql.com
7e96d6eeef Merge mysql.com:/home/jimw/my/mysql-5.1-17139 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-11 12:06:49 -07:00
marty@linux.site
7696f11b6c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/marty/MySQL/mysql-5.1-new
 2006-04-11 21:06:48 +02:00
bar@mysql.com
fdd9b478fe Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18285
 2006-04-12 00:06:48 +05:00
aivanov@mysql.com
51ad803c72 Removed test case erroneously merged from 5.0 2006-04-11 23:06:47 +04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
77860367af Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
 2006-04-11 15:00:06 -04:00
aivanov@mysql.com
4be5c254f8 Merge mysql.com:/home/alexi/bugs/mysql-5.0-13683 
into  mysql.com:/home/alexi/bugs/mysql-5.1-13683
 2006-04-11 22:59:03 +04:00
msvensson@neptunus.(none)
c8c8041804 Don't use the MYSQL* returned from mysql_real_connect to overwrite the already initalised mysql variable 2006-04-11 20:49:31 +02:00
igor@rurik.mysql.com
abc16b5b00 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-11 11:46:28 -07:00
ramil@mysql.com
62b85c1388 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14360
 2006-04-11 23:46:27 +05:00
aivanov@mysql.com
cb011af0b0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/bugs/mysql-5.0-merge
 2006-04-11 22:46:26 +04:00
igor@rurik.mysql.com
dfd8f0211c Fixed bug #18618. 
If the second or the third argument of a BETWEEN predicate was
a constant expression, like '2005.09.01' - INTERVAL 6 MONTH,
while the other two arguments were fields then the predicate 
was evaluated incorrectly and the query returned a wrong
result set.
The bug was introduced in 5.0.17 when in the fix for 12612.
 2006-04-11 10:03:37 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
838254be52 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
 2006-04-11 09:36:02 -04:00
ramil@mysql.com
094c4290ca Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14360
 2006-04-11 18:14:34 +05:00
msvensson@neptunus.(none)
c1e9bb8dea Add 'mysql_get_ssl_cipher' list of functions to export from libmysqld 2006-04-11 15:14:08 +02:00
marty@linux.site
473d0ae7da Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/marty/MySQL/mysql-5.1-new
 2006-04-11 14:21:01 +02:00
bar@mysql.com
5c0e1d5e4d Merge mysql.com:/usr/home/bar/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18285
 2006-04-11 17:12:29 +05:00
marty@linux.site
a03d5ad9f2 Added --p for producing output parsable by LOAD TABLE INFILE 2006-04-11 14:09:04 +02:00
marty@linux.site
950e258fde Fixes for fast alter table for ndbcluster 2006-04-11 14:06:32 +02:00
ramil@mysql.com
1e29244200 Fix for bug #14360: Date Between Interval Broken. 2006-04-11 16:13:57 +05:00
ingo@mysql.com
fff2bc4d46 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-04-11 12:41:26 +02:00