Commit graph

32916 commits

Author SHA1 Message Date
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
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
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
tomas@poseidon.ndb.mysql.com
2f16b43c1c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-11 10:17:13 +02:00
tomas@poseidon.ndb.mysql.com
f675a84fbd enabling all failing ndb tests to get current status in pushbuild 2006-04-11 10:15:08 +02: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
brian@zim.(none)
eaf850ef5b Drop a number of OS2 specific files. 2006-04-10 17:48:19 -07:00
kent@mysql.com
691822a929 mysql_upgrade.c:
No declarations after first expression in block
2006-04-11 02:48:19 +02:00
kent@mysql.com
8f635a9789 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-04-11 02:48:18 +02:00
igor@rurik.mysql.com
0f2a1f0db8 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-10 17:48:17 -07:00
kent@mysql.com
8476262472 Merge 2006-04-11 02:48:17 +02:00
reggie@big_geek.
8b7526db77 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  big_geek.:C:/Work/mysql/mysql-5.1-test
2006-04-10 19:48:16 -05:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
0f9676426c manual merge 2006-04-10 20:48:15 -04:00
jimw@mysql.com
0647a26ade Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 16:17:46 -07:00
jimw@mysql.com
a159a55c2c Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 14:30:00 -07:00
igor@rurik.mysql.com
e2feeb88f9 Made the test case for bug #15917 independent on platforms. 2006-04-10 14:14:20 -07:00
reggie@big_geek.
ed6ff9cd40 fix cmake generation error 2006-04-10 16:06:17 -05:00
kent@mysql.com
dbc797971e disabled.def:
Disabled randomly failing tests
2006-04-10 22:51:17 +02:00
igor@rurik.mysql.com
406b29b6e0 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-10 13:04:25 -07:00
gluh@mysql.com
23c05e1361 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-04-11 00:32:36 +05:00
gluh@mysql.com
b70af5df7c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-04-11 00:32:35 +05:00
lars@mysql.com
ac72a7ed48 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-04-10 21:32:35 +02:00
holyfoot@mysql.com
52f81631e6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.upgrd
2006-04-11 00:32:34 +05:00
aivanov@mysql.com
b43493bbfc Merge mysql.com:/home/alexi/bugs/mysql-5.0-temp
into  mysql.com:/home/alexi/bugs/mysql-5.1-temp
2006-04-10 23:32:33 +04:00
knielsen@mysql.com
030c170550 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/mysql-5.0-tmp
2006-04-10 20:48:09 +02:00
aivanov@mysql.com
31727db005 Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868
into  mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
2006-04-10 22:48:08 +04:00