mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13575 commits 2790 branches 343 tags 1.7 GiB
Commit graph

13575 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
978e1ba084 bug#4881 - crash in ALTER .. RENAME if rename fails 
sql/sql_select.cc:
  typos in comments
  harmless (hopefully) bug in optimizer fixed
 2004-08-07 18:26:59 +02:00
unknown
ea8ac8ab98 hang in dummy natural join (no common columns) Bug #4807 2004-08-02 11:12:11 +02:00
unknown
3c1327021a followup to SET PASSWORD fix 2004-08-01 17:21:55 +02:00
unknown
12bdc04b29 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-01 16:35:35 +02:00
unknown
2919d44260 Fix mysql-test-run w.r.t NDB 
"export A=var" is bash feature
instead do "A=var; export A"
 2004-08-01 14:12:45 +02:00
unknown
679e388f22 Fix uninit var. 
Fix error printout


ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Fix init scan frag record
ndb/src/mgmsrv/main.cpp:
  Fix error printout
 2004-08-01 13:41:13 +02:00
unknown
76c6b740b9 New file missing in source distr. 2004-08-01 09:07:08 +02:00
unknown
a3630acb41 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/orca/space/pekka/ndb/version/my41-34x
 2004-07-31 15:54:37 +02:00
unknown
7bee058b24 Bitmask.hpp: 
compile fix for gcc-3.4.x


ndb/include/util/Bitmask.hpp:
  compile fix for gcc-3.4.x
 2004-07-31 15:53:27 +02:00
unknown
0ba0f4a9aa Bug fix for alter table and auto_increment 2004-07-31 12:00:12 +02:00
unknown
93f773aa47 bug#4817 catalog name is "def" 2004-07-30 22:15:52 +02:00
unknown
95da1ff0fc apply in SET PASSWORD same checks as in GRANT, to let only valid hashes through 2004-07-30 22:05:08 +02:00
unknown
2ba4836cf5 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/l/mysql-4.1
 2004-07-30 17:32:53 +03:00
unknown
a45562b50b Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/mikron/mysql-4.1
 2004-07-30 16:10:08 +02:00
unknown
c4149d25ef fil0fil.c: 
Restore accidentally deleted comment of fil_create_directory_for_tablename()


innobase/fil/fil0fil.c:
  Restore accidentally deleted comment of fil_create_directory_for_tablename()
 2004-07-30 17:04:56 +03:00
unknown
979126224b ha_innodb.cc: 
ha_innobase::create(): pass the query string as UTF-8
  to row_table_add_foreign_constraints()  (Bug #4649)


sql/ha_innodb.cc:
  ha_innobase::create(): pass the query string as UTF-8
  to row_table_add_foreign_constraints()  (Bug #4649)
 2004-07-30 16:08:19 +03:00
unknown
f719a1d65d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/mikron/mysql-4.1
 2004-07-30 15:05:56 +02:00
unknown
5e3a68892a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-30 14:25:18 +02:00
unknown
864405db7d no_auto_value_on_zero + alter table bug 2004-07-30 14:17:12 +02:00
unknown
80de371ea3 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-07-30 14:03:16 +02:00
unknown
d249218105 - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link 
flags to enable static linking (to avoid having a shared lib
   dependency in the Linux RPMs)
 - Disabled OpenSSL in the Max RPM


sql/Makefile.am:
   - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link
     flags to enable static linking (to avoid having a shared lib
     dependency in the Linux Server RPMs)
support-files/mysql.spec.sh:
   - Disable OpenSSL in the Max RPM
 2004-07-30 13:52:44 +02:00
unknown
d130406c6d Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-07-30 14:11:56 +03:00
unknown
65460480a6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/mikron/mysql-4.1


ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
ndb/test/include/HugoTransactions.hpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
 2004-07-30 12:48:34 +02:00
unknown
d392ff2130 Removed an error check from debug mode that gets executed 
n**2 times in closeTransaction where n is number of signals
sent in transaction. n can easily become 250.000 in a large
transaction.
 2004-07-30 12:46:27 +02:00
unknown
f0f24adb38 Updated ps_6bdb.results. 
mysql-test/r/ps_6bdb.result:
  Updated results.
 2004-07-30 12:13:40 +02:00
unknown
274e1bee6b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-30 11:48:56 +02:00
unknown
cfe4c252ac Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1717
 2004-07-30 10:12:02 +02:00
unknown
be536c3a9e syntax fix: superfluous ';' which caused a problem with gcc 2.95 
sql-common/my_time.c:
  superfluous ; which caused a problem with gcc 2.95
 2004-07-30 10:08:37 +02:00
unknown
7790856f1a Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-30 09:50:37 +02:00
unknown
e452548352 auto_value_on_zero bug test 
mysql-test/r/auto_increment.result:
  bug test
mysql-test/t/auto_increment.test:
  bug test
sql/sql_base.cc:
  cleanup
 2004-07-30 09:47:56 +02:00
unknown
3f636aa379 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4492
 2004-07-30 11:01:29 +04:00
unknown
252030e094 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-07-30 08:28:04 +03:00
unknown
6fa88eacfa Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1717
 2004-07-30 01:12:28 +02:00
unknown
9aa4a2d215 rpl_relayrotate.test requires InnoDB (because what we want to test is 
if slave resumes at BEGIN).


mysql-test/t/rpl_relayrotate.test:
  require InnoDB (does not make sense without InnoDB)
 2004-07-30 01:10:21 +02:00
unknown
04f93abb2d Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hegel.txg:/home/miguel/bk/mysql-4.1
 2004-07-29 18:37:18 -03:00
unknown
962d942c95 Fix for bug report #4737 and revert fix for bug #4375 (re-opened). 2004-07-29 18:35:54 -03:00
unknown
2be153efbe Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1717


client/mysqlbinlog.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
 2004-07-29 23:28:28 +02:00
unknown
88e3aead85 WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position 
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).


client/client_priv.h:
  new options for mysqlbinlog
client/mysqlbinlog.cc:
  WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position.
  (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
   cannot accept 2 binlogs".
include/my_time.h:
  importing time functions so that client/ files can use them.
include/mysql_time.h:
  importing time types so that client/ files can use them.
sql-common/my_time.c:
  importing time functions so that client/ files can use them.
sql/mysql_priv.h:
  moving time functions out of sql/ into sql-common/
sql/time.cc:
  moving time functions out of sql/ into sql-common/
sql/tztime.h:
  moving time functions out of sql/ into sql-common/
 2004-07-29 23:25:58 +02:00
unknown
2d2cf95ee3 Added --with-ndbcluster config option to compile-pentium-valgrind-max 
(since it's in the other -max builds already).


BUILD/compile-pentium-max:
  Removed obviously obsolete comment.
BUILD/compile-pentium-valgrind-max:
  Added same --with* options as for other -max builds (e.g. ndbcluster).
 2004-07-29 15:28:40 +02:00
unknown
3f4e7a910d Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2004-07-29 13:15:25 +02:00
unknown
9778a2c98d ha_ndbcluster.h, ha_ndbcluster.cc: 
compile fix for gcc-2.95


sql/ha_ndbcluster.cc:
  compile fix for gcc-2.95
sql/ha_ndbcluster.h:
  compile fix for gcc-2.95
 2004-07-29 10:44:53 +02:00
unknown
96d0e46bcb Fixed a copy-and-paste error: mysql_create_frm() should have 
its own enter string.
 2004-07-29 10:33:33 +02:00
unknown
b2f54294c5 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
 2004-07-29 09:04:50 +03:00
unknown
805f5aa186 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2004-07-28 14:52:31 -05:00
unknown
a58f826acf Fix some variable misorderings. 2004-07-28 14:52:04 -05:00
unknown
e194353980 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2004-07-28 21:47:51 +02:00
unknown
ce838346d8 Casted all macro arguments, 
used a common style with array subscripts,
improved the line-up, wrapped long lines.
 2004-07-28 21:46:22 +02:00
unknown
2137dff8e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2004-07-28 10:02:38 -07:00
unknown
b620ae298a MgmtSrvr.hpp: 
make subclass friend for gcc-2.95 et al [dup push]


ndb/src/mgmsrv/MgmtSrvr.hpp:
  make subclass friend for gcc-2.95 et al
 2004-07-28 18:55:17 +02:00
unknown
9aa6d52a94 Fixing MYSQL_CHEKC_ZLIB_DIR to take into account user settings (in case there 
are such)
 2004-07-28 09:34:06 -07:00