database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity
23,554 Commits 3,332 Branches 1,099 Tags
1b602c3d9917a7fb8b58e4c322f9f4dc273f31f9
Commit Graph

11255 Commits

Author SHA1 Message Date
brian@brian-akers-computer.local
1b602c3d99 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
 2005-06-09 09:36:44 -07:00
brian@brian-akers-computer.local
2d9c00b2f3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
 2005-06-09 09:20:00 -07:00
igor@rurik.mysql.com
36a4f39bc6 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-09 09:19:57 -07:00
igor@rurik.mysql.com
e093250d5d select.test, select.result: 
Added a test case for bug #10084.
sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.
 2005-06-09 09:16:16 -07:00
konstantin@mysql.com
95e620485c A fix and test case for Bug#10729 "mysql_stmt_attr_set 
CURSOR_TYPE_READ_ONLY". The bug was that we (me) don't perform proper
cleanups of the prepared statement when done fetching from a cursor.
Another patch.
 2005-06-09 18:17:45 +04:00
holyfoot@hf-ibm.(none)
717d92f6a6 Fix for bug #10083 (round doesn't increase scale) 2005-06-09 15:27:26 +05:00
brian@brian-akers-computer.local
f5434a93bf Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
 2005-06-08 22:29:10 -07:00
dlenev@mysql.com
207ac74905 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bgmd
 2005-06-09 01:54:18 +04:00
konstantin@mysql.com
9b2e653af0 Disable dynamic SQL in stored routines. 
This is to close Bug#10975, Bug#7115, Bug#10605 
This feature will be implemented in a future release.
 2005-06-09 01:46:30 +04:00
dlenev@mysql.com
fae0b7f7af Manual merge 2005-06-09 01:13:20 +04:00
dlenev@brandersnatch.localdomain
5394a1a4bd Fix for bug #11158 "Can't perform multi-delete in stored procedure". 
In order to make multi-delete SP friendly we need to have all table 
locks for the elements of main statement table list properly set 
at the end of parsing.

Also performed small cleanup: We don't need relink_tables_for_multidelete()
any longer since the only case now when TABLE_LIST::correspondent_table
is non-zero are tables in auxilary table list of multi-delete and these
tables are handled specially in mysql_multi_delete_prepare().
 2005-06-09 01:07:52 +04:00
hf@deer.(none)
8feae4d48f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.9764
 2005-06-08 21:59:03 +05:00
hf@deer.(none)
a881e00aaf Fix for bug #10896 (0.00 > -0.00) 2005-06-08 21:56:22 +05:00
konstantin@mysql.com
a2bf13cde6 Trim trailing spaces. 2005-06-08 19:57:26 +04:00
hf@deer.(none)
3849422055 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.9764
 2005-06-08 20:38:57 +05:00
hf@deer.(none)
6c148a7969 Fix for bug #9764 (DISTINCT IFNULL truncates data) 2005-06-08 20:35:37 +05:00
konstantin@mysql.com
f0ee736991 Cleanup sql_prepare.cc 2005-06-08 19:31:34 +04:00
holyfoot@hf-ibm.(none)
ff9951f221 Fix for bug #8429 (FORMAT returns incorrect result) 2005-06-08 15:49:36 +05: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
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
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
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
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
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
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
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