into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/func_time.result:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/r/innodb.result:
Manual merge
mysql-test/t/innodb.test:
Manual merge
"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.
mysql-test/r/upgrade.result:
Changing "P" to "p" not to depend on lower_case_table_name
mysql-test/t/upgrade.test:
Changing "P" to "p" not to depend on lower_case_table_name
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.
mysql-test/mysql-test-run.pl:
10M is faster to create than 128M (especially under gdb or valgrind) and is enough for most tests.
- Part 1, better handling of subprocess and stdout to be done
mysql-test/lib/mtr_process.pl:
- Dont redirect stdout if ActiveState perl since fork creates a new thread and not another process.
- Change waitpid to allow for negative pid as we get on Windows, strange but
that is how it is. It should never create a process with pid -1 though.
- Remove an "if" for cygwin that does not do anything.
- Add "print" in the potentially hanging while loop in "start_reap_all"
- Dont use "getpgrp" on windows.
- Remove "sleep 2" in mtr_exit
- Remove the initial ping of mysqld's in 'mysql_admin_shutdown', instead just start one
mysqladmin for each expected mysqld server and wait for them to return.
Then perform the ping of the mysqld server's. Those ping's normally return immediately.
- Terminate loop not only when the limit is met, but alse when there is no more stmts
client/mysqlslap.c:
Terminate loop not only when the limit is met, but alse when there is no more stmts
mysql-test/r/mysqlslap.result:
Remove the extra statmemnt
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.
mysql-test/r/func_time.result:
Added a test case for bug #18618.
mysql-test/t/func_time.test:
Added a test case for bug #18618.
mysql-test/r/innodb.result:
Fix for bug #14360: Date Between Interval Broken.
- test case.
mysql-test/t/innodb.test:
Fix for bug #14360: Date Between Interval Broken.
- test case.
sql/item_timefunc.cc:
Fix for bug #14360: Date Between Interval Broken.
- Item_date_add_interval::eq() introduced.
sql/item_timefunc.h:
Fix for bug #14360: Date Between Interval Broken.
- Item_date_add_interval::eq() introduced.
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
mysql-test/r/csv.result:
Add more test to see that the table can be used after repair
mysql-test/t/csv.test:
Add more test to see that the table can be used after repair
storage/csv/ha_tina.cc:
Close share->data_file in before renaming in ha_tina::repair
Open and seek to end after rename
Fix comment for when file does not need repair.
Set share->mapped_file to NULL always when it's been unmapped
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.
mysql-test/r/xml.result:
Adding test case
mysql-test/t/xml.test:
Adding test case
sql/item_xmlfunc.cc:
Using recently implemented "true" ctype functionality
to treat all national letters as valid tag names,
Only basic latin letters worked so far.
strings/ctype-simple.c:
A bug fix: ctype is array of 257 elements,
adding offset to address correct element.
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysys/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql-common/client.c:
Auto merged
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/type_bit_innodb.result:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/key.cc:
Auto merged
sql/field.cc:
Resolve merge conflict
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
