mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 01:34:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38202 commits 2785 branches 343 tags 1.7 GiB
Commit graph

17928 commits

Author SHA1 Message Date
lars/lthalmann@mysql.com/dl145j.mysql.com
2da55c05e2 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-11 13:50:41 +02:00
lars/lthalmann@dl145j.mysql.com
1dfc84986e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-11 13:34:44 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
8c64ce171a Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-09-11 11:25:55 +02:00
mats@romeo.(none)
f513461030 WL#3259 (More columns on slave than on master): 
Adding files to CMakeLists.txt
 2006-09-11 10:19:11 +02:00
gkodinov/kgeorge@rakia.(none)
aa7ae80509 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.(none):/home/kgeorge/mysql/autopush/B21772-5.0-opt
 2006-09-11 10:58:47 +03:00
igor@rurik.mysql.com
ecf03182d9 Merge rurik.mysql.com:/home/igor/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug5500
 2006-09-09 10:23:13 -07:00
igor@rurik.mysql.com
9c15b7e0e8 Post-pushbuild corrections for fix of bug #21698. 2006-09-09 09:43:09 -07:00
serg@janus.mylan
28b90bfab5 bugfix 2006-09-09 10:39:12 +02:00
serg@janus.mylan
62b5c384df Merge bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch
 2006-09-09 10:27:12 +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
msvensson@shellback.(none)
5ac62fd1d6 Bug#21855 Compilation error in ha_innodb.cc 
- Add ifdefs in ha_innodb.cc so it's only compiled if we have selected to build mysqld with innodb.
   This is inline with how it's done in other handlers.
 2006-09-08 15:42:49 +02:00
gluh@mysql.com/gluh.(none)
a3300c3983 after merge fix 2006-09-08 16:16:39 +05:00
gkodinov/kgeorge@macbook.gmz
0f8069bfb0 Bug #21772: can not name a column 'upgrade' when create a table in version 5.0.24 
Upgrade was a reserved word. Unreserve UPGRADE so it can be used in unquoted identifiers.
 2006-09-08 13:10:14 +03: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
mats@romeo.(none)
26c831f75d Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
 2006-09-08 11:41:19 +02:00
mats@romeo.(none)
090e020921 Patches to fix problems on Windows 2006-09-08 10:20:14 +02:00
gkodinov/kgeorge@macbook.gmz
719f836cc4 Bug#21555: incorrect behavior with INSERT ... ON DUPL KEY UPDATE and VALUES 
VALUES() was considered a constant. This caused replacing 
 (or pre-calculating) it using uninitialized values before the actual
 execution takes place.
 Mark it as a non-constant (still not dependent of tables) to prevent
 the pre-calculation.
 2006-09-08 10:24:14 +03:00
andrey@example.com
83f4f3b2aa fix build 2006-09-08 00:49:37 +02:00
evgen@moonbone.local
31c738d8a2 query_cache.result, func_time.test, type_date.result, func_time.result: 
Corrected test case after removal of fix for bug#16377         
type_date.test:
  Corrected test case after removal of fix for bug#16377
item_cmpfunc.cc:
  Removed changes to the agg_cmp_type() made in the for bug#16377
 2006-09-08 00:59:34 +04:00
brian@zim.(none)
0668eee261 Add support for Falcon, so that partitioning can be tested. 2006-09-07 12:35:52 -07:00
brian@zim.(none)
7cc71499db Fix for a compile problem in Windows. 2006-09-07 12:34:12 -07:00
brian@zim.(none)
80a8f2c12b Adding in a few more engines to the now defunct (but still used) handler enum's since its the only way to enable for partitioning. 2006-09-07 12:12:52 -07:00
igor@rurik.mysql.com
00a2f232c9 Merge rurik.mysql.com:/home/igor/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21698
 2006-09-07 11:10:36 -07:00
igor@rurik.mysql.com
34206c6f80 Fixed bug #21698: erroneously a field could be replaced by an 
equal constant under any circumstances.
In fact this substitution can be allowed if the field is
not of a type string or if the field reference serves as 
an argument of a comparison predicate.
 2006-09-07 11:06:37 -07:00
brian@zim.(none)
a80a8ecd85 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-07 08:49:33 -07:00
brian@zim.(none)
5e46ea7f03 Moves Innodb handler to the Innodb storage directory. 2006-09-07 08:23:58 -07:00
gluh@mysql.com/gluh.(none)
e2684ad5d7 after merge fix 2006-09-07 18:09:49 +05:00
serg@janus.mylan
a057d38514 cleanup of pligin removal code 
fixed multiple and missing deinitializations, moved all
deinit/del code in one place
 2006-09-07 15:01:36 +02:00
serg@janus.mylan
e1db08e1da minor plugin api fixes: 
remove #define __attribute__(A) from plugin.h
increase API version because placeholders were added
more robust definition of min_plugin_interface_version
 2006-09-07 12:56:32 +02:00
gluh@mysql.com/gluh.(none)
76b97433c2 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-09-07 15:17:46 +05:00
arjen@mysql.com/albus.bitbike.com
f5cebbdfba errmsg.txt: 
Update of Dutch errmsg translations (not complete yet)
errmsg.h:
  Fixup of changed error message file path in comment
authors.h:
  Ego add.
 2006-09-07 13:52:30 +10:00
rburnett@bk-internal.mysql.com
e70867872b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-09-07 04:48:29 +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
tsmith@maint1.mysql.com
84bf16ec40 Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/51
 2006-09-07 01:56:49 +02:00
tsmith@maint1.mysql.com
330fb6a3be Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/50
 2006-09-07 01:20:03 +02:00
tsmith@maint1.mysql.com
8991a269f1 Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx
 2006-09-07 01:07:24 +02:00
tsmith@maint1.mysql.com
b5f67a642f Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
 2006-09-07 00:59:08 +02:00
tsmith@maint1.mysql.com
2480ec8e3e Force conflict to avoid bk automerge behavior; will be undone during merge. 2006-09-07 00:54:48 +02:00
tsmith@maint1.mysql.com
b6cd727ed1 Bug #21054: myisam_stats_method ignored in my.cnf and cmdline 
Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up
 2006-09-07 00:11:43 +02:00
tsmith@maint1.mysql.com
f4265f7a57 Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1) 2006-09-07 00:01:00 +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
14eaca47d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-06 14:28:53 -04:00
mats@romeo.(none)
eea3e3d6b1 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 
into  romeo.(none):/home/bk/b17620-mysql-5.1-new-rpl
 2006-09-06 19:34:02 +02:00
rburnett@production.mysql.com
926d98d973 Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.1
 2006-09-06 18:27:26 +02:00
brian@zim.(none)
1ac47c9513 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/tmp/merge-5.1
 2006-09-06 09:23:47 -07:00
mats@romeo.(none)
6ba388d17c BUG#17620: Row-based replication fails when query cache enabled on slave 
Invalidating query cache when processing rows for a statement on the slave.
 2006-09-06 17:45:27 +02:00
igor@rurik.mysql.com
b7ded1e34f Fixed bug #5500: EXPLAIN returned a wrong select_type for queries using views. 
Select_type in the EXPLAIN output for the query SELECT * FROM t1 was
'SIMPLE', while for the query SELECT * FROM v1, where the view v1
was defined as SELECT * FROM t1, the EXPLAIN output contained 'PRIMARY'
for the select_type column.
 2006-09-06 08:21:43 -07:00
ahristov@bk-internal.mysql.com
75eeececb1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
 2006-09-06 14:35:27 +02: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