msvensson@shellback.(none)
c74ebcc176
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-20 18:02:42 +02:00
msvensson@shellback.(none)
339cd91a98
Fix problem with testcase timeouts not working. The timeout value was always multiplied with 10
...
since the $opt_valgrind variable was initialised to 0, thus being "defined"
2006-09-20 15:41:46 +02:00
msvensson@shellback.(none)
21892f4161
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 20:06:18 +02:00
msvensson@shellback.(none)
9cb40c6e91
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 20:00:01 +02:00
msvensson@shellback.(none)
5a912955d5
Increase suite timeout even more - 6 times - when running with valgrind
2006-09-19 19:41:41 +02:00
msvensson@shellback.(none)
d3d7c74954
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 19:11:41 +02:00
msvensson@shellback.(none)
883a3809c9
Pass --debug arguments to mysqld also when bootstrapping if --debug is tunrned on
2006-09-19 18:39:04 +02:00
msvensson@shellback.(none)
1515818276
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 17:40:49 +02:00
msvensson@shellback.(none)
895d986266
Don't bother to remove the pid_file in mtr_kill_leftovers as it could potentially remove a the pidfile before the process is killed.
...
The pid file will be removed later when var/ directory is recreated.
2006-09-19 16:48:01 +02:00
msvensson@shellback.(none)
fa26e83fd2
Fix warnings in mysql-test-run.pl
2006-09-19 16:43:42 +02:00
thek@kpdesk.mysql.com
f8dbb2dd3b
Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
...
into kpdesk.mysql.com:/home/thek/dev2/mysql-5.0-maint
2006-09-19 12:45:04 +02:00
thek@kpdesk.mysql.com
b4908ed35d
Merge kpdesk.mysql.com:/home/thek/dev2/bug21139/my41-bug21139
...
into kpdesk.mysql.com:/home/thek/dev2/bug21139/my50-bug21139
2006-09-19 12:41:15 +02:00
thek@kpdesk.mysql.com
66fa757e1f
Bug#21139 Handling of database differs in "embedded" , test lowercase_fs_off fails
...
- Access checks are omitted when compliled without --with-embedded-privilege-control
- Patch: skip this test
2006-09-19 12:40:31 +02:00
msvensson@shellback.(none)
781aaaba66
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-18 17:47:26 +02:00
msvensson@shellback.(none)
dafb50055f
Add character-sets-dir argument to "mysql". That avoids a local
...
installed charset dir being used.
2006-09-18 17:46:36 +02:00
cmiller@zippy.cornsilk.net
47483245b9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-15 09:00:46 -04:00
msvensson@shellback.(none)
bdc7837388
Merge msvensson.mysql.internal:mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 14:34:50 +02:00
iggy@rolltop.ignatz42.dyndns.org
02833f49c3
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-09-14 16:37:22 -04:00
iggy@rolltop.ignatz42.dyndns.org
4fa6c8c776
Bug#21424 mysqldump failing to export/import views.
...
Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored.
Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.
2006-09-14 14:56:14 -04:00
cmiller@zippy.cornsilk.net
ebf4d199df
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-14 09:21:09 -04:00
msvensson@neptunus.(none)
fd15a84c55
Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-14 11:01:23 +02:00
kaa@polly.local
3d2c573833
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
2006-09-13 20:31:05 +04:00
cmiller@zippy.cornsilk.net
94382c313a
Bug #21618 : NULL shown as empty string in client
...
The column's NOT NULL flag doesn't affect what we should print. Remove the
wrong logic that does check it.
Also, verify that this and the previous two tests print the same data as
other output formats.
2006-09-13 11:41:41 -04:00
cmiller@maint1.mysql.com
459f9fdc6d
Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my50-bug15583
...
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
2006-09-13 15:07:06 +02:00
timour/timka@lamia.home
c8ebf3761e
Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm
...
into lamia.home:/home/timka/mysql/src/5.0-dbg
2006-09-13 15:24:06 +03:00
kaa@polly.local
cccc3da13a
Merge polly.local:/tmp/20924/bug20294/my50-bug20294
...
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
2006-09-13 16:06:59 +04:00
kaa@polly.local
e812ae873d
Merge polly.local:/tmp/20924/bug20294/my41-bug20294
...
into polly.local:/tmp/20924/bug20294/my50-bug20294
2006-09-13 15:18:14 +04:00
kaa@polly.local
397f0df9ad
Cset exclude: kaa@polly.local|ChangeSet|20060912122540|09861
...
Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983
2006-09-13 14:41:28 +04:00
kaa@polly.local
6c0482b14a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
2006-09-12 20:01:52 +04:00
kaa@polly.local
6060b5bb50
Merge polly.local:/tmp/20924/bug20294/my50-bug20294
...
into polly.local:/home/kaa/src/maint/m50-maint--07OGt
2006-09-12 19:35:44 +04:00
timour/timka@lamia.home
38a450b44a
Fix for BUG#21774: Column count doesn't match value count at row x
...
The cause of the bug was an incomplete fix for bug 18080.
The problem was that setup_tables() unconditionally reset the
name resolution context to its 'tables' argument, which pointed
to the first table of an SQL statement.
The bug fix limits resetting of the name resolution context in
setup_tables() only in the cases when the context was not set
by earlier parser/optimizer phases.
2006-09-12 17:50:24 +03:00
kaa@polly.local
e03faff3e4
Merge polly.local:/tmp/20924/bug20294/my41-bug20294
...
into polly.local:/tmp/20924/bug20294/my50-bug20294
2006-09-12 17:57:15 +04:00
kaa@polly.local
5df7611caa
Post-review fixes for bug #20924
2006-09-12 16:25:40 +04:00
kaa@polly.local
268c7a3522
Bug #20924 : CAST(expr as UNSIGNED) returns SIGNED value when used in various functions
...
- Honor unsigned_flag in the corresponding functions
- Use compare_int_signed_unsigned()/compare_int_unsigned_signed() instead of explicit comparison in GREATEST() and LEAST()
2006-09-08 14:08:29 +04:00
gluh@mysql.com/gluh.(none)
e2684ad5d7
after merge fix
2006-09-07 18:09:49 +05:00
gluh@mysql.com/gluh.(none)
76b97433c2
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-07 15:17:46 +05:00
msvensson@neptunus.(none)
41001755f2
Removed unused variable "glob_cygwin_shell"
2006-09-06 15:06:22 +02:00
guilhem@gbichot3.local
e4d3595b18
Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".
...
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
only NDB wanted that. Users and trainers complained that it affected
InnoDB and was a change compared to 4.1 where only NDB autocommitted.
To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
ha_ndbcluster::external_lock().
The result is that LOAD DATA INFILE commits all uncommitted changes
of NDB if this is an NDB table, its own changes if this is an NDB
table, but does not affect other engines.
Note: even though there is no "commit the full transaction at end"
anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
problems per a comment of Pem).
Note: ha_ndbcluster::has_transactions() does not give reliable results
because it says "yes" even if transactions are disabled in this engine...
2006-09-05 16:52:05 +02:00
msvensson@neptunus.(none)
4d0430c8fd
Merge dl145s:/data/tkatchaounov/5.0-bug-21787
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-09-04 11:45:43 +02:00
msvensson@neptunus.(none)
1bea6cf1a2
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-09-04 11:42:16 +02:00
msvensson@neptunus.(none)
1fd3958ea6
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-09-04 11:39:58 +02:00
msvensson@neptunus.(none)
d253cf7813
Fix problem where mysql-test-run.pl fails to start up the mysqld after a failed test. Shows up on win hosts where one failed test case make subsequent ones fails with error "Could not open connection 'default': 2003 Can't connect to MySQL server on 'localhost'"
2006-09-04 11:30:04 +02:00
msvensson@neptunus.(none)
e40e56346d
Merge bk-internal:/home/bk/mysql-5.0-cmake
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-09-04 10:36:01 +02:00
tnurnberg@maint1.mysql.com
ab7810c8e9
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/tnurnberg/my50-21913
2006-09-04 07:45:49 +02:00
tnurnberg@salvation.intern.azundris.com
72c6c14bb2
Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913
...
into salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913
21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
Variable character_set_results can legally be NULL (for "no conversion.")
This could result in a NULL deref that crashed the server. Fixed.
(Although ran some additional precursory tests to see whether I could break
anything else, but no breakage so far.)
2006-09-04 07:01:15 +02:00
tnurnberg@salvation.intern.azundris.com
41f1932488
Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
...
Variable character_set_results can legally be NULL (for "no conversion.")
This could result in a NULL deref that crashed the server. Fixed.
(Although ran some additional precursory tests to see whether I could break
anything else, but no breakage so far.)
2006-09-04 06:16:34 +02:00
grichter@bk-internal.mysql.com
6993e3a3f7
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
2006-09-02 11:03:16 +02:00
cmiller@maint1.mysql.com
d6f2659239
Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my50-mtr_reorder
...
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
2006-09-01 21:56:27 +02:00
cmiller@maint1.mysql.com
46b3997c51
mtr_cases.pl:
...
Provide a more extensible, easier-to-change way of reordering
test cases.
2006-09-01 21:53:23 +02:00
georg@lmy002.wdf.sap.corp
5686da41ac
Fixes for crashes and test failures
2006-09-01 14:34:37 +02:00