database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-13 18:02:43 +03:00
Code Activity
24,176 Commits 3,367 Branches 1,099 Tags
ca2ad9cdf6c2510fedaa16e94e64cbeb274da170
Commit Graph

11520 Commits

Author SHA1 Message Date
holyfoot@hf-ibm.(none)
ff9951f221 Fix for bug #8429 (FORMAT returns incorrect result) 2005-06-08 15:49:36 +05:00
lars@mysql.com
d33ba0193e Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/home/bk/mysql-5.0
 2005-06-08 12:17:42 +02:00
hf@deer.(none)
71f06aa778 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.9894
 2005-06-08 14:17:42 +05:00
hf@deer.(none)
935b5ec4b4 Fix for bug #9894 (Negative numbers are allowed to 'unsigned' column) 2005-06-08 12:25:57 +05:00
ramil@mysql.com
e6b6eaf1dd Merge mysql.com:/usr/home/ram/work/mysql-5.0-release 
into mysql.com:/usr/home/ram/work/mysql-5.0
 2005-06-08 12:22:14 +05:00
ramil@mysql.com
6f8ef49895 A fix (bug #11153: Ambiguous call to overloaded function, acording to Visual Studio 6) 2005-06-08 11:37:43 +05:00
brian@brian-akers-computer.local
8683f513cd Removed warnings for gcc 4.0 2005-06-07 18:23:58 -07:00
reggie@mdk10.(none)
f86c44ff56 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/41test3
 2005-06-07 15:45:02 -05:00
serg@serg.mylan
b95c7afcda Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-06-07 22:45:01 +02:00
serg@serg.mylan
30d81b75ff bug#5373: handler READ NEXT w/o HANDLER READ [FIRST] 
check table->file->inited to catch incorrect calling sequence.
 2005-06-07 22:43:25 +02:00
konstantin@mysql.com
79b82323e3 A followup patch for Bug#7306 (limit in prepared statements): 
don't evaluate subqueries during statement prepare, even if they
are not correlated.
With post-review fixes.
 2005-06-08 00:34:53 +04:00
lars@mysql.com
71c9b0ac34 Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-06-07 17:20:08 +02:00
paul@frost.snake.net
536028a284 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
 2005-06-07 10:09:47 -05:00
joreland@mysql.com
ebc9d76ddc Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-07 17:09:47 +02:00
paul@frost.snake.net
52a4221188 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
 2005-06-07 10:05:52 -05:00
paul@frost.snake.net
85648050af Typo in help message. 2005-06-07 10:03:09 -05:00
igor@rurik.mysql.com
75ffe152d4 sql_yacc.yy: 
Added missing ';'.
 2005-06-07 07:48:56 -07:00
lars@mysql.com
53085bb443 Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-06-07 16:48:38 +02:00
lars@mysql.com
f952a0d6f1 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b6883-mysql-4.1
 2005-06-07 16:31:10 +02:00
igor@rurik.mysql.com
c963b12fd3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-07 06:38:05 -07:00
igor@rurik.mysql.com
d3f3cc617d Many files: 
Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
 2005-06-07 06:34:13 -07:00
igor@rurik.mysql.com
a2f7b552b0 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-06-07 06:00:37 -07:00
konstantin@mysql.com
8c0767cef5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-7306-final
 2005-06-07 16:28:08 +04:00
igor@rurik.mysql.com
5833a5e54a Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-07 04:31:42 -07:00
lars@mysql.com
0610e204f4 Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-06-07 13:28:34 +02:00
igor@rurik.mysql.com
6cc77486b7 item_buff.cc: 
Removed an extra space char.
 2005-06-07 04:21:19 -07:00
konstantin@mysql.com
72b4b0b92c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/opt/local/work/mysql-5.0-7306-final
 2005-06-07 14:56:06 +04:00
dlenev@mysql.com
054139fc64 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg10015
 2005-06-07 14:54:48 +04:00
dlenev@brandersnatch.localdomain
270b695f59 Fix for bug #10015 "Crash in InnoDB if stored routines are used". 
We should not allow explicit or implicit transaction commits inside
of stored functions or triggers (so in autocommit mode we should not
do commits after execution of sub-statement).
Also since we don't support nested statement transactions in 5.0,
we shouldn't commit or rollback stmt transactions while we are inside
stored functions or triggers. This should be fixed in later (>=5.1)
releases.
 2005-06-07 14:53:08 +04:00
heikki@hundin.mysql.fi
96ee8cc0d5 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-06-07 13:50:45 +03:00
konstantin@mysql.com
ac2a9eb699 Manual merge. 2005-06-07 14:50:45 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
6a3ee4192d 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-06-07 13:50:43 +03:00
lars@mysql.com
96b0f03f78 Merge b6883-mysql-4.1 -> 5.0 2005-06-07 12:30:32 +02:00
konstantin@mysql.com
9f379d7f05 Patch two (the final one) for Bug#7306 "the server side preparedStatement 
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
 2005-06-07 14:11:36 +04:00
igor@rurik.mysql.com
1d976dcb35 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-07 03:07:42 -07:00
igor@rurik.mysql.com
90dd86907e sql_select.cc, item_buff.cc, item.h: 
Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB field.
  Now the size of the buffer is limited by max_sort_length.
group_by.test, group_by.result:
  Added a test case for bug #11088.
 2005-06-07 03:05:57 -07:00
lars@mysql.com
630dd9a0b7 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b6883-mysql-4.1
 2005-06-07 11:54:31 +02:00
lars@mysql.com
cd2fbb01c4 BUG#6883: Changed comment, style 2005-06-07 11:47:59 +02:00
msvensson@neptunus.(none)
28aa57d6a0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/bug9998
 2005-06-07 11:05:48 +02:00
heikki@hundin.mysql.fi
8a3c1ae851 ha_innodb.cc: 
Update the InnoDB internal auto-inc counter in ::write_row() if the statement is a REPLACE that fails in a duplicate key error: REPLACE will handle duplicate key error, and the insert will eventually succeed; note that we did NOT change InnoDB's behavior in an UPDATE, because updating the auto-inc counter in an UPDATE would require a bigger patch (Bug #11005)
 2005-06-07 11:51:27 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
0d4c57f262 Moved tc_log_page_waits outside HAVE_MMAP, 
because it's used also outside.
 2005-06-07 11:45:28 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
f2933263fb A fix for systems that don't have HAVE_MMAP defined. 
Moved some variable externs from sql_class.h to mysql_priv.h
 2005-06-07 11:30:09 +03:00
gluh@mysql.com
ac76e6db6a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10964
 2005-06-07 11:31:07 +05:00
monty@mysql.com
068bd3eb97 After merge fixes 2005-06-07 05:43:59 +03:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
monty@mysql.com
dec2607e1d Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE 
This fixes bug #11080: Multi-row REPLACE fails on a duplicate key error
 2005-06-06 20:41:52 +03:00
monty@mysql.com
b46f2ecf2f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 19:43:07 +03:00
lenz@mysql.com
80fbb13e97 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-06-06 18:03:16 +02:00
monty@mysql.com
8c1c166487 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 18:31:38 +03:00
monty@mysql.com
e43cbebc59 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 16:54:56 +03:00