mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26559 commits 2788 branches 343 tags 1.7 GiB
Commit graph

26559 commits

This branch
This branch
All branches
Author SHA1 Message Date
serg@serg.mylan
306aa15391 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-merged
 2005-09-21 17:42:44 +02:00
serg@serg.mylan
3b41e3362b aftermerge fix 2005-09-21 17:38:26 +02:00
lars@mysql.com
6d70588d9e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-rollback-comment
 2005-09-21 17:38:08 +02:00
jonas@perch.ndb.mysql.com
232ac1db8d Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-21 17:38:07 +02:00
jonas@perch.ndb.mysql.com
8f11620d9a ndb merge fix 2005-09-21 17:37:33 +02:00
jonas@perch.ndb.mysql.com
9a33319d6c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2005-09-21 17:27:04 +02:00
jonas@perch.ndb.mysql.com
ed8f33f057 bug#12950 
ndb backup with charsets and simultanious updates
    make sure that backup _dont_ read xfrm data
 2005-09-21 17:24:39 +02:00
lars@mysql.com
83491f97f6 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-rollback-comment
 2005-09-21 15:35:37 +02:00
jonas@perch.ndb.mysql.com
d1ee898d34 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-09-21 14:39:28 +02:00
jonas@perch.ndb.mysql.com
05d875f8c1 sql/item_func.cc 
remove extra ";" after function
 2005-09-21 14:36:55 +02:00
lars@mysql.com
ed7eac5973 Added clarification comment regarding added ROLLBACK to mysqlbinlog output 2005-09-21 14:27:41 +02:00
serg@serg.mylan
a083ff160e merged 2005-09-21 13:53:22 +02:00
jonas@perch.ndb.mysql.com
f35c49f748 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-21 13:22:59 +02:00
jonas@perch.ndb.mysql.com
6ed4539561 ndb post merge fixes (show engine ndb status) 2005-09-21 13:22:27 +02:00
serg@serg.mylan
23f35495ac merged 2005-09-21 12:37:51 +02:00
ramil@mysql.com
c2be8dccff Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b7589
 2005-09-21 14:33:39 +05:00
ramil@mysql.com
986a51e447 a fix (bug #7589: Decimal types are ignored when updating data from another column). 2005-09-21 14:32:19 +05:00
msvensson@neptunus.(none)
f6b8032af5 Don't add all args to mysqltest to MYSQL_TEST env var 2005-09-21 10:24:46 +02:00
timour@mysql.com
6ae8a56f72 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into  mysql.com:/home/timka/mysql/src/4.1-dbg
 2005-09-21 09:53:42 +03:00
timour@mysql.com
633d118d01 Fix for BUG#12882 - min/max inconsistent on empty table. 
The problem was in that the MIN/MAX optimization in opt_sum_query was
replacing MIN/MAX functions with their constant argument without
taking into account that a query has no result rows.
 2005-09-21 09:49:19 +03:00
bell@sanja.is.com.ua
e6cb720095 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
 2005-09-21 08:31:20 +03:00
bell@sanja.is.com.ua
506c6eb922 postmerge fixes 2005-09-21 08:29:47 +03:00
brian@zim.(none)
e3c87e16ae Fixed a typo in handler.cc if CSV was built. I also added CSV to the default MAX builds so that more people test it. 2005-09-20 15:26:10 -07:00
sergefp@mysql.com
a26e1b7280 Merge mysql.com:/home/psergey/bk-trees/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3
 2005-09-21 02:20:55 +04:00
sergefp@mysql.com
f9475d1d15 BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index 
statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)
 2005-09-21 02:18:29 +04:00
bell@sanja.is.com.ua
3f66053a50 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner5-5.0
 2005-09-20 21:27:28 +03:00
bell@sanja.is.com.ua
c1b185f5ff WL#2787 (Add view definer/owner to the view definition (.frm) to check privileges on used tables and stored routines when using a VIEW.) 
Part 2 postreview fixes.
 2005-09-20 21:20:38 +03:00
evgen@moonbone.local
6383ab91db Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/12812-bug-5.0-mysql
 2005-09-20 21:36:43 +04:00
evgen@moonbone.local
b7c42a65d1 item_func.cc: 
Fixed mistake in fix for bug#12812
 2005-09-20 21:35:57 +04:00
reggie@fedora.(none)
e89c5220b5 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into  fedora.(none):/home/reggie/bk/mysql-5.0-release
 2005-09-20 12:26:01 -05:00
kent@mysql.com
d859573bcf make_binary_distribution.sh: 
Include libz.a in distribution if built bundled
 2005-09-20 19:26:00 +02:00
SergeyV@selena.
c2f734ce42 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  selena.:H:/MYSQL/src/#12929-mysql-4.1
 2005-09-20 20:11:38 +04:00
SergeyV@selena.
988c8e92d8 Small update for lock functions used in my_cgets() 2005-09-20 20:03:51 +04:00
guilhem@mysql.com
388cf622ee Fix fur BUG#13348: "multi-table updates and deletes are not logged if no rows were affected". 
Not fixed in 4.1 as not critical. Also I'm correcting error checking of multi-UPDATE/DELETE
when it comes to binlogging, to make it consistent with when we rollback the statement.
 2005-09-20 17:41:47 +02:00
tomas@poseidon.ndb.mysql.com
d0c578294e Bug #10694 LOAD DATA FROM INFILE fails with 'Out of operation records' 2005-09-20 14:20:02 +02:00
jonas@perch.ndb.mysql.com
34eba4b439 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-20 13:04:30 +02:00
timour@mysql.com
ad53c58eb5 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-13127
 2005-09-20 14:03:50 +03:00
timour@mysql.com
e609eac0d9 Fix for BUG#13127. 
The problem was in the way table references are pre-filtered when
resolving a qualified field. When resolving qualified table references
we search recursively in the operands of the join. If there is
natural/using join with a merge view, the first call to find_field_in_table_ref
makes a recursive call to itself with the view as the new table reference
to search for the column. However the view has both nested_join and
join_columns != NULL so it skipped the test whether the view name matches
the field qualifier. As a result the field was found in the view since the
view already has a field with the same name. Thus the field was incorrectly
resolved as the view field.
 2005-09-20 14:00:39 +03:00
jonas@perch.ndb.mysql.com
b49ec75b42 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-20 12:52:42 +02:00
jonas@perch.ndb.mysql.com
09c88914e2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-20 12:22:31 +02:00
jonas@perch.ndb.mysql.com
75cc4ef28a ndb - post merge fixes 2005-09-20 12:07:18 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b942a98b76 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-20 12:43:48 +03:00
ramil@mysql.com
6f64f66d8b a fix (bug #11553: gives error if aggregate user-defined function in HAVING clause). 2005-09-20 14:28:23 +05:00
jonas@perch.ndb.mysql.com
2119a88abe Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2005-09-20 10:46:33 +02:00
mskold@mysql.com
f852307d8e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-09-20 10:35:47 +02:00
mskold@mysql.com
cb4745591f Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in this were not counted, giving incorrect memory consumption 2005-09-20 10:34:00 +02:00
jonas@perch.ndb.mysql.com
e813de6883 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
 2005-09-20 10:21:24 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
0f5f6045a3 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-20 10:58:15 +03:00
jonas@perch.ndb.mysql.com
8983e39070 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-09-20 09:50:10 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1a29e7b084 Fixed a missing cast. 2005-09-20 09:17:04 +03:00