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

1261 commits

Author SHA1 Message Date
msvensson@pilot.mysql.com
2079d7619d Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
 2007-10-03 13:44:37 +02:00
msvensson@pilot.mysql.com
0e9ca3e59d Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
 2007-10-03 11:46:55 +02:00
msvensson@pilot.mysql.com
2f0e8a3fa3 Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167 
into  pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167
 2007-10-03 11:19:24 +02:00
tsmith@ramayana.hindu.god
37cbd6f7b4 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-09-28 10:55:28 -06:00
msvensson@pilot.(none)
e068e99cd0 Bug#31167 Introduction of @@hostname breaks replication in a ring 
- Use a local uservariable to avoid @@hostname in binlog
 2007-09-26 17:04:41 +02:00
tnurnberg@sin.intern.azundris.com
f3b1822c7a Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/tnurnberg/15327/51-15327
 2007-09-15 05:12:02 +02:00
tnurnberg@sin.intern.azundris.com
d5174aad89 Merge mysql.com:/home/tnurnberg/15327/50-15327 
into  mysql.com:/home/tnurnberg/15327/51-15327
 2007-09-15 04:09:38 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
3c6ca8d6ed Bug #15327: configure: --with-tcp-port option being partially ignored 
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
 2007-09-13 16:19:46 +02:00
jperkin@production.mysql.com
302e1811f7 Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build-gca/mysql-5.1 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
 2007-09-07 17:46:31 +02:00
joerg@trift2.
a751c743c0 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-09-04 19:49:42 +02:00
kent@kent-amd64.(none)
ecbff12457 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-08-29 22:29:58 +02:00
kent@kent-amd64.(none)
515d654e80 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-08-29 22:24:51 +02:00
kent@mysql.com/kent-amd64.(none)
cf285315eb mysql_config.sh: 
Flag changed name in icc 10
 2007-08-29 22:24:11 +02:00
tsmith@ramayana.hindu.god
9410759277 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-28 13:25:06 -06:00
tsmith@ramayana.hindu.god
044cd7b471 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-28 13:24:31 -06:00
tsmith@ramayana.hindu.god
a009144d43 Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-27 18:41:29 -06:00
tsmith@ramayana.hindu.god
c87236ce91 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-27 18:20:54 -06:00
joerg@trift2.
783411911a Merge trift2.:/MySQL/M51/netware3-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-27 14:02:45 +02:00
joerg@trift2.
cb279c906a Merge trift2.:/MySQL/M51/netware3-5.1 
into  trift2.:/MySQL/M51/target-5.1.22
 2007-08-27 13:53:23 +02:00
msvensson@pilot.(none)
ffc67d70ce Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE 
- Set sql_mode to default when creating system tables
 2007-08-27 13:39:34 +02:00
joerg@trift2.
e42afa010d More cleanup / fixing for NetWare: 
1) "test_db.sql" is a plaintext file, no binary;
2) do not try to strip the binaries, it will not work.
 2007-08-27 13:30:22 +02:00
msvensson@pilot.(none)
9d1570302b Cset exclude: msvensson@pilot.(none)|ChangeSet|20070827092310|49459 2007-08-27 13:16:39 +02:00
msvensson@pilot.(none)
f5489f67e9 Bug#30029 mysql_upgrade fails for 5.0 -> 5.1.21, 5.1.20 -> 5.1.21 upgrades 
- Change to use '' to quote a string inside another string
 2007-08-27 11:23:10 +02:00
jperkin@production.mysql.com
501a930dc6 Finish up last syslog -> want_syslog change missed in r1.91, 
fixing bug#30624
 2007-08-24 16:40:26 +02:00
tsmith@ramayana.hindu.god
dcd94251d4 Bug #27694: mysqlhotcopy & p5-DBD-mysql51-4.003 
Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in the
get_list_of_tables() routine.

The symptom is that, when used with recent versions of DBD::mysql,
mysqlhotcopy uses a double-qualified table name, for example:

Invalid db.table name 'test.test`.`x' at /usr/bin/mysqlhotcopy line 855.

This is caused by a change in DBD::mysql.  See this diff:

http://svn.perl.org/viewcvs/modules/DBD-mysql/trunk/lib/DBD/mysql.pm?r1=9183&r2=9188

Basically, older DBD::mysql implemented a limited ->table_info method;
now the full method is implemented, and as a result DBI's ->tables()
method has access to the schema value, so it uses it.
 2007-08-20 11:00:51 -06:00
kent@mysql.com/kent-amd64.(none)
7287ecd814 make_win_src_distribution_old.sh: 
Rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution_old.sh
Makefile.am, make_win_src_distribution_old.sh:
  Rename and put in note not to be used
 2007-08-14 00:03:05 +02:00
monty@narttu.mysql.fi
9d609a59fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-08-14 00:22:34 +03:00
monty@mysql.com/nosik.monty.fi
e53a73e26c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 
Faster thr_alarm()
Added 'Opened_files' status variable to track calls to my_open()
Don't give warnings when running mysql_install_db
Added option --source-install to mysql_install_db

I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read()      -> index_read_map()
index_read_idx()  -> index_read_idx_map()
index_read_last() -> index_read_last_map()
 2007-08-13 16:11:25 +03:00
kent@kent-amd64.(none)
add9cb76b5 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
 2007-08-06 08:33:20 +02:00
kent@mysql.com/kent-amd64.(none)
d75c7a58c1 make_win_bin_dist: 
Corrected install path
 2007-08-06 08:31:09 +02:00
kent@mysql.com/kent-amd64.(none)
f9fdd5ae8c make_win_bin_dist: 
Copy embedded .pdb and static debug lib
 2007-08-06 08:28:16 +02:00
kent@kent-amd64.(none)
6b9ac5b7cf Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
 2007-08-03 22:57:21 +02:00
kent@mysql.com/kent-amd64.(none)
a6d082f36d CMakeLists.txt, README, configure.js 
Several adjustments to make client libraries pass the link test
  on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
 2007-08-03 21:51:37 +02:00
joerg@trift2.
0bd847f013 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-02 21:49:42 +02:00
joerg@trift2.
7ddc8c35b2 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-02 21:18:24 +02:00
kent@kent-amd64.(none)
dc998d9388 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
 2007-08-02 20:59:23 +02:00
kent@mysql.com/kent-amd64.(none)
838a98c1e6 make_win_bin_dist: 
Simplified copying of 'mysql-test' directory
 2007-08-02 20:51:04 +02:00
kent@kent-amd64.(none)
b976f18c1b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
 2007-08-02 15:39:34 +02:00
kent@kent-amd64.(none)
423fd0b07e Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
 2007-08-02 12:56:54 +02:00
kent@mysql.com/kent-amd64.(none)
74267ad9b8 CMakeLists.txt (several), make_win_bin_dist: 
Aligned client library build and use with the Unix version when it
  comes to what source to include directly in the builds, and what
  libraries to link with (bug#30118).

  Also reviewed, corrected and made more clear when static or dynamic
  Thread Local Storage is to be used. Some code duplication was removed,
  and some redundant library usage were removed, reducing the risk of
  incorrect TLS usage.
 2007-08-02 12:49:27 +02:00
joerg@trift2.
9e924569d2 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-02 11:22:50 +02:00
tsmith@ramayana.hindu.god
7509e1ed24 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:32:01 -06:00
tsmith@ramayana.hindu.god
33c4cdaa66 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:30:55 -06:00
tsmith@ramayana.hindu.god
9ce717b0fe Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:15:24 -06:00
jperkin@production.mysql.com
ba3729a63b Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
 2007-08-01 12:09:19 +02:00
jperkin@production.mysql.com
bd77d3e17c Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint 
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1-maint
 2007-08-01 12:04:55 +02:00
jperkin@production.mysql.com
a311c37891 Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint 
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
 2007-08-01 12:02:35 +02:00
jperkin@production.mysql.com
f5c8c9a81d Option 6 tries to grant global privileges at the database level 
which does not work.  Removing these attempted privileges makes
this identical to option 5 so remove it completely.  The spirit
of the program appears to be aimed at database privileges, so do
not add another option for granting global privileges as it may
be unexpected.  Fixes bug#14618 (same as previous patch, this
time applied to -maint tree).
 2007-08-01 11:58:25 +02:00
kent@kent-amd64.(none)
fd3b865149 Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build 
into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build
 2007-07-30 21:45:06 +02:00
tsmith@ramayana.hindu.god
950a482a4b mysqld_safe.sh: 
Post-review fix, if 'logger' can't be found, and --syslog is requested, exit with error message instead of fall back to logging to error file.
 2007-07-30 13:35:36 -06:00