mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25426 commits 2780 branches 343 tags 1.6 GiB
Commit graph

12132 commits

Author SHA1 Message Date
jonas@eel.(none)
4575678ff1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-19 13:40:40 +02:00
jonas@eel.(none)
c962896744 Merge eel.(none):/home/jonas/src/mysql-5.0-push 
into  eel.(none):/home/jonas/tmp/kkk/mysql-5.0
 2005-08-19 10:50:51 +02:00
bell@sanja.is.com.ua
376c5307df Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
 2005-08-19 10:40:46 +03:00
andrey@lmy004.
a5ecf5f4b1 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-clean
 2005-08-19 09:14:59 +02:00
bell@sanja.is.com.ua
a3724d2546 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
 2005-08-19 08:55:38 +03:00
jonas@eel.(none)
1b1d1d8d5c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-19 07:52:42 +02:00
igor@rurik.mysql.com
743917759c Manual merge 2005-08-18 15:17:04 -07:00
andrey@lmy004.
0e6606c8da Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12591
 2005-08-18 23:40:04 +02:00
evgen@moonbone.local
1fc33b0533 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/10624-bug-5.0-mysql
 2005-08-18 22:46:17 +04:00
jimw@mysql.com
6c3dafd07c Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-18 07:59:43 -07:00
igor@rurik.mysql.com
c93d841dbf Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-18 07:30:45 -07:00
sergefp@mysql.com
c085c9a3b7 Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08-16 00:03:50+04:00, aivanov@mysql.com 
)
 2005-08-18 18:26:30 +04:00
igor@rurik.mysql.com
b5e7bfa9f2 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-18 05:36:22 -07:00
jonas@eel.(none)
7c70be87b7 Merge eel.(none):/home/jonas/src/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-08-18 14:28:13 +02:00
jonas@eel.(none)
6399a93ac2 Merge eel.(none):/home/jonas/src/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-5.0
 2005-08-18 14:25:00 +02:00
jonas@eel.(none)
3b68047235 bug#12118 - ndb alter table data loss 
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions
 2005-08-18 14:02:25 +02:00
petr@mysql.com
cb71626268 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usersnfs/pchardin/mysql-5.0
 2005-08-18 11:25:32 +02:00
petr@mysql.com
4fb6f4dddf Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory 
and Bug#12297 SP crashes the server if data inserted inside a lon loop
Third commit attempt. With fixes to the issues, showed up after full rebuild and
tests on other hosts.
 2005-08-18 11:23:54 +02:00
bell@sanja.is.com.ua
fc070c2bcb stop on NULL comparison only if it is allowed (BUG#12509) 2005-08-18 12:07:14 +03:00
timour@mysql.com
8d975efc72 WL#2486 - natural and using join according to SQL:2003 
- Fixed minor error after Monty's review.
 2005-08-18 11:24:59 +03:00
igor@rurik.mysql.com
fd5461ac12 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-17 22:24:20 -07:00
igor@rurik.mysql.com
5ac7d86793 view.test: 
Added a test case for bug #10970.
view.result:
  Added a test case for bug #10970.
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
sql_view.cc:
  Fixed bug #10970.
  In the function mysql_create_view if a view does not refer
  any tables directly the variable table must be updated
  after the call of open_and_lock_tables.
errmsg.txt:
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
  (when fixing bug #10970).
 2005-08-17 22:19:12 -07:00
jimw@mysql.com
1eb0f45d17 Fix minor typo in handling of error conditions and return of SLEEP(). 2005-08-17 19:57:07 -07:00
jimw@mysql.com
15f97778ff Revert patch for Bug #12595, it causes the sql_mode test to fail. 2005-08-17 19:56:14 -07:00
jimw@mysql.com
e7656ffecc Merge mysql.com:/home/jimw/my/mysql-5.0-12582 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-17 18:45:36 -07:00
jimw@mysql.com
19ed563cd5 Fix bad merge of sql/item_strfunc.cc by aivanov 2005-08-17 18:42:07 -07:00
monty@mysql.com
c726451abb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-18 03:41:11 +03:00
monty@mysql.com
3eaa953529 Cleanups and optimization during review of new code 2005-08-18 03:12:42 +03:00
andrey@lmy004.
4ff51a5743 fix for bug #12591 (SHOW TABLES FROM dbname produces wrong error message) 2005-08-17 17:51:10 +02:00
aivanov@mysql.com
c3de1aa84a Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-1
 2005-08-17 18:46:20 +04:00
aivanov@mysql.com
8a80193e0a Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-17 18:41:19 +04:00
timour@mysql.com
a55786ca70 WL#2486 - natural and using join according to SQL:2003 
- fixed a problem with RIGHT JOIN ON and enabled corresponding tests in select.test
- fixed a memory leak
 2005-08-17 17:19:31 +03:00
timour@mysql.com
0671228b05 Fixed code formatting. 2005-08-17 14:20:01 +03:00
timour@mysql.com
066e3c4209 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-17 13:47:16 +03:00
timour@mysql.com
c8e55a35b3 WL#2486 - Process NATURAL and USING joins according to SQL:2003 
- Applied Monty's patch after his review of sql_base.cc
 2005-08-17 13:46:36 +03:00
jimw@mysql.com
054e78943e Fix SLEEP() to be interruptable. (Bug #12582) 2005-08-16 16:31:16 -07:00
aivanov@mysql.com
df00bbc862 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-1
 2005-08-16 23:33:06 +04:00
aivanov@mysql.com
0a1fa93190 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 23:27:00 +04:00
aivanov@mysql.com
ed6cd805dc information_schema.test: 
Added a comment line for a test case used for bug #12301.
information_schema.result:
  Fixed some test cases results (bug #12301).
sql_show.cc:
  Fixed bug #12301.
  The bug was due to a missing value setting for the NUMERIC_SCALE column
   in the get_schema_column_record() function (sql_show.cc).
 2005-08-16 23:11:04 +04:00
andrey@lmy004.
41c93e368b Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12595
 2005-08-16 20:59:18 +02:00
andrey@lmy004.
7269045b82 after review fix for bug #12595 2005-08-16 20:54:53 +02:00
andrey@lmy004.
a7a762e27d fix for bug #12595 (Escape character has to be exactly one) 2005-08-16 15:39:40 +02:00
jani@ua141d10.elisa.omakaista.fi
c7bdc5bb12 Fixed indentations in error and warning messages. 2005-08-16 15:32:41 +03:00
aivanov@mysql.com
246c0e687c Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 15:35:39 +04:00
andrey@lmy004.wdf.sap.corp
c896ca1a10 fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar" 
(after review commit)
 2005-08-16 11:18:35 +02:00
jimw@mysql.com
68d5420d7c Clean up merge from 4.1 2005-08-15 14:19:56 -07:00
aivanov@mysql.com
405f03f389 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 00:03:50 +04:00
jimw@mysql.com
2d34276417 Merge mysql.com:/home/jimw/my/mysql-5.0-12318 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:39:36 -07:00
jimw@mysql.com
55eebfb776 Merge mysql.com:/home/jimw/my/mysql-5.0-10627 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:38:56 -07:00
jimw@mysql.com
a3eaf4eec2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:37:45 -07:00