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
37690 commits 2793 branches 343 tags 1.5 GiB
Commit graph

11008 commits

Author SHA1 Message Date
kaa@polly.local
654c03fb4c Merge polly.local:/tmp/20924/bug20294/my51-bug20294 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-13 16:09:29 +04:00
kaa@polly.local
61e3f8eae1 Merge polly.local:/tmp/20924/bug20294/my50-bug20294 
into  polly.local:/tmp/20924/bug20294/my51-bug20294
 2006-09-13 16:00:15 +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
3c6a9040d2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-09-12 23:18:30 +04:00
kaa@polly.local
ca48b7af0c Merge polly.local:/tmp/20924/bug20294/my50-bug20294 
into  polly.local:/tmp/20924/bug20294/my51-bug20294
 2006-09-12 18:43:38 +04: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
Kristofer.Pettersson@naruto.
53bb0bdcda Merge naruto.:C:/cpp/bug20789/my50-bug20789 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-09-12 14:34:01 +02:00
kaa@polly.local
5df7611caa Post-review fixes for bug #20924 2006-09-12 16:25:40 +04:00
Kristofer.Pettersson@naruto.
323efcc0c1 Bug#20789 Merge Subtable Rename Causes Crash 
- When an ALTER TABLE RENAME is performed on windows, the files are closed and their cached file 
   descriptors are marked invalid. Performing INSERT, UPDATE or SELECT on the associated merge
   table causes a server crash on windows. This patch adds a test for bad file descriptors when a 
   table attempts a lock. If a bad descriptor is found an error is thrown. An additional FLUSH TABLES
   will be necessary to further operate on the associated merge table.
 2006-09-12 14:23:41 +02:00
cmiller@maint1.mysql.com
9b18cae31b Change stolen from the -win tree. 
More specifically, the scripts/Makefile isn't created and it doesn't
translate mysql_fix_privilege_tables ".sh" .  So, 
mysql-test/mysql-test-run.pl doesn't find the binary and substitutes 
/bin/false instead.  That obviously doesn't "fix" anything and the 
test fails because of it.
 2006-09-12 03:39:58 +02:00
msvensson@shellback.(none)
d54cbe9120 "crash_commit_before" need innodb 2006-09-08 16:26:35 +02:00
msvensson@shellback.(none)
e03a0617a0 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-08 16:01:51 +02: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
tnurnberg@mysql.com/salvation.intern.azundris.com
330ae3e29d make partition_mgm test deterministic wrt results of ls 2006-09-07 04:18:17 +02:00
tnurnberg@salvation.intern.azundris.com
c9645e9c6d Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-07 02:58:47 +02:00
jimw@rama.(none)
d77d51a39f Merge rama.(none):/home/jimw/my/mysql-5.1-19874 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-09-06 12:58:48 -07:00
tnurnberg@salvation.intern.azundris.com
c4b3f9bae9 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-06 20:32:23 +02:00
cmiller@zippy.cornsilk.net
8fdffd1b75 Fix merge problems; work around disparate "ls" behaviors. 2006-09-06 14:23:39 -04:00
guilhem@gbichot3.local
8f2ad430e2 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  gbichot3.local:/home/mysql_src/mysql-5.1-2
 2006-09-06 12:52:59 +02:00
guilhem@gbichot3.local
04284f8c10 New way to fix BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY UPDATE". 
This bug report was two problems:
1) LAST_INSERT_ID() returns a value which does not exist in the table
2) the reporter would want it to return the autoinc id of the updated
row.
1) is a real bug, 2) is a feature request.
In July I implemented 2) in 5.1 (which automatically fixes 1).
This has not yet been documented or released, so is changeable.
Precisely, recently Paul and a user found an easy workaround to give
2), which works in 4.1-5.0-5.1. So I can revert my code for 2),
because it's not needed, that's what I do here;
we forget about 2) (we will document the workaround).
But when I revert my code for 2), 1) comes back. We solve 1) by saying
that if INSERT ON DUPLICATE KEY UPDATE updates a row, it's like a
regular UPDATE: LAST_INSERT_ID() should not be affected (instead of
returning a non-existent value).
So note: no behaviour change compared to the last released 5.1; just
a bugfix for 1).
 2006-09-06 12:50:42 +02:00
jonas@perch.ndb.mysql.com
e51935b363 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-09-06 02:16:36 +02:00
tnurnberg@salvation.intern.azundris.com
6bc0097f34 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-06 01:36:44 +02:00
cmiller@zippy.cornsilk.net
843c55763e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:50:07 -04:00
cmiller@zippy.cornsilk.net
ba3829dc36 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:46:36 -04:00
cmiller@zippy.cornsilk.net
869be90372 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:27:24 -04:00
cmiller@zippy.cornsilk.net
47982ebae7 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 17:09:52 -04:00
tnurnberg@salvation.intern.azundris.com
44f3cc636d Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-05 23:03:04 +02:00
tnurnberg@salvation.intern.azundris.com
fbff93ef75 Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-05 22:55:55 +02:00
cmiller@zippy.cornsilk.net
b023f5d3f5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 16:45:25 -04:00
cmiller@zippy.cornsilk.net
1b60377484 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:52:06 -04:00
cmiller@zippy.cornsilk.net
4a62b02de8 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:49:24 -04:00
cmiller@zippy.cornsilk.net
7001078c8f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:44:07 -04:00
cmiller@zippy.cornsilk.net
6dd8667b7b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:42:41 -04:00
cmiller@zippy.cornsilk.net
469e85e3f2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:35:13 -04:00
cmiller@zippy.cornsilk.net
9dd2f452ca Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 11:24:19 -04:00
tsmith@maint2.mysql.com
5f5cb7d1f6 Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 
into  maint2.mysql.com:/data/localhome/tsmith/bk/51
 2006-09-04 23:05:17 +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
jonas@perch.ndb.mysql.com
81f9676de6 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-09-03 17:55:01 +02:00
anozdrin/alik@alik.
faad252336 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-tree 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-09-01 22:24:51 +04:00
jimw@rama.(none)
bfb06f15fd Bug #19874: SHOW COLUMNS and SHOW KEYS handle identifiers containing \ incorrectly 
Identifiers with embedded escape characters were not handled correctly by
  some SHOW statements due to some old code that was doing some extra unescaping.
 2006-09-01 10:39:48 -07:00
msvensson@neptunus.(none)
ba7035ab55 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-01 16:57:51 +02:00
msvensson@neptunus.(none)
2036bdc88e Move test that requires innodb to "mysql_innodb" 2006-09-01 16:51:37 +02:00
mskold/marty@linux.site
712f1f3da4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-01 16:16:49 +02:00
mskold/marty@mysql.com/linux.site
166580275c Removed absolute path 2006-09-01 16:14:59 +02:00
mskold/marty@linux.site
04a62eb684 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-09-01 15:26:03 +02:00
mskold/marty@mysql.com/linux.site
8fdc781d39 Fixed ndbapi-examples, and added tests for mysql-test-run.pl 2006-09-01 15:14:50 +02:00
evgen@moonbone.local
e1c245bff3 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 
into  moonbone.local:/work/tmp_merge-5.1-mysql
 2006-09-01 14:08:38 +04:00
tsmith@maint2.mysql.com
e2f40aa6d0 Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-09-01 08:53:56 +02:00