mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40125 commits 2857 branches 349 tags 1.6 GiB
Commit graph

18567 commits

Author SHA1 Message Date
ramil/ram@myoffice.izhnet.ru
9f1a271c70 Merge mysql.com:/usr/home/ram/work/bug22158/my50-bug22158 
into  mysql.com:/usr/home/ram/work/bug22158/my51-bug22158
 2006-10-27 08:59:56 +05:00
msvensson@neptunus.(none)
a4d350e5ff Merge 192.168.0.4:mysql/my51-m-bug18888 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-26 19:15:47 +02:00
msvensson@shellback.(none)
631c82d2ea Bug#18888 Trying to overwrite sql/lex_hash.h during build 
- As a sideeffect of the patch to generate lex_hash.h only once
on the machine where the source dist was produced, a problem
was found when compiling a mysqld without partition support - it 
would crash when looking up the lex symbols due to mismatch between
lex.h and the generated lex_hash.h

 - Remove the ifdef for partition in lex.h 
 - Fix minor problem with"EXPLAIN PARTITION" when not compiled with
   partition(existed also without the above patch)
 - Add test case that will be run when we don't have partition
   support compiled into mysqld
 - Return error ER_FEATURE_DISABLED if user tries to use PARTITION
   when there is no support for it.
 2006-10-26 19:11:09 +02:00
msvensson@neptunus.(none)
da2a6911d9 Bug SP: DROP PROCEDURE|VIEW (maybe more) write to binlog too late (race cond) 
- Rmove duplicate code to log a "DROP VIEW..", must be a merge miss
 2006-10-26 18:34:24 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
7b90a45425 Fix for bug : Errors in init_connect terminate connections silently 
When executing the init_connect statement, thd->net.vio is set to 0, to         
forbid sending any results to the client. As a side effect we don't log         
possible errors, either.                                                        
                                                                                
Now we write warnings to the error log if an init_connect query                
fails.
 2006-10-26 14:51:34 +05:00
kroki/tomash@moonlight.intranet
25501c38d3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
 2006-10-25 20:23:41 +04:00
kroki/tomash@moonlight.intranet
99baff565e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
 2006-10-25 20:16:39 +04:00
kroki/tomash@moonlight.intranet
fa60a03073 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
 2006-10-25 20:13:07 +04:00
kroki/tomash@moonlight.intranet
7d3b9ffb65 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
 2006-10-25 20:10:12 +04:00
kroki/tomash@moonlight.intranet
c8bb2f396a Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
 2006-10-25 20:00:51 +04:00
kroki/tomash@moonlight.intranet
b7b991cec3 BUG#18819: DELETE IGNORE hangs on foreign key parent delete 
If the error happens during DELETE IGNORE, nothing could be send to the
client, thus leaving it frozen expecting the reply.

The problem was that if some error occurred, it wouldn't be reported to
the client because of IGNORE, but neither success would be reported.

MySQL 4.1 would not freeze the client, but will report

  ERROR 1105 (HY000): Unknown error

instead, which is also a bug.

The solution is to report success if we are in DELETE IGNORE and some
non-fatal error has happened.
 2006-10-25 19:53:26 +04:00
mskold/marty@mysql.com/linux.site
bf365af0bd Bug Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings 2006-10-25 15:34:47 +02:00
mskold/marty@mysql.com/linux.site
7ad30e80f1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
 2006-10-25 15:17:44 +02:00
mskold/marty@mysql.com/linux.site
c14c547289 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-10-25 12:41:42 +02:00
stewart@willster.(none)
1f05ac4ac3 post merge fixes (from merging test fixes from bug 19914) 2006-10-25 20:37:10 +10:00
mskold/marty@mysql.com/linux.site
0dea24947d Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-10-25 12:21:45 +02:00
mskold/marty@mysql.com/linux.site
deb26a93e5 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
 2006-10-25 11:45:47 +02:00
mskold/marty@mysql.com/linux.site
44e55e3b43 Bug Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings 2006-10-25 11:44:40 +02:00
petr/cps@owlet.local
e2d8d52293 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug
 2006-10-25 13:04:07 +04:00
petr/cps@mysql.com/owlet.local
f01df1fd0a fix test failures in the runtime tree 2006-10-25 12:54:59 +04:00
stewart@willster.(none)
d5810cd067 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2006-10-25 18:41:17 +10:00
stewart@willster.(none)
a4faddc64f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
 2006-10-25 17:24:20 +10:00
jonas@perch.ndb.mysql.com
5230dcebcc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-25 08:45:06 +02:00
jonas@perch.ndb.mysql.com
6e4a0ec042 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-25 08:28:30 +02:00
malff/marcsql@weblab.(none)
9cf77b0b78 Fixed build break. 2006-10-24 18:16:11 -07:00
tsmith/tim@siva.hindu.god
3af2089b13 Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-24 14:42:08 -06:00
stewart@willster.(none)
dc38d0249a fix ndb_cache_multi2 
util thread wasn't behaving correctly after 241 error due to get_table_statistics
not properly returning an error code
 2006-10-24 23:26:58 +10:00
petr/cps@owlet.local
eda71e24c3 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug
 2006-10-24 17:00:23 +04:00
mskold/marty@mysql.com/linux.site
0067cd8a4a bug#21873 MySQLD Crash on ALTER...ADD..UNIQUE..USING HASH statement for NDB backed table: Use passed key_info to check for nullable fields 2006-10-24 12:24:32 +02:00
mskold/marty@mysql.com/linux.site
8da80dd39d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-10-24 08:29:37 +02:00
tsmith/tim@siva.hindu.god
aeced431e3 Merge siva.hindu.god:/usr/home/tim/m/bk/g51 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-10-23 23:41:07 -06:00
stewart@willster.(none)
826628c99b post merge fix 2006-10-24 00:18:57 +10:00
stewart@willster.(none)
3c2eeb2c15 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
 2006-10-23 23:57:28 +10:00
stewart@willster.(none)
5926602aa7 Bug SELECT COUNT(*) sometimes returns MAX_INT on cluster tables 
fixes for ndb_* tests broken by previous fix

be more careful in ndb about setting errors on failure of info call (especially
in open)
 2006-10-23 23:46:35 +10:00
stewart@willster.(none)
fc776db8e7 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2 
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
 2006-10-23 23:43:48 +10:00
andrey@example.com
fd759850aa Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug23037/my51
 2006-10-23 15:27:24 +02:00
andrey@example.com
6237be99d0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  example.com:/work/bug23037/my50
 2006-10-23 15:21:23 +02:00
andrey@example.com
d18cb100be Merge example.com:/work/bug23037/my50 
into  example.com:/work/bug23037/my51
 2006-10-23 14:29:11 +02:00
andrey@example.com
389c6a019e Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table" 
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
 2006-10-23 13:12:30 +02:00
kostja@bodhi.local
2fecf79536 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-10-23 12:35:56 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
7ad7d6e324 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
 2006-10-23 13:25:24 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
1f65242652 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
 2006-10-23 13:18:56 +05:00
ramil/ram@myoffice.izhnet.ru
6cb5224279 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
 2006-10-23 13:18:52 +05:00
kostja@bodhi.local
4cb57ac048 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-10-23 12:06:59 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
dd2a1d1e96 Merge mysql.com:/usr/home/ram/work/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
 2006-10-23 12:58:20 +05:00
kostja@bodhi.local
0ef2ae34e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-10-23 11:51:45 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a67472f289 Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
 2006-10-23 12:44:25 +05:00
ramil/ram@myoffice.izhnet.ru
d4c7b6da83 Merge mysql.com:/usr/home/ram/work/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
 2006-10-23 12:07:48 +05:00
ramil/ram@myoffice.izhnet.ru
800d80542f Merge mysql.com:/usr/home/ram/work/bug20732/my50-bug20732 
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
 2006-10-23 10:32:39 +05:00
cmiller@zippy.cornsilk.net
dae79f0a50 Fix bad merge. 2006-10-20 22:21:05 -04:00