mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32094 commits 2781 branches 343 tags 1.6 GiB
Commit graph

32094 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold/marty@mysql.com/linux.site
bf52d20b4b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-09-12 16:24:39 +02:00
mskold/marty@mysql.com/linux.site
4bd1ef6b32 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-09-12 16:20:27 +02:00
msvensson@neptunus.(none)
e38f04a09f Merge neptunus.(none):/home/msvensson/mysql/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-12 11:23:07 +02:00
msvensson@neptunus.(none)
66bce61a88 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-12 11:14:09 +02:00
gluh@mysql.com/gluh.(none)
4afd20545c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2006-09-08 16:17:42 +05:00
gluh@mysql.com/gluh.(none)
a3300c3983 after merge fix 2006-09-08 16:16:39 +05:00
joerg@trift2.
b6071f06ce configure.in : NDB version and general version must be (kept) in sync - do that. 2006-09-07 17:51:28 +02:00
joerg@trift2.
d7b47f4dfd Merge trift2.:/M50/clone-5.0 
into  trift2.:/M50/push-5.0
 2006-09-07 17:47:57 +02:00
joerg@trift2.
1fc7b01507 Fix a change to "configure.in" that broke building commercial sources. 
To be pushed to both the cloned 5.0.25 and the general 5.0 tree.
 2006-09-07 17:37:51 +02:00
gluh@mysql.com/gluh.(none)
e2684ad5d7 after merge fix 2006-09-07 18:09:49 +05: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
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
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
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
bteam/mysqldev@mysql.com/production.mysql.com
bd7fefcb78 Raise version number 2006-09-06 17:56:59 +02:00
mskold/marty@mysql.com/linux.site
70b19dd1c0 Bug #21056 ndb pushdown equal/setValue error on datetime: Added missing order by 2006-09-06 11:54:01 +02:00
jonas@perch.ndb.mysql.com
3a80cee4b2 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-09-06 02:14:50 +02:00
mskold/marty@mysql.com/linux.site
6752861d1b Bug #21056 ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields 2006-09-05 17:07:00 +02:00
guilhem@gbichot3.local
e4d3595b18 Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0". 
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while
only NDB wanted that. Users and trainers complained that it affected
InnoDB and was a change compared to 4.1 where only NDB autocommitted.
To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into
ha_ndbcluster::external_lock().
The result is that LOAD DATA INFILE commits all uncommitted changes
of NDB if this is an NDB table, its own changes if this is an NDB
table, but does not affect other engines.
Note: even though there is no "commit the full transaction at end"
anymore, LOAD DATA INFILE stays disabled in routines (re-entrency
problems per a comment of Pem).
Note: ha_ndbcluster::has_transactions() does not give reliable results
because it says "yes" even if transactions are disabled in this engine...
 2006-09-05 16:52:05 +02:00
jonas@perch.ndb.mysql.com
fe808115e9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-09-04 14:34:42 +02:00
jonas@perch.ndb.mysql.com
7ff631e890 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-09-04 13:46:56 +02:00
jonas@perch.ndb.mysql.com
96ff8b4c52 bug#21965 - replication 
fix deadlock if master switches log file in parallell with "show master logs"
 2006-09-04 13:43:34 +02:00
msvensson@neptunus.(none)
4d0430c8fd Merge dl145s:/data/tkatchaounov/5.0-bug-21787 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-04 11:45:43 +02:00
msvensson@neptunus.(none)
1bea6cf1a2 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-04 11:42:16 +02:00
msvensson@neptunus.(none)
1fd3958ea6 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-04 11:39:58 +02:00
msvensson@neptunus.(none)
d253cf7813 Fix problem where mysql-test-run.pl fails to start up the mysqld after a failed test. Shows up on win hosts where one failed test case make subsequent ones fails with error "Could not open connection 'default': 2003 Can't connect to MySQL server on 'localhost'" 2006-09-04 11:30:04 +02:00
msvensson@neptunus.(none)
e40e56346d Merge bk-internal:/home/bk/mysql-5.0-cmake 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-04 10:36:01 +02:00
tnurnberg@maint1.mysql.com
ab7810c8e9 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  maint1.mysql.com:/data/localhome/tnurnberg/my50-21913
 2006-09-04 07:45:49 +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
tsmith@maint1.mysql.com
da18dec0c8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  maint1.mysql.com:/data/localhome/tsmith/bk/mysql-5.0-maint
 2006-09-03 23:54:48 +02:00
msvensson@neptunus.(none)
d7ca3d87d7 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-02 16:20:51 +02:00
msvensson@neptunus.(none)
36975d8b70 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-09-02 16:15:16 +02:00
grichter@bk-internal.mysql.com
6993e3a3f7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
 2006-09-02 11:03:16 +02:00
tsmith@maint2.mysql.com
0fd3e29042 Merge bk-internal:/home/bk/mysql-5.0 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-09-02 10:59:53 +02:00
grichter@bk-internal.mysql.com
44a9d4c9fe Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
 2006-09-02 08:03:32 +02:00
cmiller@maint1.mysql.com
d6f2659239 Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my50-mtr_reorder 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
 2006-09-01 21:56:27 +02:00
cmiller@maint1.mysql.com
46b3997c51 mtr_cases.pl: 
Provide a more extensible, easier-to-change way of reordering
  test cases.
 2006-09-01 21:53:23 +02:00
georg@lmy002.wdf.sap.corp
66133b7f74 included make_win_bin_dist (required for pushbuild) into distribution (make dist) 2006-09-01 16:55:35 +02:00
georg@lmy002.wdf.sap.corp
367c2d5ebc Modification for win subdirectory 2006-09-01 16:04:59 +02:00
georg@lmy002.wdf.sap.corp
5686da41ac Fixes for crashes and test failures 2006-09-01 14:34:37 +02:00
timour/tkatchaounov@dl145s.mysql.com
462c22c1ae Merge timka@10.100.64.80:/home/timka/mysql/src/4.1-bug-21787 
into  dl145s.mysql.com:/data/tkatchaounov/5.0-bug-21787
 2006-09-01 14:29:27 +02:00
timour/timka@lamia.home
02e194cea2 Fix for BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result 
The problem was due to a prior fix for BUG 9676, which limited
the rows stored in a temporary table to the LIMIT clause. This
optimization is not applicable to non-group queries with aggregate
functions. The fix disables the optimization in this case.
 2006-09-01 15:07:04 +03:00
msvensson@neptunus.(none)
8f378e0f3a Fix problem with windows where stderr is not flushed until end of program. 2006-09-01 13:53:43 +02:00
sergefp@mysql.com
55163a36f0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug21477-look-64bit
 2006-09-01 14:14:50 +04:00
sergefp@mysql.com
80cccd41ae BUG#21477 "memory overruns for certain kinds of subqueries": 
make st_select_lex::setup_ref_array() take into account that 
Item_sum-descendant objects located within descendant SELECTs
may be added into ref_pointer_array.
 2006-09-01 13:23:43 +04:00
msvensson@neptunus.(none)
4b41566503 Backport from 5.0 
- Dont test "encrypt" in ctype_ucs
 2006-09-01 11:21:12 +02:00