Commit graph

32868 commits

Author SHA1 Message Date
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
kent@mysql.com
cfe9102791 disabled.def:
To somplify merge later, make files more similar in format
2006-04-12 20:06:15 +02: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
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
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
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
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
bar@mysql.com
df2d425afd Bug#16233: XML: ExtractValue() fails with special characters
ExtractValue didn't understand tag and attribute names
consisting of "tricky" national letters (e.g. latin accenter letters).
It happened because XPath lex parser recognized only basic
latin letter a..z ad a part of an identifier.

Fixed to recognize all letters by means of new "full ctype" which
was added recently.
2006-04-11 13:25:02 +05:00
msvensson@neptunus.(none)
2eb47b3ac4 Remove extra "," 2006-04-11 10:03:04 +02:00
msvensson@neptunus.(none)
53ff7dfbc9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-11 09:54:00 +02:00
msvensson@neptunus.(none)
db1a0f1c29 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-11 09:52:08 +02:00
msvensson@neptunus.(none)
abf41982f8 Add surrounding braces, move invalidate dictionary_cace to after declaration of variable "table_list" 2006-04-11 09:46:03 +02:00
msvensson@neptunus.(none)
8fe764fbb2 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-11 09:11:36 +02:00
msvensson@neptunus.(none)
875154606e Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-11 09:09:21 +02:00
jimw@mysql.com
4ab9c02971 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-10 20:18:12 -07:00
igor@rurik.mysql.com
e9ef9ef6da Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-10 18:17:01 -07:00
brian@zim.(none)
55e9ec99e5 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/brian/mysql/dep-5.1
2006-04-10 17:48:20 -07:00
igor@rurik.mysql.com
74ab3de265 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-10 17:48:19 -07:00