mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41185 commits 2793 branches 343 tags 1.5 GiB
Commit graph

41185 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kristofer.Pettersson@naruto.
74108797b7 Merge naruto.:C:/cpp/bug17489/my51-bug17489 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-12-11 13:22:47 +01:00
Kristofer.Pettersson@naruto.
0068e13e2f Bug#17489 failed to put data file in custom directory use "data directory" option 
- Updated result file to fit test case automerge.
 2006-12-11 12:33:42 +01:00
Kristofer.Pettersson@naruto.
81ec16b751 Merge naruto.:C:/cpp/bug17489/my50-bug17489 
into  naruto.:C:/cpp/bug17489/my51-bug17489
 2006-12-10 17:01:27 +01:00
Kristofer.Pettersson@naruto.
57abd1dc1e Merge naruto.:C:/cpp/bug17489/my41-bug17489 
into  naruto.:C:/cpp/bug17489/my50-bug17489
 2006-12-10 16:40:15 +01:00
tsmith/tim@siva.hindu.god
50e372d608 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51
 2006-12-08 16:39:58 -07:00
tsmith/tim@siva.hindu.god
d54c696c24 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
 2006-12-08 16:26:41 -07:00
tsmith/tim@siva.hindu.god
a58d08513b Makefile.am 
- test* targets are identical (as much as possible) to 5.0 & 5.1 versions
    - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
    - PHONY: target includes all test targets
 2006-12-08 16:17:46 -07:00
kaa@polly.local
d9dc018226 Merge polly.local:/tmp/maint/bug24261/my51-bug24261 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-08 23:47:49 +03:00
kaa@polly.local
6d1e7bcf7b Merge polly.local:/tmp/maint/bug24261/my50-bug24261 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-08 22:38:03 +03:00
msvensson@neptunus.(none)
5817838c06 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-08 17:10:54 +01:00
msvensson@neptunus.(none)
cb903ec340 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-08 17:09:43 +01:00
msvensson@neptunus.(none)
9636ead18d Bug#19410 Test 'kill' fails on Windows + SCO 2006-12-08 17:09:07 +01:00
msvensson@neptunus.(none)
aba988485a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-08 16:53:59 +01:00
msvensson@neptunus.(none)
3a4491c70a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-08 16:50:54 +01:00
msvensson@neptunus.(none)
3e43b86329 Add missing space 2006-12-08 16:48:49 +01:00
msvensson@neptunus.(none)
9064723d1b Bug#19410 Test 'kill' fails on Windows + SCO 
- Use "mysql_field_count" to determine if there is a need to
   call "mysql_store_result"
 2006-12-08 16:43:50 +01:00
msvensson@neptunus.(none)
40927c0cb2 Bug#24498 Stack overflow in mysqltest 
- Thanks to Vasil Dimov for the patch!
 2006-12-08 16:08:54 +01:00
kaa@polly.local
439ce0307b Merge polly.local:/tmp/maint/bug24261/my50-bug24261 
into  polly.local:/tmp/maint/bug24261/my51-bug24261
 2006-12-08 16:02:42 +03:00
msvensson@neptunus.(none)
8b6e5d4dfa Backport fix for mysqladmin on windows test failure 2006-12-08 13:37:40 +01:00
msvensson@neptunus.(none)
0b41593db6 Fix problems with "make dist" and running from "binary dist" 2006-12-08 12:13:43 +01:00
cmiller@zippy.cornsilk.net
38346fa9da Having MYSQL_VERSION_ID defined correctly made this KILL_QUERY enum item visible. This is a 
forwards-incompatible change.
 2006-12-07 12:53:32 -05:00
Kristofer.Pettersson@naruto.
ecbb4eb987 Bug#17498 failed to put data file in custom directory use "data directory" option 
- Using DATA/INDEX DIRECTORY option on Windows put data/index file into
  default directory because the OS doesn't support readlink().
- The procedure for changing data/index file directory is 
  different under Windows.
- With this fix we report a warning if DATA/INDEX option is used,
  but OS doesn't support readlink().
 2006-12-07 17:01:00 +01:00
jpipes@shakedown.(none)
a6ad0c3000 Merge jpipes@bk-internal:/home/bk/mysql-5.0-maint 
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
 2006-12-07 08:52:59 -05:00
jpipes@shakedown.(none)
421533e156 Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246 
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
 2006-12-07 08:49:53 -05:00
andrey@example.com
c24381bdaa Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/mysql-5.1-maint
 2006-12-07 13:58:56 +01:00
andrey@example.com
12a68db3d3 Additional fix for bug#22369 2006-12-07 13:57:39 +01:00
jpipes@shakedown.(none)
07ee2594e5 Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_com.h) 
MYSQL_VERSION_ID is tested before it has been defined.  This leads to
a warning when compiling with -Wundef and it also will break the
internal logic of mysql_com.h as soon as MYSQL_VERSION_ID exceeds
50000.

The fix entailed a simple re-ordering of included files in mysql.h
 2006-12-06 19:13:00 -05:00
msvensson@neptunus.(none)
961275a356 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-06 23:45:09 +01:00
msvensson@neptunus.(none)
94eb027f6b Only call mysql_server_end if mysql_server_init has been called. 
Remove DBUG_ENTER in my_end
 2006-12-06 23:43:36 +01:00
msvensson@neptunus.(none)
eb1ba91d14 Flush stderr after print of error message to get predictable output 2006-12-06 22:03:56 +01:00
msvensson@neptunus.(none)
8022e9fcce Adjust replace to mask win paths 2006-12-06 16:44:31 +01:00
msvensson@neptunus.(none)
d1c9edf47b Initialize guarded_instance to NULL in constuctor. Avoid looping over 
uninitialized list of guarded instances.
 2006-12-06 11:25:18 +01:00
msvensson@neptunus.(none)
ccec047fb5 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 20:46:18 +01:00
msvensson@neptunus.(none)
7cb305ca77 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-05 19:56:49 +01:00
msvensson@neptunus.(none)
b9a4ae9909 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-05 19:47:24 +01:00
msvensson@neptunus.(none)
90226bbc33 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 19:19:58 +01:00
msvensson@neptunus.(none)
244ec63ac4 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-05 19:14:09 +01:00
msvensson@neptunus.(none)
be212d3486 Remove hack that removes vardir 2006-12-05 19:13:31 +01:00
msvensson@neptunus.(none)
a507459762 Merge bk-internal:/home/bk/mysql-4.1-build 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-05 19:12:12 +01:00
msvensson@neptunus.(none)
3ad4878385 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 18:52:58 +01:00
msvensson@neptunus.(none)
d8e6f01396 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-12-05 18:50:46 +01:00
msvensson@neptunus.(none)
6d71f74743 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883 2006-12-05 18:46:08 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
21435418cb Raise version number after cloning 5.1.14-beta 2006-12-05 17:20:47 +01:00
iggy@rolltop.ignatz42.dyndns.org
40aba03eda Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-12-05 10:33:11 -05:00
iggy@rolltop.ignatz42.dyndns.org
ee85368237 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-12-05 10:32:38 -05:00
iggy@rolltop.ignatz42.dyndns.org
f18d064da5 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-12-05 10:32:16 -05:00
iggy@rolltop.ignatz42.dyndns.org
c1c082af86 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
 2006-12-05 09:41:02 -05:00
iggy@rolltop.ignatz42.dyndns.org
5dcf553159 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
 2006-12-05 09:39:48 -05:00
iggy@rolltop.ignatz42.dyndns.org
71970547da Bug#20836 Selecting into variables results in wrong results being returned 
- Comment Cleanup.
 2006-12-05 09:29:32 -05:00
msvensson@neptunus.(none)
04ae69850f Update rsult file after merge, error message number increased 2006-12-05 12:18:33 +01:00