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
client/mysql_upgrade bunary should be used instead
BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef:
Delete: scripts/mysql_upgrade.sh
scripts/Makefile.am:
mysql_upgrade.sh removed
"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
- Add more printouts it depending on verbose level
- New common function 'run_query' to be used when executing a query
client/mysqlslap.c:
Seed random number generator after options handling
Make common function 'run_query' to take care of "opt_print_only" and "opt_verbose" level
Better error message when failing to connect to MySQL Server
Message when turning off "preserve-schema"
Print auto generated statmements
Print queries if verbose >= 2
Print "connected" if verbose >= 3
client/mysqlslap.c:
Only use the MYSQL* returned from mysql_reqal_connect as an indicator wether the connect was successfull or not.
As the manual says about the return value from mysql_real_connect: "A MYSQL* connection handle if the connection
was successful, NULL if the connection was unsuccessful. For a successful connection, the
return value is the same as the value of the first parameter."
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.
storage/csv/ha_tina.cc:
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
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
