Commit graph

32166 commits

Author SHA1 Message Date
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
msvensson@shellback.(none)
49275c0cad Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 08:18:40 +02:00
msvensson@shellback.(none)
efcb56cb79 Bug#19738 "make install" tries to build files that "make" should already have built
- Remove the wildcard dependcy on the charset xml files
2006-09-19 08:15:42 +02:00
msvensson@shellback.(none)
d94fa53682 Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-18 21:55:20 +02:00
msvensson@shellback.(none)
b50c843b25 BUG#19738 "make install" tries to build files that "make" should already have built
- Make built sources only depend on it's sources not the built tool
2006-09-18 21:11:34 +02:00
msvensson@shellback.(none)
52fd031f32 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-18 19:42:26 +02:00
msvensson@shellback.(none)
2b014bedaf Add directive to not update files from bitkeeper 2006-09-18 19:37:22 +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
ramil/ram@mysql.com/myoffice.izhnet.ru
ad1c1592e1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b18267
2006-09-18 10:37:26 +05:00
msvensson@shellback.(none)
d8e27606e1 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 18:00:03 +02:00
msvensson@shellback.(none)
6a0841a1bc Add definition of SHUT_RDWR for compiling on windows 2006-09-15 17:53:45 +02:00
msvensson@shellback.(none)
b0fc6840b4 Merge bk-internal:/home/bk/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 17:09:58 +02:00
msvensson@shellback.(none)
27d8545868 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 17:00:29 +02:00
msvensson@shellback.(none)
b178e40cae Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602
into  shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:57:37 +02:00
msvensson@shellback.(none)
bfc3cfd4ee Merge msvensson.mysql.internal:mysql/my50-m-bug16574
into  shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:55:47 +02:00
msvensson@shellback.(none)
557a8f50b8 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 16:52:52 +02:00
msvensson@shellback.(none)
fb89352b47 Merge msvensson.mysql.internal:mysql/my50-m-bug16576
into  shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:52:08 +02:00
msvensson@shellback.(none)
223c82fde2 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 16:50:08 +02:00
msvensson@shellback.(none)
a297c29243 Merge msvensson.mysql.internal:mysql/my50-m-bug21222
into  shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:49:24 +02:00
msvensson@shellback.(none)
2c3015499d Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 16:42:27 +02:00
hartmut@mysql.com/linux.site
4e65deb2fa Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
2006-09-15 16:38:18 +02:00
hartmut@mysql.com/linux.site
871eeadc94 Add SSL specific linker flags to --libmysqld-libs (Bug #21239) 2006-09-15 16:35:50 +02:00
msvensson@shellback.(none)
2ce0da628e Merge bk-internal:/home/bk/mysql-5.0-maint
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-15 15:43:46 +02:00
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