jimw@mysql.com
f8bfecdf2f
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 15:29:32 -07:00
jimw@mysql.com
ca2b14e7b4
Merge mysql.com:/home/jimw/my/mysql-5.0-12792
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 11:39:48 -07:00
jimw@mysql.com
e848c7c293
Merge mysql.com:/home/jimw/my/mysql-5.0-18617
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 11:37:53 -07:00
evgen@moonbone.local
611d83b5b0
Merge
2006-04-26 22:35:40 +04:00
jimw@mysql.com
74ca82c857
Merge mysql.com:/home/jimw/my/mysql-5.0-16195
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 11:34:45 -07:00
jimw@mysql.com
d89054df4b
Merge mysql.com:/home/jimw/my/mysql-5.0-19083
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-26 11:32:53 -07:00
jimw@mysql.com
960c5621eb
Bug #17849 : sql_big_selects not shown in SHOW VARIABLES output
...
This patch simply adds sql_big_selects to the list of variables
output by SHOW VARIABLES.
2006-04-26 09:21:53 -07:00
bell@sanja.is.com.ua
0e331dfb92
fixed error message text
2006-04-26 17:57:41 +03:00
msvensson@neptunus.(none)
0e08e39763
Change sleep_until_file_created to sleep 100 millisecond instead of sleeping 1 seconds between each iteration.
2006-04-26 13:22:18 +02:00
aivanov@mysql.com
419d4980e0
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:45:29 +04:00
aivanov@mysql.com
6f8c03ee69
Merge mysql.com:/home/alexi/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492
2006-04-26 12:43:38 +04:00
aivanov@mysql.com
06c79b143b
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb/mysql-4.1-innodb
2006-04-26 12:39:47 +04:00
aivanov@mysql.com
b34ec32b5b
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 11:23:43 +04:00
aivanov@mysql.com
11687d2f84
Make innodb_mysql produce a non-empty output.
2006-04-26 11:15:09 +04:00
aivanov@mysql.com
b748835897
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
2006-04-26 09:56:06 +04:00
aivanov@mysql.com
7b8c526078
Files innodb.[test|result] are to be used by Innobase only.
...
Use files innodb_mysql.[test|result] instead.
2006-04-26 09:51:57 +04:00
sergefp@mysql.com
867dffa8a4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug15827-r2
2006-04-26 00:30:54 +04:00
sergefp@mysql.com
1d4acfb668
BUG#15872: Don't run the range analyzer on "t1.keypart NOT IN (const1, ..., )", as that consumes
...
too much memory. Instead, either create the equvalent SEL_TREE manually, or create only two ranges that
strictly include the area to scan
(Note: just to re-iterate: increasing NOT_IN_IGNORE_THRESHOLD will make optimization run slower for big
IN-lists, but the server will not run out of memory. O(N^2) memory use has been eliminated)
2006-04-25 23:33:31 +04:00
evgen@moonbone.local
69b90fb2a8
Merge epotemkin@lsmy3:/data/users/bk/mysql-5.0-opt-bugs
...
into moonbone.local:/work/18739-bug-5.0-mysql
2006-04-25 17:45:31 +04:00
ramil@mysql.com
8cdd68a830
Fix for bug #18501 : Server crashes with monthname().
2006-04-25 14:34:19 +05:00
kroki@mysql.com
63157dca63
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501
2006-04-25 13:01:27 +04:00
konstantin@mysql.com
f912a26b4a
A fix and a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE
...
supported in SP but not in PS": just enable them in prepared
statements, the supporting functionality was implemented when
they were enabled in stored procedures.
2006-04-25 04:27:23 +04:00
knielsen@mysql.com
854cbe88b6
Merge mysql.com:/usr/local/mysql/mysql-4.1
...
into mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix
2006-04-24 23:51:47 +02:00
msvensson@neptunus.(none)
95cac67921
Revert use of octal numbers for chmod
2006-04-24 21:42:44 +02:00
evgen@moonbone.local
3c06a20bfe
having.test:
...
After merge fix for bug#18739
2006-04-24 20:59:23 +04:00
dlenev@mysql.com
0fd2c5b53e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/dlenev/mysql-5.0-bg11081
2006-04-24 19:00:37 +04:00
dlenev@mysql.com
2033f7ba45
Fix for bug#11081 "Using a CONVERT_TZ function in a stored function or
...
trigger fails".
In cases when CONVERT_TZ() function was used in trigger or stored function
(or in stored procedure which was called from trigger or stored function)
error about non existing '.' table was reported.
Statements that use CONVERT_TZ() function should have time zone related
tables in their table list. tz_init_table_list() function which is used
to produce part of table list containing those tables didn't set
TABLE_LIST::db_length/table_name_length members properly. As result time
zone tables needed for CONVERT_TZ() function were incorrectly handled by
prelocking algorithm and "Table '.' doesn't exist' error was emitted.
This fix changes tz_init_table_list() in such way that it properly inits
TABLE_LIST::table_name_length/db_length members and thus produces table list
which can be handled by prelocking algorithm correctly.
2006-04-24 18:57:00 +04:00
kroki@mysql.com
c77336c260
Bug#16501: IS_USED_LOCK does not appear to work
...
Update User_level_lock::thread_id on acquiring an existing lock,
and reset it on lock release.
2006-04-24 18:06:43 +04:00
evgen@moonbone.local
1a6dc770e3
Manually merged
2006-04-24 17:52:15 +04:00
knielsen@mysql.com
17a80c9da4
Fix typo in mysql-test-run.pl (not caught by aotupush since it uses mysql-test-run.sh).
2006-04-24 15:34:01 +02:00
msvensson@neptunus.(none)
92cd4762af
Update disabled message to include bug no.
2006-04-24 14:25:34 +02:00
msvensson@neptunus.(none)
c2efcc4adf
Test it it works better to set no read access for a file by using 000 instead of -r
...
Looks like the trigger.test works that way
2006-04-24 13:51:21 +02:00
msvensson@neptunus.(none)
fd52c34124
Update help message for start-and-exit
2006-04-24 13:33:33 +02:00
msvensson@neptunus.(none)
9e49e393a4
Ad file "have_ndb_status_ok.require"
2006-04-24 13:25:50 +02:00
msvensson@neptunus.(none)
b30df055af
Use "eval select" when evaluating the environment variable "$MYSQL_TEST_ROOT"
2006-04-24 12:01:16 +02:00
msvensson@neptunus.(none)
d1536ba0c9
Make have_ndb.in portable
2006-04-24 12:00:11 +02:00
msvensson@neptunus.(none)
7e3593def8
Bug#19084 ./mysql-test-run.pl do not print bootstrap run info
...
- Log boostratp/install to var/log/boostrap.log
- Log output from mysqladmin to var/log/mysqladmin.log
- Remove old manager references
2006-04-24 11:26:41 +02:00
msvensson@neptunus.(none)
7831bd0002
Cleanup formatting
2006-04-24 10:39:56 +02:00
msvensson@neptunus.(none)
7f1d1586be
Remove the old unused code for setting a PATH
2006-04-24 10:33:24 +02:00
knielsen@mysql.com
afeb3c06f7
Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-4.1-mtr-fix
...
into mysql.com:/data0/knielsen/mysql-4.1-mtr-fix
2006-04-24 10:28:31 +02:00
msvensson@neptunus.(none)
cb69ff25da
Move copy_dir to mtr_misc and rename it to mtr_copy_dir
2006-04-24 10:27:13 +02:00
msvensson@neptunus.(none)
1f2ac2195a
Remove 5 second sleep for win32
2006-04-24 10:22:26 +02:00
msvensson@neptunus.(none)
d59a0f4840
Bug#17002 mysql-test-run as root user
...
- Add test to see if tests are running with root permissions
- Disables tests that uses chmod if that is the case
2006-04-24 10:21:09 +02:00
holyfoot@vva.(none)
a9996318f2
bug #16892 (mysql_client_test fails in embedded server)
2006-04-24 13:07:53 +05:00
ramil@production.mysql.com
f7394c26f5
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/rkalimullin/4.1.b17896
2006-04-24 08:01:10 +02:00
aelkin@mysql.com
a8368fde52
Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/5.0-bug17263-temp_drop
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 20:06:30 +03:00
aelkin@mysql.com
b56d36dd30
Bug#17263 temporary tables and replication
...
The fix refines the algorithm of generating DROPs for binlog.
Temp tables with common pseudo_thread_id are clustered into one query.
Consequently one replication event per pseudo_thread_id is generated.
2006-04-23 19:59:43 +03:00
aelkin@mysql.com
28fe756a3d
manual merge use local
2006-04-23 12:32:41 +03:00
aelkin@mysql.com
b2b725dba0
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 12:32:40 +03:00
aelkin@mysql.com
c5219d0d67
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-04-23 12:32:39 +03:00