database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Code Activity
51,338 Commits 3,273 Branches 1,096 Tags
fabaa50cd969dc8be45cd3679389c4edef34e403
Commit Graph

2298 Commits

Author SHA1 Message Date
baker@bk-internal.mysql.com
f175a892ab Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-28 22:22:52 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 20:59:57 +01:00
msvensson@neptunus.(none)
d1d93f7412 Fix spelling error reported by Paul 2006-11-28 17:13:38 +01:00
monty@mysql.com/nosik.monty.fi
9c3a2a0d8e Increased heap max length to > 4G for 64 bit machines 
Initialize key_part->type on open. This caused key_copy() to fail for bit_fields. (key_copy is used in HANDLER and opt_range)
 2006-11-28 00:47:21 +02:00
tsmith/tim@siva.hindu.god
37d1d86d9f raise max_connections default to avoid conflicts with apache max_childs settings (Bug #23883) 2006-11-27 15:01:14 -07:00
monty@mysql.com/nosik.monty.fi
0e149b7170 Removed compiler warnings 
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
 2006-11-27 18:16:08 +02:00
monty@nosik.monty.fi
313f23a93a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/home/my/mysql-5.1
 2006-11-27 14:07:52 +02:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f Fixed a LOT of compiler warnings 
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
 2006-11-27 01:47:38 +02:00
msvensson@neptunus.(none)
0e4d97edf0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-23 18:38:27 +01:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
baker@bk-internal.mysql.com
098571df33 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-22 05:54:30 +01:00
monty@nosik.monty.fi
38a92caeb7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743 Added --debug-info to most clients to detect memory leaks in mysql-test-run 
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
 2006-11-21 22:32:58 +02:00
kroki/tomash@moonlight.intranet
f6235bc58c Update after merge. 
Use mutex when reading prepared_stmt_count global status variable.

Update test case for bug 16365 and bug 23159: add test for
prepared_stmt_count being decreased when some connection that had
prepared statements is closed.
 2006-11-21 17:23:54 +03:00
kroki/tomash@moonlight.intranet
5ba9ab49b7 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23159
 2006-11-21 17:00:42 +03:00
kroki/tomash@moonlight.intranet
2bde57836c Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23159
 2006-11-21 16:53:33 +03:00
kroki/tomash@moonlight.intranet
0d588f8882 BUG#23159: prepared_stmt_count should be status variable 
Make Prepared_stmt_count a global status variable, accessible via
SHOW STATUS LIKE 'Prepared_stmt_count';.  Documentation should be
updated.
 2006-11-21 16:49:18 +03:00
brian@zim.(none)
39458a6e1b This straightens up usage of have_ variables, and removes dead -skip-isam option. 2006-11-20 14:04:07 -08:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
 2006-11-20 22:42:06 +02:00
msvensson@neptunus.(none)
dc9c3b5ad6 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-17 14:45:08 +01:00
msvensson@neptunus.(none)
dc495b8c4f Merge 192.168.0.4:mysql/bug22958/my50-bug22958 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-17 12:38:52 +01:00
jani@ua141d10.elisa.omakaista.fi
596f64d91a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string
 2006-11-16 14:38:45 +02:00
lars@black.(none)
63c906f749 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-13 12:45:31 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
2b2529de79 WL#3368 mixed binlog_format default 
An amendment for parsing argument in case NDB is compiled and active.
  NDB switches from mixed to row-based and back per each query. The previous patch
  was not aware of such behaviour and made exceptional assingment to row-based when
  no command line arg --binlog-format provided.
  
  Removing #if HAVE_NDB_BINLOG block alltogether: ndb supports mixed and if server 
  was build without NDB using binlog nothing to care.
  Test for this piece of code is rather specific. While there is active bug23110
  ndb_alter_table and some other should fail if no explict --binlog-format is given:
  mysql-test-run ndb_alter_table
 2006-11-13 13:20:35 +02:00
cmiller@zippy.cornsilk.net
7d07c33d30 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-11 09:02:01 -05:00
cmiller@zippy.cornsilk.net
e0b1e1adcc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860
 2006-11-11 08:58:24 -05:00
cmiller@zippy.cornsilk.net
7aa1e7190d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
 2006-11-11 08:57:26 -05:00
baker@bk-internal.mysql.com
52e03bac84 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-11 02:25:40 +01:00
brian@zim.(none)
b46c727a66 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-11-10 17:25:39 -08:00
brian@zim.(none)
739f2c27d0 This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :) 2006-11-10 17:21:59 -08:00
cmiller@zippy.cornsilk.net
72dfd02634 Bug #22860: Option --memlock should be revisited 
Support says that memlock doesn't work on OSes other than Solaris.  
Add a warning about --memlock to the crash monologue.
 2006-11-10 16:36:08 -05:00
anozdrin/alik@alik.
9421205b49 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2006-11-08 22:20:58 +03:00
anozdrin/alik@alik.
ee15c11b7c Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
 2006-11-07 16:24:35 +03:00
baker@bk-internal.mysql.com
079506b5a0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-07 06:59:51 +01:00
brian@zim.(none)
8a56fcff6a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-11-05 12:06:09 -08:00
brian@zim.(none)
1a92614216 Removed Innodb variable at request of Innobase. 2006-11-05 12:03:19 -08:00
anozdrin/alik@alik.
18fb4abff4 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-11-03 14:00:35 +03:00
cmiller@zippy.cornsilk.net
b074e13483 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-02 17:51:59 -05:00
cmiller@zippy.cornsilk.net
af5acac047 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-02 17:39:52 -05:00
malff/marcsql@weblab.(none)
48a87f8ae0 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21114_b
 2006-11-02 11:13:04 -07:00
malff/marcsql@weblab.(none)
62c242cc75 Bug#21114 (Foreign key creation fails to table with name format) 
Due to the complexity of this change, everything is documented in WL#3565

This patch is the third iteration, it takes into account the comments
received to date.
 2006-11-02 11:01:53 -07:00
baker@bk-internal.mysql.com
5214ed48e7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-02 08:35:55 +01:00
kostja@bodhi.local
965669d1f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:24:11 +03:00
kostja@bodhi.local
6a28c436f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-02 01:08:39 +03:00
monty@nosik.monty.fi
d745fe49fe Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-01 19:46:23 +02:00
monty@mysql.com/nosik.monty.fi
ca99516cc7 Fixed a lot of compiler warnings (Mainly in mysqld and instance manager) 
Fixed some possible fatal wrong arguments to printf() style functions
Initialized some not initialized variables
Fixed bug in stored procedure and continue handlers
(Fixes Bug#22150)
 2006-11-01 19:41:09 +02:00
brian@zim.(none)
31e47a9511 Adding in an ha_end() call. This is the first part of the patch I and Monty have agreed on. In the future engines will have the option of shutting down more quickly via the panic call, or just shutting down during the unloading of a plugin. 2006-10-31 20:10:32 -08:00
msvensson@shellback.(none)
1d5abe60ff Bug#22958 Com_create_user missing within 5.0 
- Add Com_create_user to SHOW STATUS command
 2006-10-30 15:59:47 +01:00
kroki/tomash@moonlight.intranet
cf99db484e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21915
 2006-10-30 17:57:45 +03:00
kroki/tomash@moonlight.intranet
1c87434699 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
 2006-10-30 17:51:36 +03:00