mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24526 commits 2793 branches 343 tags 1.7 GiB
Commit graph

24526 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@igor-inspiron.creware.com
a0f594a8ef Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-07-12 05:31:06 -07:00
lars@mysql.com
df55465bdc Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-12 14:23:54 +02:00
igor@igor-inspiron.creware.com
26ee0b2ef8 view.result, view.test: 
Added a test case for bug #11771.
item.h:
  Fixed bug #11771.
  Added method reset_query_id_processor to be able to adjust
  query_id for fields generated from * in queries like this:
  SELECT * FROM <view> ...
sql_base.cc:
  Fixed bug #11771.
  Adjusted query_id for fields generated from * in queries
  like this: SELECT * FROM <view> ...
 2005-07-12 05:18:05 -07:00
lars@mysql.com
bdf0a22c71 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/b6987-mysql-4.1
 2005-07-12 14:17:23 +02:00
lars@mysql.com
ef1edc9d79 Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-12 13:36:21 +02:00
hf@deer.(none)
64c2a598b6 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-07-12 16:02:35 +05:00
mskold@mysql.com
60bb14c3ef Fixed failed merge 2005-07-12 11:49:57 +02:00
mskold@mysql.com
2dd4dd9291 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-12 11:46:53 +02:00
hf@deer.(none)
ba559d651e Fix for bug #11557 (Error during rounding of the DEFAULT values) 2005-07-12 14:17:59 +05:00
joerg@mysql.com
8014606e19 Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 2005-07-12 11:10:33 +02:00
georg@lmy002.wdf.sap.corp
4f641c0443 Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-07-12 11:00:01 +02:00
georg@lmy002.wdf.sap.corp
55d413252f changes after Bar's review: renamed CHARACTER_SET to MY_CHARSET_INFO 2005-07-12 10:58:21 +02:00
mskold@mysql.com
f741566646 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-07-12 10:57:01 +02:00
mskold@mysql.com
d71548c873 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-07-12 10:50:47 +02:00
mskold@mysql.com
c37aece470 Disabled internal ndb system table test, since it only works on case sensitive systems 2005-07-12 10:39:58 +02:00
georg@lmy002.wdf.sap.corp
ceba4ee9cd New attempt after Bar's review 
Added api function mysql_get_character_set_info which provides
information about the current client character set.
 2005-07-12 10:31:43 +02:00
bar@mysql.com
2204effda1 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-12 13:18:25 +05:00
stewart@mysql.com
6955f0e76b Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-12 15:51:31 +10:00
lars@mysql.com
dc55af92ff BUG#6987: Added note when stat is failing on relay log, added mutex for log rotatation. 2005-07-12 06:01:26 +02:00
lars@mysql.com
0b77c0f784 Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-12 03:23:52 +02:00
brian@avenger.(none)
0c5ac2dd5b Fix for gcc 4.0 (they have removed min/max operators). 2005-07-11 16:56:18 -07:00
jimw@mysql.com
7ae4a6043c Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844) 2005-07-11 10:37:21 -07:00
pem@mysql.com
8e7951a1c4 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-11 19:11:52 +02:00
pem@mysql.com
ee81c73a0d Post-review fix. 2005-07-11 19:10:51 +02:00
reggie@linux.site
48d8d8afe3 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  linux.site:/home/reggie/bk/mysql-5.0
 2005-07-11 11:01:14 -06:00
pem@mysql.com
b268a17866 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-11 19:01:14 +02:00
brian@brian-akers-computer.local
f860743486 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/comment-5.0
 2005-07-11 10:01:13 -07:00
brian@brian-akers-computer.local
4d68f5d070 Added a test for glibtoolize so that the autoconf tools that come installed on OSX will work fine (so no need to replace them). 2005-07-11 09:52:19 -07:00
joerg@mysql.com
e3feff334f cmd-line-utils/libedit/chared.c: Fix compile problem caused by use of "uint" which is undefined on QNX. 2005-07-11 15:59:49 +02:00
pem@mysql.com
65fa6604f0 Updated system_mysql_db.result after mysql.proc definition changes. 2005-07-11 15:57:46 +02:00
reggie@linux.site
7de0a01800 ha_archive.cc: 
Added cast to fix windows compile error
 2005-07-11 06:14:42 -06:00
bar@mysql.com
1042a275fe field_conv.cc: 
Identation fix
 2005-07-11 16:51:39 +05:00
pem@mysql.com
6f54e27e5e Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-11 12:46:42 +02:00
reggie@linux.site
d502f28f1c sql_insert.cc: 
Added cast to bool to fix windows compile problem
 2005-07-11 04:33:19 -06:00
bar@mysql.com
45fe5e74d8 field_conv.cc: 
Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
ctype_utf8.result, ctype_utf8.test:
  adding test case
 2005-07-11 13:20:07 +05:00
brian@brian-akers-computer.local
054e0e1712 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into brian-akers-computer.local:/Users/brian/mysql/optimize-5.0
 2005-07-10 22:27:36 -07:00
brian@brian-akers-computer.local
2ff7ce856b Fixed 32bit issue, reworked error logic for open tables, and redid the repair table code so that it uses the extended optimize table code. 2005-07-10 21:17:03 -07:00
stewart@mysql.com
6549a72e4f Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-07-11 13:56:08 +10:00
brian@brian-akers-computer.local
85e2b662bf Refactoring of write_row() into two parts to allow future additions. Also rewrote the OPTIMIZE TABLE code, to add new extended optimize. This form of optimize rebuilds not only the file, but each individual row. 2005-07-10 18:19:37 -07:00
brian@zim.(none)
5b65be7b14 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/foo-5.0
 2005-07-10 10:04:13 -07:00
dlenev@mysql.com
4e8c22f296 Manual fixes after merging patch for bug #8406 "Triggers crash if referencing 
a table" with main tree.
 2005-07-09 23:11:17 +04:00
dlenev@mysql.com
75b8d4fa08 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg8406
 2005-07-09 22:04:18 +04:00
dlenev@mysql.com
923fe817e0 Enable support of access to tables from triggers. Thus fix bug #8406 "Triggers 
crash if referencing a table" and several other related bugs.
Fix for bug #11834 "Re-execution of prepared statement with dropped function
crashes server." which was spotted during work on previous bugs.

Also couple of nice cleanups:
- Replaced two separate hashes for stored routines used by statement with one.
- Now instead of doing one pass through all routines used in statement for
  caching them and then doing another pass for adding their tables to table
  list, we do only one pass during which do both things.
 2005-07-09 21:51:59 +04:00
brian@zim.(none)
c958cc570f Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/foo-5.0
 2005-07-09 09:03:48 -07:00
brian@zim.(none)
9bd74f7e81 Fixed indention issue, made scan_rows an ha_rows type, and fixed show table status so archive rows are displayed as being compressed. 2005-07-09 08:57:08 -07:00
lenz@mysql.com
94310faa2e - reverted and optimized a merge 2005-07-08 21:13:14 +02:00
lenz@mysql.com
8ad778d9c0 Merge 2005-07-08 21:09:50 +02:00
lenz@mysql.com
ce4f3cfb3f Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-4.1
 2005-07-08 21:06:07 +02:00
lenz@mysql.com
611ae59245 - reverted adding mysql-test/t/*.def to the distribution (it is not supported in 4.1 
at all)
 2005-07-08 21:04:54 +02:00
pem@mysql.com
41acf1ce61 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/mysql-5.0
 2005-07-08 16:40:54 +02:00