database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Code Activity
37,598 Commits 3,275 Branches 1,097 Tags
d77d51a39f01c5df13695989b2244f0a3d403691
Commit Graph

11104 Commits

Author SHA1 Message Date
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
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
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
d346580f0e 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:47:17 -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
cmiller@zippy.cornsilk.net
298917eb5b Fix bad manual merge. 2006-09-05 16:28:31 -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
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
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
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
jimw@rama.(none)
ebf482c447 Fix results of mysqldump test after messy merge 2006-08-31 21:21:23 -07:00
jimw@rama.(none)
9111a9c5c1 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-08-31 21:03:25 -07:00
jimw@rama.(none)
4d29dd1f3b Merge rama.(none):/home/jimw/my/mysql-5.0-clean 
into  rama.(none):/home/jimw/my/mysql-5.1-clean

mysqldump.result is wrong, will need to be cleaned up.
 2006-08-31 21:02:17 -07:00
jimw@rama.(none)
bd2825f5bb Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test 
so that 4.1 and 5.0 tests are all in the right place and no tests are duplicated.
 2006-08-31 20:53:34 -07:00
tsmith@maint2.mysql.com
39a139193f post-merge fix 2006-09-01 05:00:32 +02:00
jimw@rama.(none)
5884eea9a3 Resolve conflicts 2006-08-31 18:24:37 -07:00
mikael/pappa@dator5.(none)
35304be521 Merge dator5.(none):/home/pappa/clean-mysql-5.1-new-ndb 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 16:45:46 -04:00
anozdrin/alik@alik.
5d8598a405 Fix im_instance_conf.imtest failure on AIX and HPUX. 
The problem was in dummy grep on AIX and HPUX.

The fix is to use more portable patterns.

The patch is only for test suite
(i.e. does not touch server codebase).
 2006-08-31 18:48:50 +04:00
msvensson@shellback.(none)
d463972da7 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-31 11:57:36 +02:00
msvensson@shellback.(none)
b0754b3d02 Disable testing of "encrypt" in ctype_ucs.test 2006-08-31 11:53:08 +02:00
jonas@perch.ndb.mysql.com
7fc7ef51e1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
 2006-08-31 11:02:12 +02:00
mikael/pappa@dator5.(none)
5109531b61 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 04:56:09 -04:00
mikael/pappa@dator5.(none)
ba792224c4 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 04:49:34 -04:00
gluh@mysql.com/gluh.(none)
acaef19c61 Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..." 
fixed error message
 2006-08-31 13:43:26 +05:00
mikael/pappa@dator5.(none)
8c5db16fc5 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug21388
 2006-08-31 04:21:14 -04:00
evgen@moonbone.local
94028c618f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
 2006-08-31 12:14:27 +04:00
cmiller@zippy.cornsilk.net
d575196c35 Manual merge. 2006-08-30 21:26:43 -04:00
cmiller@zippy.cornsilk.net
f864c06e50 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-30 18:19:39 -04:00
tsmith@maint2.mysql.com
0af0180468 Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-08-31 00:01:43 +02:00
tsmith@maint2.mysql.com
6809271303 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51
 2006-08-30 23:20:01 +02:00
tsmith@maint2.mysql.com
d5ee5049be Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
 2006-08-30 23:14:29 +02:00
tsmith@maint2.mysql.com
e80741b3a5 Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows 2006-08-30 22:39:23 +02:00
kostja@bodhi.local
7290fa2fb7 Post-merge fixes. 2006-08-30 23:09:47 +04:00
evgen@moonbone.local
fe18e36e73 sql_base.cc, ndb_condition_pushdown.result, opt_range.cc: 
After merge changes
 2006-08-30 22:11:23 +04:00
kostja@bodhi.local
cb26d47570 Post-merge fixes. 2006-08-30 03:22:59 +04:00
kostja@bodhi.local
ebb7070430 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-30 03:00:19 +04:00
kostja@bodhi.local
8566db3fc7 Remove the fix for Bug#10668 "CREATE USER does not enforce username 
length limit", it's superseded by the fix for Bug#16899 "Possible buffer
overflow in handling of DEFINER-clause". Update test results.
 2006-08-30 01:48:15 +04:00
jonas@perch.ndb.mysql.com
365b69dc7f 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-08-29 22:56:23 +02:00
kostja@bodhi.local
f8d34e1030 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-14897
 2006-08-30 00:45:33 +04:00