Commit graph

27251 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02: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
9077ee4407 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-05 22:07:04 +02:00
serg@serg.mylan
2d11bbdb21 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-05 20:11:24 +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
jimw@mysql.com
83330214e2 Merge mysql.com:/home/jimw/my/mysql-5.0-13071
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-05 10:07:04 -07:00
jimw@mysql.com
6b476cf5cd Fail when two messages exist for the same language for an error in the
server error messages file. (Bug #13071)
2005-10-05 10:06:31 -07:00
serg@serg.mylan
10953a6d8c Bug#13143 - formatID should not affect XID's uniqueness 2005-10-05 16:38:53 +02:00
msvensson@neptunus.(none)
debff3e632 Revert 2005-10-05 14:37:42 +02:00
anozdrin@mysql.com
95327abcc2 Make mysql_fix_privilege_tables.sh not dependent on the current directory. 2005-10-05 01:08:22 +04: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
serg@serg.mylan
bbdb6c9147 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 21:37:51 +02:00
serg@mysql.com
30077692dc innodb.result:
somehow it didn't get into the previous changeset
2005-10-04 21:37:50 +02:00
jimw@mysql.com
418808ba9a Merge bk-internal:/home/bk/mysql-5.1
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-10-04 10:53:18 -07:00
jani@ua141d10.elisa.omakaista.fi
eaff73807c Changed __USE_XOPEN to _XOPEN_SOURCE and got rid of
some extra code.
2005-10-04 20:22:39 +03: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
brian@zim.(none)
b02870d6ec Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/fix-5.0
2005-10-04 08:26:24 -07: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
serg@serg.mylan
fd3be6a933 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-04 16:36:10 +02:00
msvensson@neptunus.(none)
fa2bbce5fa Move -ansi from global_warnings to cxx_warnings 2005-10-04 14:42:02 +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
serg@serg.mylan
56d40c1ac6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-03 19:53:00 +02:00
SergeyV@selena.
6728bc92fb Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into  selena.:H:/MYSQL/src/tmp-mysql-5.0
2005-10-03 21:08:42 +04:00
SergeyV@selena.
84624244b2 Unset EOLN_NATIVE flag for proper tests execution under win32. 2005-10-03 21:04:04 +04:00
konstantin@mysql.com
1831d62a5c Fix -ansi -pedantic compilation failure. 2005-10-03 19:44:53 +04:00
jonas@perch.ndb.mysql.com
3506d3db96 ndb -
fix solaris problem
  (dont print null)
2005-10-03 16:06:07 +02:00
msvensson@neptunus.(none)
e6e4a0ecde Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/bug13231/my51-bug13231
2005-10-03 12:00:21 +02:00
kent@mysql.com
2b9354c68e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-03 11:57:55 +02:00
msvensson@neptunus.(none)
78504ac33e Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug13231/my50-bug13231
2005-10-03 11:56:23 +02:00
jonas@perch.ndb.mysql.com
2930a466ec ndb - mysql-test-run ndb_config
Fix 32/64 bit insecure code
2005-10-03 11:49:06 +02: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
kent@mysql.com
5ec73ea136 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-01 21:10:18 +02:00
kent@mysql.com
538aaa96eb mysqld.vcproj:
Removed "examples/" from path to "ha_archive.cc"
2005-10-01 21:05:09 +02:00
kent@mysql.com
a7afd91e97 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-01 18:03:39 +02:00
kent@mysql.com
44f94ed2c9 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-01 17:24:13 +02:00
kent@mysql.com
d8b9f5be41 init_db.sql:
mysql.user.password doesn't need utf8
2005-10-01 17:21:09 +02:00
serg@serg.mylan
03c555ea06 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-01 14:56:39 +02: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
eric@mysql.com
b2f5281929 Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/eric/dev/hton-mysql-5.0
2005-09-30 16:28:47 -07:00