mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-01 16:53:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24459 commits 2853 branches 349 tags 1.7 GiB
Commit graph

11657 commits

Author SHA1 Message Date
jimw@mysql.com
81e50844b3 Merge mysql.com:/home/jimw/my/mysql-4.1-11330 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-05 12:51:16 -07:00
jimw@mysql.com
485f2c93c2 Merge mysql.com:/home/jimw/my/mysql-5.0-10214 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-05 09:47:20 -07:00
mats@mysql.com
0449ee1ca8 Merging 4.1 into 5.0 2005-07-05 16:02:03 +02:00
mats@mysql.com
3c42734174 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b11401-mysql-4.1
 2005-07-05 14:08:22 +02:00
mats@mysql.com
6d924c8286 Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes 
this as a LOAD DATA ... REPLACE INTO .. statement.
 2005-07-05 13:55:54 +02:00
bell@sanja.is.com.ua
4bc6bd38ec Merge 2005-07-05 13:42:19 +03:00
bell@sanja.is.com.ua
5eb8404c57 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-07-05 13:39:20 +03:00
bell@sanja.is.com.ua
cee0f3f608 fixed environment creation and cleaning up for processing view one by one during checking (BUG#11337) 2005-07-05 13:37:02 +03:00
bell@sanja.is.com.ua
bfbd0e241b added processing of view grants to table grants (BUG#9795) 2005-07-05 13:36:36 +03:00
mskold@mysql.com
d36f7357e7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-07-05 12:24:03 +02:00
mskold@mysql.com
883efd7e24 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-05 12:22:36 +02:00
bell@sanja.is.com.ua
6f2fb9ea71 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-5.0
 2005-07-05 12:24:04 +03:00
bell@sanja.is.com.ua
2e96c47a82 post-merge fixes 2005-07-05 12:23:13 +03:00
bell@sanja.is.com.ua
15d02e60e1 merge 2005-07-05 11:38:05 +03:00
bell@sanja.is.com.ua
a8e9ca1b51 merge 2005-07-05 11:21:47 +03:00
mskold@mysql.com
bfa7f55d3c Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-05 10:01:27 +02:00
sergefp@mysql.com
a5019cc39c Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-jul4
 2005-07-04 23:40:36 +00:00
sergefp@mysql.com
3d5d366c72 BUG#9814: post-review fixes: clear thd->net.no_send error after SP instruction 
execution, not before.
 2005-07-04 23:40:01 +00:00
sergefp@mysql.com
4a90f7d04f Fix for BUG#9814: Clear thd->net.no_send_error before each SP instruction 
execution. Failure to do so caused the erroneous statements to send nothing
and hang the client.
 2005-07-04 23:00:23 +00:00
mskold@mysql.com
77c481329c Fixed indentation 2005-07-04 20:36:38 +02:00
marko@hundin.mysql.fi
774916a902 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0-current
 2005-07-04 16:12:08 +03:00
monty@mysql.com
5b8683db74 After merge fixes 2005-07-04 16:01:04 +03:00
monty@mysql.com
fe30ec9032 manual merge 2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43 Fixes during review of new code 
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
 2005-07-04 03:42:33 +03:00
monty@mysql.com
75ff7d8085 After merge fixes 
Better fix for ON DUPLICATE KEY UPDATE
 2005-07-04 03:24:25 +03:00
bell@sanja.is.com.ua
67c9df1eb8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug_qc-4.1
 2005-07-04 01:36:55 +03:00
bell@sanja.is.com.ua
54662b4487 merge 2005-07-04 01:36:06 +03:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
bell@sanja.is.com.ua
2941da3971 do not register changes of stack variable 2005-07-03 00:51:02 +03:00
monty@mysql.com
2735d7dcf6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-07-02 16:13:35 +03:00
bell@sanja.is.com.ua
40abfc1b6f fixed var_samp printing (BUG#10651) 2005-07-02 16:12:32 +03:00
bell@sanja.is.com.ua
6201504db9 fixed difference between ps-protocol and usual execution 2005-07-02 13:16:30 +03:00
heikki@hundin.mysql.fi
a9cf7ad0d1 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-07-01 23:16:28 +03:00
heikki@hundin.mysql.fi
4fe03b705a Many files: 
Fix Bug  : if innodb_locks_unsafe_for_binlog is set, release locks on rows that we do not UPDATE or DELETE
 2005-07-01 20:44:35 +03:00
bell@sanja.is.com.ua
b6dc32a755 fixed create_distinct_group() to make references via ref_pointer_array 2005-07-01 20:13:07 +03:00
pem@mysql.com
549399ee9e Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-01 17:01:03 +02:00
konstantin@mysql.com
88603a0edc Fix a crash I introduced by the last push. 2005-07-01 19:01:02 +04:00
pem@mysql.com
8a85dcd1cc Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-01 15:52:42 +02:00
konstantin@mysql.com
f09b4b969c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-11172-new
 2005-07-01 17:52:41 +04:00
konstantin@mysql.com
402df62bf7 Fix a valgrind warning. 2005-07-01 17:51:04 +04:00
igor@rurik.mysql.com
b46b232f3f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-07-01 06:42:39 -07:00
pem@mysql.com
481bb717d7 Disabled the GOTO feature. (It's non-standard and undocumented.) 
We want to have the defacto standard syntax for labels ("L:" instead of "label L;"),
and fix some known bugs, before we enable this again.
The code is left intact (#ifdef'ed SP_GOTO) and the test cases are kept in
sp-goto.test, for the future...
 2005-07-01 15:25:51 +02:00
konstantin@mysql.com
b590f0dec0 - fix -ansi -pedantic error 2005-07-01 16:23:05 +04:00
konstantin@mysql.com
6cc847d0e8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-11172-new
 2005-07-01 15:50:32 +04:00
konstantin@mysql.com
0efa6f86be A fix and a test case for Bug#11172 "mysql_stmt_attr_set 
CURSOR_TYPE_READ_ONLY date/datetime filter server crash".
The fix adds support for Item_change_list in cursors (proper rollback
of the modified item tree).
 2005-07-01 15:47:45 +04:00
igor@rurik.mysql.com
3d06031887 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-07-01 03:50:48 -07:00
bar@mysql.com
cff1c9c3af Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-07-01 15:46:53 +05:00
igor@rurik.mysql.com
347687f71e view.result: 
Fixed the results of a test for group_concat.
  After the fix foor bug  the results became
  correct.
olap.result, olap.test:
  Added a test case for bug .
sql_select.cc:
  Fixed bug : a wrong result set when using a view
  instead of the underlying table in a rollup query 
  executed through filesort.
  The old code did not take into account that we always
  use an Item_ref object when referring to a view column.
item.h:
  Fixed bug .
  Now if two Item_ref items ref1 and ref2 refer to the same field
  then ref1->eq(ref2) returns 1.
 2005-07-01 03:46:08 -07:00
bell@sanja.is.com.ua
faebc3148f fix bugs found by gcc 3.4 compiler 2005-07-01 13:27:23 +03:00
marko@hundin.mysql.fi
4eba989290 InnoDB: Optimize [and clarify] a condition in build_template() 2005-07-01 13:20:16 +03:00