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
25409 commits 2791 branches 343 tags 1.7 GiB
Commit graph

25409 commits

This branch
This branch
All branches
Author SHA1 Message Date
andrey@lmy004.
dde57f082b fix for bug #12533 (crash on DESCRIBE <view> after renaming base table column) 2005-08-25 09:24:21 +02: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
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
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
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
brian@zim.(none)
f97d993120 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-08-16 18:39:16 -07:00
kent@mysql.com
4e4f40e468 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-17 03:39:15 +02:00
kent@mysql.com
16359fc02f mysql-test-run.pl: 
Bug#11884: Corrected --start-and-exit, start the server
  as if the default/specified test case would have been run
 2005-08-17 03:35:50 +02:00
jimw@mysql.com
054e78943e Fix SLEEP() to be interruptable. (Bug #12582) 2005-08-16 16:31:16 -07:00
kent@mysql.com
32306349a5 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-17 01:26:19 +02:00
kent@mysql.com
c3104d1af1 mtr_process.pl: 
Bug#11792: Check all of status code, to catch a crash as a failure
mtr_cases.pl:
  Code cleanup for skipped/disabled handling
mtr_process.pl:
  In debug mode, report if mysqladmin did not at least
  make the server stop listening to the port.
  Increased the time waiting for terminating to 20 seconds,
  to wait for really slow slave shutdown.
  Added call to start_reap_all(), to avoid zombies.
mtr_report.pl:
  Removed prototype for unused function mtr_report_test_disabled()
 2005-08-17 01:18:13 +02: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