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

25426 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
dd1e0fb8c7 Merge mysql.com:/home/jimw/my/mysql-5.0-11711 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-19 11:40:39 -07:00
petr@mysql.com
6c03c9252d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-08-19 17:22:53 +04:00
petr@mysql.com
5605117d4d Fix for BUG#10957 "stop instance, issued after flush instances causes IM to crash" 
Recommited with post-review fixes
 2005-08-19 17:19:12 +04:00
timour@mysql.com
a53d283481 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-19 16:05:58 +03:00
konstantin@mysql.com
887fba4736 A fix and a test case for "Bug #12168 'DECLARE CONTINUE HANDLER FOR 
NOT FOUND ...' in conditional handled incorrectly".

Whenever we remove an instruction during optimization, we need to
adjust instruction numbers (ip - instruction pointer) stored in all
instructions. In addition to that, sp_instr_hpush_jump, which 
corresponds to DECLARE CONTINUE HANDLER needs adjustment for m_handler,
which holds the number of instruction with the continue handler.
In the bug report, a wrong ip stored in m_handler was pointing at 
FETCH, which resulted in an error message and abnormal SP termination.
The fix is to just remove m_handler member from sp_instr_hpush_jump,
as it's always points to the instruction next to the DECLARE
statement itself (m_ip+1).
 2005-08-19 17:03:21 +04:00
timour@mysql.com
d053a23034 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-19 15:32:00 +03:00
timour@mysql.com
f5fc1543aa WL#2486 - natural and using join according to SQL:2003 
- Corrected problem with N-way nested natural joins in PS mode.
- Code cleanup
- More asserts to check consistency of name resolution contexts
- Fixed potential memory leak of name resolution contexts
 2005-08-19 15:22:30 +03:00
heikki@hundin.mysql.fi
d9bbf7bc53 btr0sea.c: 
Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL
 2005-08-19 12:54:13 +03:00
bell@sanja.is.com.ua
20a052880f fixed test after merge 2005-08-19 11:38:14 +03:00
bell@sanja.is.com.ua
102420642a 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 11:37:00 +03:00
heikki@hundin.mysql.fi
6b32f5a1e9 row0sel.c: 
Temporarily remove error print if MySQL tries to do a SELECT even though trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of cursors is properly implemented (Bug #12456)
 2005-08-19 11:33:11 +03: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
andrey@lmy004.
7f9e97f70c test fix for fix of 12591 2005-08-19 09:08:41 +02:00
bell@sanja.is.com.ua
69476be2d1 changes in row operation 2005-08-19 09:46:59 +03: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
jan@hundin.mysql.fi
eb559bd0c5 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/mysql-5.0
 2005-08-19 05:08:49 +03:00
igor@rurik.mysql.com
6fae8f6c8d Manual merge 2005-08-18 15:18:26 -07: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
8761dd329c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-aug18-fix
 2005-08-18 18:28:02 +04: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
391416898f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-18 07:25:56 -07:00
stewart@mysql.com
10639bbdff Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-08-19 00:04:45 +10: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
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
76cacf4522 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-18 11:29:29 +03:00
timour@mysql.com
f31f5eabc7 WL#2486 - natural and using join 
Fixed debug printout.
 2005-08-18 11:28:50 +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
stewart@mysql.com
3786ea5891 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-08-18 16:52:58 +10:00
stewart@mysql.com
9bd662624c Fix merge of BUG#11538 fix. 2005-08-18 16:47:41 +10: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
jan@hundin.mysql.fi
cc05d6dca1 Allow consistent cursor view see changes made by creating transaction. 
This is quick fix and needs to be fixed when semi-consistent 
high-granularity read view is implemented (Bug #12456).
 2005-08-18 06:38:01 +03: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
jimw@mysql.com
a3ae4e0fc7 Fix up definition of new set_timespec_nsec() macro. (Related to bug #12582) 2005-08-17 18:08:30 -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
aivanov@mysql.com
7b3ae86a81 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-17 22:54:15 +04:00
andrey@lmy004.
4ff51a5743 fix for bug #12591 (SHOW TABLES FROM dbname produces wrong error message) 2005-08-17 17:51:10 +02:00
heikki@hundin.mysql.fi
de8058630d univ.i: 
Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510)
 2005-08-17 18:15:50 +03: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