Commit graph

33075 commits

Author SHA1 Message Date
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)
7c70159097 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-12 09:09:22 +02:00
mskold@mysql.com
a9123eeb13 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-12 08:48:50 +02: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
cmiller@zippy.(none)
a1e78b3d36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-11 16:39:09 -04: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
msvensson@neptunus.(none)
a4b19285e5 Bug#18474 Unlistable directories yield no info from information_schema, part2
- Improved solution by adding an else stetment so that do find next is avoided if erorr occurs, but we still return zero files found instaed of an error
2006-04-11 20:41:05 +02:00
mats@mysql.com
1ebd03fcfc Added missing prototypes to mysys/my_bitmap.h 2006-04-11 20:31:02 +02:00
mats@mysql.com
c83a766364 WL#3206 (Add unit tests):
More changes according to review comments.
2006-04-11 20:29:34 +02: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
jonas@perch.ndb.mysql.com
f420d5dffb fix so that rpl_row_basic_8partition.test is only run when paritioning is enabled 2006-04-11 15:38:32 +02: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
bar@mysql.com
e8e0d5c5fe bug#17870 Table names conflict with Windows device names
It was impossible to create some table names on Windows
(e.g. LPT1, AUX, COM1, etc).

Fixed to pad dangerous names with thee "at" signs
(e.g. LPT1@@@, AUX@@@, COM1@@@, and so on).
2006-04-11 18:16:14 +05: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
mskold@mysql.com
db1bae9af0 Merge 192.168.123.145:MySQL/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-11 14:29:37 +02:00
mskold@mysql.com
af898aec6a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-11 14:26:06 +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
msvensson@neptunus.(none)
9d2fd3b3ca Remove the my_seek calls as we have just opened the file for append with O_APPEND and the file pointer should be at end of the file already. 2006-04-11 12:38:21 +02:00
msvensson@shellback.
afaa4e2be5 Merge 192.168.0.10:mysql/mysql-5.1
into  shellback.:C:/mysql/my51-bug17368
2006-04-11 12:19:28 +02:00
msvensson@shellback.
1927e39d7b Remove unused variable 2006-04-11 12:15:57 +02:00
msvensson@shellback.
a68d2e3aa1 Close share->data_file in before renaming in ha_tina::repair
Open and seek to end of data_file after rename 
Fix comment for when file does not need repair.
Set share->mapped_file to NULL always when it's been unmapped 
Add test to see that file can be used after repair
2006-04-11 12:12:48 +02:00
msvensson@neptunus.(none)
196bcbf731 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-11 11:43:51 +02:00
bar@mysql.com
4000215401 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-04-11 13:28:09 +05:00