mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32283 commits 2791 branches 343 tags 1.7 GiB
Commit graph

32283 commits

This branch
This branch
All branches
Author SHA1 Message Date
aelkin/elkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi
45568bbe11 BUG#18822 LOAD DATA FROM MASTER corrupts data 
there is a bunch of dups. It has been decided to declare this feature as
deprecated.
 2006-08-31 02:00:40 +03:00
tsmith@maint2.mysql.com
9a8ed3fe3e Merge maint2.mysql.com:/data/localhome/tsmith/bk/g41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
 2006-08-31 00:23:15 +02:00
tsmith@maint2.mysql.com
0af0180468 Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-08-31 00:01:43 +02:00
tsmith@maint2.mysql.com
4ae5e61620 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
 2006-08-30 23:49:21 +02:00
tsmith@maint2.mysql.com
b0adc47e86 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-08-30 23:46:17 +02:00
cmiller@zippy.cornsilk.net
5a3922fbf1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
 2006-08-30 17:33:28 -04:00
cmiller@zippy.cornsilk.net
2c356ec7db Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \ 
event' from master"

Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.  

The syscall  read()  wasn't checked for a negative return value for an
interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
impossible (on Linux) for  read()  to set errno EINTR without the return 
value being -1 .

So, if we're checking for EINTR behavior, we should not require that the
return value be zero.
 2006-08-30 17:28:34 -04:00
tsmith@maint2.mysql.com
d5ee5049be Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
 2006-08-30 23:14:29 +02:00
tsmith@maint2.mysql.com
e80741b3a5 Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows 2006-08-30 22:39:23 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
678e15174e Bug#20573 
"strict mode: inserts autogenerated auto_increment value bigger than max"
  Strict mode should fail if autoincrement value is out of range
 2006-08-30 13:20:39 -07:00
kostja@bodhi.local
3948fcf575 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-14897
 2006-08-31 00:14:19 +04:00
tsmith@maint2.mysql.com
843135ae1f portability fix in BUILD/* for solaris 2006-08-30 21:24:09 +02:00
hartmut@mysql.com/linux.site
e3d56d2cd3 make DNS based hostname queries work (bug #17582) 2006-08-30 20:45:43 +02:00
tsmith@maint2.mysql.com
0da8a4e321 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
 2006-08-30 20:04:33 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
aa330d1910 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-08-30 19:57:09 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e5fbc6cff8 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-08-30 19:31:57 +02:00
msvensson@neptunus.(none)
f35371b9b4 Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-30 17:21:22 +02:00
msvensson@neptunus.(none)
9d87db7767 Bug#21813 An attacker has the opportunity to bypass query logging, part2 
- Use the "%.*b" format when printing prepared and exeuted prepared statements to the log.
 - Add test case to check that also prepared statements end up in the query log
Bug#14346 Prepared statements corrupting general log/server memory
 - Use "stmt->query" when logging the newly prepared query instead of "packet"
 2006-08-30 17:11:00 +02:00
gluh@mysql.com/gluh.(none)
af9895d4c2 Bug#20393 User name truncation in mysql client 
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
 2006-08-30 15:56:17 +05:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
cda07adf32 sql_base.cc, config-netware.h: 
Auto merged
 2006-08-30 12:07:17 +02:00
jonas@perch.ndb.mysql.com
c2d2b88b4c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-08-30 08:24:45 +02:00
kostja@bodhi.local
cb26d47570 Post-merge fixes. 2006-08-30 03:22:59 +04:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
44a1f41e1a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-08-30 00:09:41 +02:00
kostja@bodhi.local
8566db3fc7 Remove the fix for Bug#10668 "CREATE USER does not enforce username 
length limit", it's superseded by the fix for Bug#16899 "Possible buffer
overflow in handling of DEFINER-clause". Update test results.
 2006-08-30 01:48:15 +04:00
kostja@bodhi.local
f8d34e1030 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-14897
 2006-08-30 00:45:33 +04:00
kostja@bodhi.local
3bf609b7f2 A fix for Bug#14897 "ResultSet.getString("table.column") sometimes 
doesn't find the column"

When a user was using 4.1 tables with VARCHAR column and 5.0 server
and a query that used a temporary table to resolve itself, the
table metadata for the varchar column sent to client was incorrect:
MYSQL_FIELD::table member was empty.

The bug was caused by implicit "upgrade" from old VARCHAR to new
VARCHAR hard-coded in Field::new_field, which did not preserve
the information about the original table. Thus, the field metadata
of the "upgraded" field pointed to an auxiliary temporary table
created for query execution.

The fix is to copy the pointer to the original table to the new field.
 2006-08-30 00:38:58 +04:00
rburnett@bk-internal.mysql.com
001aaedddc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-29 21:15:49 +02:00
istruewing@chilla.local
7439a52434 Merge chilla.local:/home/mydev/mysql-4.0-bug14400 
into  chilla.local:/home/mydev/mysql-4.1-bug14400
 2006-08-29 21:08:40 +02:00
istruewing@chilla.local
0b2a9d01ed Bug#14400 - Query joins wrong rows from table which is 
subject of "concurrent insert"
Better fix by Monty: "The previous bug fix didn't work
when using partial keys."
 2006-08-29 20:45:04 +02:00
kaa@polly.local
61482f3542 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-08-29 19:57:52 +04:00
kroki/tomash@moonlight.intranet
1140b1a613 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21096
 2006-08-29 17:00:46 +04:00
kroki/tomash@moonlight.intranet
2a4221489b BUG#21096: locking issue ; temporary table conflicts. 
The problem was that during DROP TEMPORARY TABLE we tried to acquire
the name lock, though temporary tables belongs to one connection, and
no race is possible.

The solution is to not use table name locking while executing
DROP TEMPORARY TABLE.
 2006-08-29 16:59:20 +04:00
kroki/tomash@moonlight.intranet
cb4ea78cbd Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
 2006-08-29 16:24:00 +04:00
anozdrin/alik@alik.
1a7cb4153c Preliminary patch for the following bugs: 
- BUG#15934: Instance manager fails to work;
  - BUG#18020: IM connect problem;
  - BUG#18027: IM: Server_ID differs;
  - BUG#18033: IM: Server_ID not reported;
  - BUG#21331: Instance Manager: Connect problems in tests;

The only test suite has been changed
(server codebase has not been modified).
 2006-08-29 15:46:40 +04:00
kroki/tomash@moonlight.intranet
b9fef61616 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
 2006-08-29 14:37:52 +04:00
kroki/tomash@moonlight.intranet
f8f1dd3e87 BUG#17591: Updatable view not possible with trigger or stored function 
When a view was used inside a trigger or a function, lock type for
tables used in a view was always set to READ (thus making the view
non-updatable), even if we were trying to update the view.

The solution is to set lock type properly.
 2006-08-29 14:32:59 +04:00
tsmith@maint2.mysql.com
ccdda2e7ee Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
 2006-08-29 03:58:38 +02:00
tsmith@maint1.mysql.com
1f07fa0246 Merge maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/40 
into  maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/41
 2006-08-29 01:15:54 +02:00
tsmith@maint1.mysql.com
54e73e93d7 minor portability fix in SETUP.sh 2006-08-29 01:13:06 +02:00
iggy@rolltop.ignatz42.dyndns.org
bfe86ca448 Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_schema database. 
init_dumping now accepts a function pointer to the table or view specific init_dumping function.  This allows both tables and views to use the init_dumping function.
 2006-08-28 17:48:06 -04:00
rburnett@bk-internal.mysql.com
f80ba7a147 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-28 17:56:44 +02:00
timour/tkatchaounov@dl145s.mysql.com
4761ea5c82 Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data/tkatchaounov/autopush/5.0-bug-21456
 2006-08-28 16:08:48 +02:00
jonas@perch.ndb.mysql.com
67a5d98c1d ndb - bug#21615 
Improve error message when detecting corrupted REDO log
 2006-08-28 10:26:21 +02:00
evgen@moonbone.local
109d58af66 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-08-27 23:43:11 +04:00
evgen@moonbone.local
7a55f7fac4 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into  moonbone.local:/work/tmp_merge-5.0-mysql
 2006-08-27 00:32:14 +04:00
evgen@moonbone.local
13f50fdb69 Merge moonbone.local:/work/tmp_merge-4.1-mysql 
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
 2006-08-26 23:11:34 +04:00
evgen@moonbone.local
bafd6d5065 Merge moonbone.local:/work/tmp_merge-5.0-opt-mysql 
into  moonbone.local:/work/tmp_merge-5.0-mysql
 2006-08-26 22:17:34 +04:00
msvensson@neptunus.(none)
4703f302fe Dont' ever use cluster for slave in 4.1 2006-08-26 18:38:42 +02:00
kaa@polly.local
b0619ace21 Post-review fix (bug #21250) 2006-08-26 10:21:26 +04:00
andrey@example.com
3cbb16587f Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  example.com:/work/mysql-5.0-runtime
 2006-08-25 20:04:19 +02:00