mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26965 commits 2784 branches 343 tags 1.6 GiB
Commit graph

12837 commits

Author SHA1 Message Date
pem@mysql.com
9d16659d10 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/bug7049/mysql-5.0
 2005-10-11 15:57:27 +02:00
hf@deer.(none)
be0917049b Merging 2005-10-11 14:58:25 +05:00
lars@mysql.com
bef189cc4e Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0
 2005-10-10 21:52:50 +02:00
lars@mysql.com
5456afc603 Added missing HAVE_REPLICATION define 2005-10-10 21:42:14 +02:00
svoj@mysql.com
3d0082d3b0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/engine/mysql-5.0
 2005-10-11 00:35:09 +05:00
svoj@mysql.com
83043c3c83 Always save/restore connect string. 2005-10-10 23:53:53 +05:00
svoj@mysql.com
eb8ab30046 Store and read engine type string in extra block of .frm. 2005-10-10 23:01:45 +05:00
lars@mysql.com
af951aa662 After merge fixes 2005-10-10 19:38:58 +02:00
hf@deer.(none)
83c103ed81 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.13372
 2005-10-10 21:09:34 +05:00
lars@mysql.com
57f36732ca Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-10-10 17:50:19 +02:00
lars@mysql.com
998380521f BUG#12618: Removing fake locking 2005-10-10 15:10:14 +02:00
konstantin@mysql.com
2c7505b263 Remove protocol_cursor.cpp (no longer used) from sources 
Fix a compile failure
 2005-10-09 14:45:08 +04:00
serg@serg.mylan
ba169f81e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-08 16:59:41 +02:00
serg@serg.mylan
da625424e0 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-10-08 16:59:08 +02:00
serg@serg.mylan
510d5c3583 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-08 16:56:10 +02:00
serg@serg.mylan
e91712d9bb pthread_handler_decl() changed to be ctags-friendly 
(and contain extern "C" when necessary)
 2005-10-08 16:39:55 +02:00
serg@serg.mylan
ae293f9ac5 Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE" 
don't allow STOP SLAVE if global read lock is in taken
 2005-10-08 14:46:04 +02:00
gluh@eagle.intranet.mysql.r18.ru
b2b8d8b276 Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails 
allow select into outfile from I_S tables
  it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
  as we use 'any_db' for 'check_access' function in places where FILE_ACL is required
 2005-10-07 14:16:44 +05:00
sergefp@mysql.com
140dea1426 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13484
 2005-10-07 11:14:40 +04:00
monty@mysql.com
3f73d25fba Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2005-10-07 04:02:53 +03:00
monty@mysql.com
82855517a1 Review of new code since last pull 
- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null
 2005-10-07 03:12:15 +03:00
serg@serg.mylan
b05a6d8fda don't "init" binlog if opt_bin_log is not set 
(bug#13791 - mysqld crashes at startup in TC_LOG_MMAP::open)
 2005-10-06 19:05:34 +02:00
kent@mysql.com
5e204d46f1 Merge 2005-10-06 15:42:50 +02:00
msvensson@msdesk.(none)
5da6a6c8a1 Merge msdesk.(none):/home/msvensson/mysql-4.1 
into  msdesk.(none):/home/msvensson/mysql-5.0
 2005-10-06 14:40:18 +02:00
bar@mysql.com
905c8b8c88 item_cmpfunc.cc: 
Wrong variable.
 2005-10-06 15:26:59 +05:00
kent@mysql.com
3af12c4776 my_pthread.h: 
Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
  Return type is to be 'my_bool' for 'opt_enable_shared_memory'
 2005-10-06 03:49:14 +02:00
serg@serg.mylan
2356401750 Bug#12935 Local and XA transactions not mutually exclusive 2005-10-05 19:58:16 +02:00
serg@serg.mylan
faa0365d29 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-05 19:37:02 +02:00
serg@mysql.com
83683bb649 sql_table.cc: 
fixed CHECKSUM TABLE to be independent from the first 'deleted' bit in the null bitmask (undefined in the InnoDB)
  bug#13710
 2005-10-05 19:36:20 +02:00
serg@serg.mylan
10953a6d8c Bug#13143 - formatID should not affect XID's uniqueness 2005-10-05 16:38:53 +02:00
bar@mysql.com
1fb8ea3714 item_cmpfunc.cc: 
wrong variable.
 2005-10-05 17:33:39 +05:00
bar@mysql.com
a98e6dfe44 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-10-05 11:28:08 +05:00
serg@serg.mylan
3edd6c016a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-04 21:43:56 +02:00
jani@ua141d10.elisa.omakaista.fi
a1b609f010 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-04 19:53:07 +03:00
jani@ua141d10.elisa.omakaista.fi
4099872e2c Fixed several boolean type options used in my_long_options[]. 
Some options were declared as 'bool', but since those are being
handled in my_getopt.c, bool can be machine dependent. To make
sure it works in all circumstances, the type should be my_bool
for C (not C++) programs.
 2005-10-04 19:52:12 +03:00
serg@serg.mylan
84859c3895 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-04 18:10:38 +02:00
jani@ua141d10.elisa.omakaista.fi
17e87da298 Some fixes including implicit declaration of a function, 
using wrong type in assignment etc.
 2005-10-04 18:20:57 +03:00
serg@mysql.com
062f145bf8 sql_table.cc, table.cc, table.h: 
fixed CHECKSUM TABLE to be independent from last - undefined in InnoDB - bits in the null bitmask
  bug#13710
 2005-10-04 17:04:20 +02:00
brian@zim.(none)
11be8401a7 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/fix-5.0
 2005-10-03 21:09:01 -07:00
kent@mysql.com
fe26e59d70 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-04 04:03:48 +02:00
brian@zim.(none)
2a42afd132 Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers. 
May changes were to simplify storage engine setup and support for legacy call to show storage engines.
 2005-10-03 18:42:30 -07:00
timour@mysql.com
233e68e205 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-13410
 2005-10-03 22:02:22 +03:00
marko@hundin.mysql.fi
bf30733840 Merge hundin.mysql.fi:/home/marko/mysql-4.0 
into  hundin.mysql.fi:/home/marko/mysql-4.1
(Bug #13002)
 2005-10-03 17:54:39 +03:00
marko@hundin.mysql.fi
d62b9f4b4b InnoDB: Display an error message in /* */ comments 
in SHOW CREATE TABLE if a temporary file cannot be created.
(Bug #13002)
 2005-10-03 17:46:27 +03:00
kent@mysql.com
f49ac24a0f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-03 10:39:35 +02:00
msvensson@neptunus.(none)
25cf17f695 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
 2005-10-03 10:08:02 +02:00
brian@zim.(none)
0ba8ca2a17 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/fix-5.0
 2005-10-02 20:13:18 -07:00
brian@zim.(none)
54a958993c Next big patch for loadable storage engines! 
Handlerton array is now created instead of using sys_table_types_st. All storage engines can now have inits and giant ifdef's are now gone for startup. No compeltely clean yet, handlertons will next be merged with sys_table_types. Federated and archive now have real cleanup if their inits fail.
 2005-10-02 19:44:28 -07:00
sergefp@mysql.com
90414dcaaf BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the function 
that compares key images.
 2005-10-01 11:56:01 +04:00
timour@mysql.com
77cf84186e Fix for BUG#13410 - qualified reference to a view column in the HAVING clause cannot be resolved. 
The problem was then when a column reference was resolved to a view column, the new Item
created for this column contained the name of the view, and not the view alias.
 2005-10-01 09:35:30 +03:00