database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
51,338 Commits 3,280 Branches 1,098 Tags
fabaa50cd969dc8be45cd3679389c4edef34e403
Commit Graph

20420 Commits

Author SHA1 Message Date
iggy@alf.
b2bf19354c Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_pt
 2007-04-24 12:50:28 -04:00
gni@dev3-221.dev.cn.tlan
1869b2c4d0 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
 2007-04-24 17:34:36 +08:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
1d0f9bed85 Merge mysql.com:/home/ram/work/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b27515/b27515.4.1
 2007-04-24 14:33:15 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
250ae972e7 Merge mysql.com:/home/ram/work/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b27515/b27515.4.1
 2007-04-24 14:20:28 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
49b187034d Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
 2007-04-24 14:08:03 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
244c192347 after-merge fix 2007-04-24 13:53:12 +05:00
jonas@perch.ndb.mysql.com
da8931cb98 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-04-24 09:53:32 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
3935e22459 Merge mysql.com:/home/ram/work/b27515/b27515.5.0 
into  mysql.com:/home/ram/work/b27515/b27515.5.1
 2007-04-24 11:28:18 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d13861546e after-merge fix 2007-04-24 11:26:40 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bb3b6ae72c Merge mysql.com:/home/ram/work/b27515/b27515.4.1 
into  mysql.com:/home/ram/work/b27515/b27515.5.0
 2007-04-24 10:27:59 +05:00
iggy@alf.
2c955476f8 Merge alf.:D:/src/mysql-5.1-maint 
into  alf.:D:/src/mysql-5.1-maint_pt
 2007-04-23 23:24:24 -04:00
cmiller@zippy.cornsilk.net
28dbc263f6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint--bug27894
 2007-04-23 20:46:06 -04:00
cmiller@zippy.cornsilk.net
d81f116534 Contributed patch from Jorge Bernal Ordovás. CLA#42 
Bug#27894: mysqlbinlog formats timestamp wrong in comment

Date stamps lack zero padding, and so are meaningless.

Implement minimum-width zero padding for the percent-escape sequences
used in the logging code.
 2007-04-23 17:58:33 -04:00
iggy@recycle.(none)
e251139c80 Merge recycle.(none):/src/mysql-5.1-maint 
into  recycle.(none):/src/mysql-5.1-maint_25141
 2007-04-23 17:04:24 -04:00
tsmith@quadxeon.mysql.com
12147d9553 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
 2007-04-23 21:36:46 +02:00
tsmith@quadxeon.mysql.com
53985105f9 mysql_upgrade.test: 
Fix minor merge "oopsie"
 2007-04-23 21:27:43 +02:00
iggy@recycle.(none)
2a54abd582 Bug#25141 Crash Server on Partitioning command 
- The function build_table_filename() builds up a string unconditionally 
using the forward slash as a path separator. Later, when the string is 
searched for FN_LIBCHAR by the set_up_table_before_create() function, a 
null pointer is returned that is finally used by strlen in the 
append_file_to_dir() function which causes the crash.
 2007-04-23 13:50:34 -04:00
gkodinov/kgeorge@magare.gmz
58320dfe42 Merge magare.gmz:/home/kgeorge/mysql/work/B27811-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B27811-5.0-opt
 2007-04-23 19:02:40 +03:00
msvensson@pilot.blaudden
2ac94c30f4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 17:01:02 +02:00
kaa@polly.local
9a99aa8155 Fix for bug #22364 "Inconsistent "matched rows" when executing UPDATE" 
In multi_update::send_data(), the counter of matched rows was not correctly incremented, when during insertion of a new row to a temporay table it had to be converted from HEAP to MyISAM.

This fix changes the logic to increment the counter of matched rows in the following cases:
1. If the error returned from write_row() is zero.
2. If the error returned from write_row() is non-zero, is neither HA_ERR_FOUND_DUPP_KEY nor HA_ERR_FOUND_DUPP_UNIQUE, and a call to create_myisam_from_heap() succeeds.
 2007-04-23 18:22:33 +04:00
msvensson@pilot.blaudden
dcd914e24e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 16:22:01 +02:00
gkodinov/kgeorge@magare.gmz
975815280a Bug #27811: 
FORCE_INIT_OF_VARS was not defined for the 
 debug builds on Windows. This caused LINT_INIT
 macro to be defined as NOP and this triggers
 false alarms about use of uninitialized with
 the runtime libs of some Visual Studio versions.
 Fixed by defining FORCE_INIT_OF_VARS to match the
 state of the Windows
 2007-04-23 17:15:51 +03:00
msvensson@pilot.blaudden
b941ef8633 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 13:28:09 +02:00
msvensson@pilot.blaudden
b11a1c8fd4 Update test to work also when --pager does not exist in "mysql" 2007-04-23 12:58:35 +02:00
msvensson@pilot.blaudden
d1de41c59a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 12:05:00 +02:00
msvensson@pilot.blaudden
a23eeb620c Remove left over file fix_priv_tabs.result 2007-04-23 11:41:55 +02:00
joerg@debian.(none)
e791812895 Merge debian.(none):/M41/mysql-4.1 
into  debian.(none):/M41/push-4.1
 2007-04-23 11:36:30 +02:00
joerg@debian.(none)
9c04bfed83 Merge debian.(none):/M50/mysql-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-23 11:31:11 +02:00
joerg@debian.(none)
94008df3e0 Merge debian.(none):/M51/mysql-5.1 
into  debian.(none):/M51/push-5.1
 2007-04-23 11:21:15 +02:00
msvensson@pilot.blaudden
7411813e48 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-23 11:03:40 +02:00
msvensson@pilot.blaudden
d26965c361 Protect against killing pid's that would "killall" or "kill self" 2007-04-23 11:01:22 +02:00
holyfoot/hf@hfmain.(none)
bc29528562 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/27564/my51-27564
 2007-04-22 12:58:31 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
8df747b9c1 rpl_udf test enabled 2007-04-22 12:57:32 +05:00
mjorgensen@blade09.mysql.com
121bc31b4a Merge bk-internal:/home/bk/mysql-5.0 
into  blade09.mysql.com:/tmp/mmj/mysql-5.0-runtime
 2007-04-21 18:36:06 +02:00
mjorgensen@blade09.mysql.com
7855ae51f0 Merge bk-internal:/home/bk/mysql-5.1 
into  blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
 2007-04-21 18:35:01 +02:00
sergefp@mysql.com
a249a0acaa Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug27939
 2007-04-21 20:27:39 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
5004557953 test fixed for embedded server 2007-04-21 13:26:44 +05:00
ibabaev@bk-internal.mysql.com
c22d6fbb2b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-04-21 03:51:51 +02:00
igor@olga.mysql.com
8c85357ea3 Post-merge fix. 2007-04-20 17:47:14 -07:00
malff/marcsql@weblab.(none)
c574d95a5c manual merge 2007-04-20 17:49:07 -06:00
ibabaev@bk-internal.mysql.com
c09d1cfe92 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-04-21 00:36:21 +02:00
malff/marcsql@weblab.(none)
fc36313733 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-04-20 15:34:04 -06:00
malff/marcsql@weblab.(none)
2d6d8e2abe Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-04-20 15:31:41 -06:00
evgen@moonbone.local
4434ff13a9 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
 2007-04-21 00:33:56 +04:00
sergefp@mysql.com
1f6935d2af Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug27939
 2007-04-21 00:24:43 +04:00
mikael@dator3.(none)
0942b2d8aa Removed warnings 2007-04-20 18:46:12 +02:00
mikael@dator3.(none)
81db111e24 BUG#18198 
Added new test cases, fixed bugs in relation to those
 2007-04-20 18:35:16 +02:00
joerg@trift2.
bcaa5cc7e8 mysql-test/t/sp_trans_log.test : Disable it in embedded (test fails). 2007-04-20 16:54:21 +02:00
kent@mysql.com/kent-amd64.(none)
75c31f6bb9 Makefile.am: 
Typo
 2007-04-20 15:52:49 +02:00
kent@mysql.com/kent-amd64.(none)
9050451afe Makefile.am: 
Added the 'suite' directory to the source TAR and install
 2007-04-20 15:49:35 +02:00