mariadb/include
Guilhem Bichot b90ff5340f Fixing problems of previous 5.1-main->5.1-maria merge:
- adding back Serg's "mtr --list-options"
- safe_mutex deadlock detector started raising wrong deadlock warnings, fixed
here by a backport from 6.0-main.

include/my_pthread.h:
  Porting changes done to 6.0-main which satisfy the safe_mutex deadlock detector (those
  in 5.1-main don't), see chad@mysql.com-20090126155607-n0j3zbmgbfepnmmo for explanations
mysql-test/mysql-test-run.pl:
  adding back Serg's --list-options
mysys/my_init.c:
  Porting changes done to 6.0-main which satisfy the safe_mutex deadlock detector (those
  in 5.1-main don't), see chad@mysql.com-20090126155607-n0j3zbmgbfepnmmo for explanations
mysys/my_thr_init.c:
  Porting changes done to 6.0-main which satisfy the safe_mutex deadlock detector (those
  in 5.1-main don't), see chad@mysql.com-20090126155607-n0j3zbmgbfepnmmo for explanations
2009-02-12 16:27:33 +01:00
..
atomic post-review fixes 2009-01-15 22:27:36 +01:00
mysql Merged 5.1 with maria 5.1 2008-10-10 18:28:41 +03:00
.cvsignore
base64.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
config-netware.h Many files: 2007-07-23 23:54:55 +02:00
config-win.h merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. 2009-02-12 15:08:56 +01:00
decimal.h WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
errmsg.h Bug#27430 "Crash in subquery code when in PS and table DDL changed after 2008-05-20 20:36:26 +04:00
ft_global.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-06-27 17:49:12 +03:00
hash.h merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. 2009-02-12 15:08:56 +01:00
heap.h Added support for 'internal temporary tables' in HEAP tables. 2007-07-25 01:58:12 +03:00
help_end.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
help_start.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
keycache.h Merge hynda.mysql.fi:/home/my/mysql-5.1-main 2007-09-27 17:05:07 +03:00
lf.h post-review fixes 2009-01-15 22:27:36 +01:00
m_ctype.h 5.0-bugteam->5.1-bugteam merge 2008-12-23 18:21:01 +04:00
m_string.h Fixes for build errors under Windows and compiler warning under Linux 2008-06-26 17:10:11 +02:00
Makefile.am Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or mysql-test/t/*myisam*. 2008-11-21 15:21:50 +01:00
maria.h post-review fixes 2009-01-15 22:27:36 +01:00
my_aes.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_alarm.h Many files: 2006-12-23 20:17:15 +01:00
my_alloc.h Merged 5.1 with maria 5.1 2008-10-10 18:28:41 +03:00
my_atomic.h Fixes for bugs (my_atomic and Maria log handler) observed on 2008-02-20 16:58:43 +01:00
my_attribute.h Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h 2007-04-12 00:43:25 +02:00
my_base.h Fix for bug#39226 Maria: crash with FLUSH TABLES WITH READ LOCK after LOCK TABLES 2008-10-12 13:09:52 +03:00
my_bit.h After merge fixes. 2008-04-29 09:26:37 +03:00
my_bitmap.h Bug#31552 Replication breaks when deleting rows from out-of-sync table 2007-12-12 12:14:59 +02:00
my_dbug.h Bug#38522: 5 seconds delay when closing application using embedded server 2008-12-04 19:41:53 +01:00
my_dir.h Many files: 2006-12-23 20:17:15 +01:00
my_getopt.h Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> 2008-02-18 23:29:39 +01:00
my_global.h merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. 2009-02-12 15:08:56 +01:00
my_handler.h Merged 5.1 with maria 5.1 2008-10-10 18:28:41 +03:00
my_libwrap.h Many files: 2006-12-23 20:17:15 +01:00
my_list.h WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
my_md5.h Avoid the name conflict between the system-provided "md5.h" and the MySQL one 2007-07-19 14:14:03 +02:00
my_net.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_no_pthread.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
my_nosys.h WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
my_pthread.h Fixing problems of previous 5.1-main->5.1-maria merge: 2009-02-12 16:27:33 +01:00
my_stacktrace.h Bug#37003 Tests sporadically crashes with embedded server 2008-06-19 11:02:32 -03:00
my_sys.h Merged 5.1 with maria 5.1 2008-10-10 18:28:41 +03:00
my_time.h Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 2008-04-03 13:14:57 -04:00
my_tree.h WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" 2008-05-29 18:33:33 +03:00
my_trie.h WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
my_uctype.h Many files: 2006-12-31 02:29:11 +01:00
my_user.h WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
my_vle.h WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
my_xml.h WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
myisam.h merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. 2009-02-12 15:08:56 +01:00
myisamchk.h Added versioning of row data 2008-04-10 05:26:36 +03:00
myisammrg.h Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*) 2008-04-26 02:45:58 +05:00
myisampack.h Injecting more "const" declarations into code which does not change 2008-04-03 15:40:25 +02:00
mysql.h Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0 2007-11-26 16:10:26 -02:00
mysql.h.pp Merged 5.1 with maria 5.1 2008-10-10 18:28:41 +03:00
mysql_com.h Merged 5.1 with maria 5.1 2008-10-10 18:28:41 +03:00
mysql_embed.h Bug #32211 Test 'windows' and 'windows_shm' failed for embedded server 2007-11-18 00:32:06 +04:00
mysql_time.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysql_version.h.in Bug #15327: configure: --with-tcp-port option being partially ignored 2007-09-13 16:19:46 +02:00
mysys_err.h Added wrapper for chmod(): my_chmod() 2008-01-03 09:45:46 +02:00
queues.h Bug #31890 Partitions: ORDER BY DESC in InnoDB not working. 2007-11-14 22:20:31 +04:00
rijndael.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sha1.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_common.h Merge mysql.com:/home/hf/work/25097/my50-25097 2008-02-27 13:00:59 +04:00
sslopt-case.h Many files: 2006-12-23 20:17:15 +01:00
sslopt-longopts.h WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
sslopt-vars.h Many files: 2006-12-23 20:17:15 +01:00
t_ctype.h Many files: 2006-12-23 20:17:15 +01:00
thr_alarm.h fixes for build failures due to my yesterday's changeset forbidding 2008-02-19 18:45:11 +01:00
thr_lock.h merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. 2009-02-12 15:08:56 +01:00
typelib.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 2007-04-27 19:09:39 +02:00
violite.h Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 2007-06-15 19:06:06 +02:00
waiting_threads.h compilation fixes 2009-01-19 16:27:49 +01:00
wqueue.h Locking for read and write made waiting for each other (with loose 2008-02-22 22:32:34 +02:00