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
mskold@mysql.com
4d771e4fca
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
2006-04-25 10:36:39 +02: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
tomas@poseidon.ndb.mysql.com
243965789e
Bug #14516 Restart of cluster can cause NDB API replication failure
...
- this behavior was already changed, adding testcase
2006-04-24 23:29:33 +02:00
cmiller@zippy.(none)
9ae7dd9e35
Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-04-24 16:17:50 -04:00
cmiller@zippy.(none)
693695850b
Manual merge fix.
2006-04-24 16:05:57 -04:00
andrey@lmy004.
7a314abaa9
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-new-clean
2006-04-24 23:04:15 +03:00
msvensson@neptunus.(none)
95cac67921
Revert use of octal numbers for chmod
2006-04-24 21:42:44 +02:00
cmiller@zippy.(none)
81d3a4fb05
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
Merge by hand. This may not be right.
2006-04-24 14:49:05 -04:00
evgen@moonbone.local
3c06a20bfe
having.test:
...
After merge fix for bug#18739
2006-04-24 20:59:23 +04:00
tomas@poseidon.ndb.mysql.com
5241916946
bug#18604 create logfile for MyISAM tables
...
- changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
- pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine
2006-04-24 18:26:30 +02: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
svoj@april.(none)
a83c4b6841
Merge april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-new
2006-04-24 19:53:38 +05: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
tomas@poseidon.ndb.mysql.com
d999da80b0
Bug #18935 restore of apply_status table fails using old ndb backup
2006-04-24 16:05:02 +02: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
bell@sanja.is.com.ua
b2c810e847
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
2006-04-24 13:32:07 +03: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
andrey@lmy004.
6b3fe492ed
enable logs_tests
2006-04-24 12:30:17 +03: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
andrey@lmy004.
82c8ef7be1
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-new-clean
2006-04-24 12:21:38 +03:00
andrey@lmy004.
bfe997f56f
enable events_scheduling
2006-04-24 12:17:28 +03:00
andrey@lmy004.
b7adc19900
test case for bug 19170
2006-04-24 12:12:15 +03: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
aivanov@mysql.com
e72bab17fd
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb/mysql-5.1
2006-04-23 16:06:46 +04:00
aivanov@mysql.com
448f6e66bd
Corrected merge mistake.
2006-04-23 16:05:11 +04:00
aivanov@mysql.com
3431db829e
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/innodb/mysql-5.1
2006-04-23 14:28:47 +04: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
konstantin@mysql.com
8301e6f625
Merge mysql.com:/opt/local/work/mysql-5.0-root
...
into mysql.com:/opt/local/work/mysql-5.0-runtime-merge
2006-04-23 13:32:38 +04:00
aivanov@mysql.com
4fba67933d
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0
2006-04-23 13:32:37 +04:00
aelkin@mysql.com
a4ff312037
Bug#17263 temporary tables and replication
...
Backporting a changeset made for 5.0. Comments from there:
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 12:18:57 +03:00