msvensson@shellback.(none)
faeb59cbbf
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 15:41:50 +02:00
msvensson@shellback.(none)
c3e2d543db
Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t
2006-09-15 15:41:04 +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
msvensson@shellback.(none)
cebd7d9d67
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 14:31:25 +02:00
msvensson@shellback.(none)
c4177ec484
Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown
2006-09-15 14:27:45 +02:00
msvensson@shellback.(none)
a989d35221
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 11:03:55 +02:00
ted@ted.mysql.internal
5610ef3018
Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
2006-09-15 04:32:58 +04:00
ted@ted.mysql.internal
cb08c534a0
Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option
2006-09-15 04:01:47 +04: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
iggy@rolltop.ignatz42.dyndns.org
1528d04fea
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-09-14 11:05:27 -04:00
iggy@rolltop.ignatz42.dyndns.org
7c0c57d694
/usr/sbin not always in PATH environment variable.
2006-09-14 10:57:00 -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
iggy@rolltop.ignatz42.dyndns.org
e9ff111d1e
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-09-13 14:18:36 -04:00
iggy@rolltop.ignatz42.dyndns.org
1cae186141
These bitKeeper changes will allow Windows to be used as a primary development platform.
2006-09-13 14:15:22 -04: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
kaa@polly.local
b9811a6df1
Fixed the faulty merge
2006-09-13 19:32:21 +04:00
cmiller@zippy.cornsilk.net
37eaf5cce8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-13 09:38:50 -04:00
cmiller@zippy.cornsilk.net
a724e20c74
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0--windows-vio-uninit
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-09-13 09:37:38 -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
13331b8d24
Fixed compilation
2006-09-12 18:28:36 +04:00
msvensson@shellback.(none)
3cad5d196d
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-12 16:13:54 +02: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
msvensson@shellback.(none)
df2fbc784d
Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c
...
- Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away.
2006-09-12 15:47:48 +02:00
kaa@polly.local
5df7611caa
Post-review fixes for bug #20924
2006-09-12 16:25:40 +04:00
msvensson@shellback.(none)
e890eed69b
Bug#22139 undefined reference to `my_memmem' when compiling tests/mysql_client_test
...
- Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c
2006-09-12 11:34:46 +02:00
msvensson@neptunus.(none)
e38f04a09f
Merge neptunus.(none):/home/msvensson/mysql/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-12 11:23:07 +02:00
msvensson@neptunus.(none)
66bce61a88
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-12 11:14:09 +02:00
cmiller@zippy.cornsilk.net
c02308a729
Fix initialized memory. Count the number of failures in shm-closing
...
functions and return it.
2006-09-08 11:39:03 -04:00
msvensson@shellback.(none)
cf698381af
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-08 13:35:22 +02:00
gluh@mysql.com/gluh.(none)
4afd20545c
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-08 16:17:42 +05:00
gluh@mysql.com/gluh.(none)
a3300c3983
after merge fix
2006-09-08 16:16:39 +05: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
msvensson@shellback.(none)
c79635853a
Speed up "bk citool" for msvensson:
2006-09-08 11:25:08 +02:00
joerg@trift2.
b6071f06ce
configure.in : NDB version and general version must be (kept) in sync - do that.
2006-09-07 17:51:28 +02:00
joerg@trift2.
d7b47f4dfd
Merge trift2.:/M50/clone-5.0
...
into trift2.:/M50/push-5.0
2006-09-07 17:47:57 +02:00
joerg@trift2.
1fc7b01507
Fix a change to "configure.in" that broke building commercial sources.
...
To be pushed to both the cloned 5.0.25 and the general 5.0 tree.
2006-09-07 17:37:51 +02: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
tsmith@maint1.mysql.com
330fb6a3be
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
...
into maint1.mysql.com:/data/localhome/tsmith/bk/50
2006-09-07 01:20:03 +02:00