mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28979 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1493 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
b93eb20928 Bug #15845 New file "client/mysqlslap.c" break compilation on QNX, missing "sys/shm.h" 2005-12-20 12:56:48 +01:00
hartmut@mysql.com
84929a0f43 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-13 19:50:23 +01:00
paul@snake-hub.snake.net
3a9c099ba3 Merge snake-hub.snake.net:/tmp/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2005-12-12 12:17:56 -06:00
paul@snake-hub.snake.net
c708d9140f mysqltest.c: 
Put options in proper order.
 2005-12-12 12:15:25 -06:00
hartmut@mysql.com
d2ec3d0c75 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-06 14:19:17 +01:00
knielsen@mysql.com
2713a7e15e Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2005-12-05 18:01:44 +01:00
knielsen@mysql.com
17cab43fcf Bug#15097: Missing \n in header printed by mysql --help when HAVE_READLINE 
is not defined.
 2005-12-05 12:12:08 +01:00
hartmut@mysql.com
9bd4f3225a Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-05 11:32:51 +01:00
hartmut@mysql.com
45adda8fd1 added --server-id option to mysqlbinlog to filter for a certain server id 
in the binlog only
 2005-12-05 11:21:30 +01:00
patg@krsna.patg.net
2c2c812846 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-slap
 2005-12-03 17:17:07 -08:00
patg@krsna.patg.net
9503c7e514 WORKLOG #2983 Post review fixes 2005-12-02 22:07:11 -08:00
jimw@mysql.com
01ac5172dd Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-01 15:14:51 -08:00
jimw@mysql.com
beed6147ad Merge mysql.com:/home/jimw/my/mysql-4.1-13318 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-01 12:21:29 -08:00
patg@krsna.patg.net
094d91fdec Worklog #2983 Mysqlslap load emulator tool and accompanied test, results 
and modifications to mysql-test-run(.pl/.sh)
 2005-11-29 16:02:21 -08:00
bar@mysql.com
23c4c3abc0 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2005-11-29 09:30:29 +04:00
brian@zim.(none)
22183f2342 Fixed typo where I did --replace-names intead of --replace. 
Thanks Paul for pointing it out :)
 2005-11-28 19:44:55 -08:00
jimw@mysql.com
5f7e5b46c6 Merge mysql.com:/home/jimw/my/mysql-4.1-5792 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 10:52:52 -08:00
brian@zim.(none)
802f32c1dd Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/mysql-5.1-new
 2005-11-24 11:23:44 -08:00
brian@zim.(none)
33076b8782 Its funny, I am reading through the forums and someone asks "Can I please have a REPLACE INTO, instead an INSERT INTO?" and I remember how often I have used a sed script to modify MySQL dumps to have exactly that. 
So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases.

Though I hear you could just use a sed line to modify it back :)
 2005-11-24 09:56:40 -08:00
jimw@mysql.com
000d89b5e0 Fix values printed by mysqldump for empty blob fields when 
--hex-blob is used. (Bug #13318)
 2005-11-23 17:31:44 -08:00
bell@sanja.is.com.ua
db8f03ebe8 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-23 01:28:32 +02:00
bell@sanja.is.com.ua
7bd691f11e Recursion support made for SP (BUG#10100). 2005-11-23 01:11:19 +02:00
kent@mysql.com
9b14ee2ebc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-22 01:17:06 +01:00
joerg@mysql.com
84bc725fb9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-11-21 18:31:36 +01:00
joerg@mysql.com
b3b124f9e4 Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the general tree. 2005-11-21 15:49:34 +01:00
aivanov@mysql.com
9a7efe36c6 Fixed BUG #14554: mysqldump does not separate "ROW" and trigger 
statement for tables created in the IGNORE_SPACE sql mode.
 2005-11-21 13:36:48 +03:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
jamppa@suse9-x86.mysql.com
a50cc250ff Netware specific changes for 5.0.16a 2005-11-18 18:25:46 +01:00
jimw@mysql.com
f8ce7bc01e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-17 13:37:30 -08:00
jimw@mysql.com
2ffc7ff2a2 Update out-of-date URLs in 'help' text of mysql client. (Bug #14801) 2005-11-11 15:23:04 -08:00
kent@mysql.com
b269caecb1 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
tim@siva.hindu.god
198ead8f4e merge 2005-11-02 08:46:13 +13:00
evgen@moonbone.local
bbe58c7e26 Manually merged 2005-11-01 19:47:53 +03:00
pem@mysql.com
1137a376a7 Fixed bugs in client/mysqltest.c which made lots of "connect" commands in tests fail. 2005-10-31 19:31:05 +01:00
pem@mysql.com
81437a7286 Removed C++-isms from client/mysqltest.c 2005-10-31 17:51:48 +01:00
ramil@mysql.com
afbd0fafd3 Check for NULLs only if we don't replace column results, 
get real results after all checks.
(see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).
 2005-10-31 16:28:45 +04:00
jani@ua141d10.elisa.omakaista.fi
da64397b69 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-31 11:54:36 +02:00
msvensson@neptunus.(none)
531b847f23 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-31 09:14:58 +01:00
paul@frost.snake.net
19544bd01c Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  frost.snake.net:/Users/paul/bk/mysql-5.0
 2005-10-28 14:26:22 -05:00
msvensson@neptunus.(none)
68fa03258a Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
be6f7a3f82 Merge neptunus.(none):/home/msvensson/mysql/ssl_test/my50-ssl_test 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-10-28 11:00:54 +02:00
msvensson@neptunus.(none)
22c0d6489c After reiview fix 
- Use msg argument to determine if param is required or not in safe_get_param
 2005-10-28 10:58:57 +02:00
tim@siva.hindu.god
c704130389 BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long. 2005-10-28 12:13:34 +13:00
monty@mysql.com
a9b1ff4095 Add DROP TABLE before trying to create view (in mysqldump) 
Cleaned up xxxx_gis.test's and made gis_generic.inc independent of ndb
(Note that archive_gis.test fails, but this is independent of this patch)
 2005-10-27 22:45:18 +03:00
patg@krsna.patg.net
7243b7bb49 BUG# 12123 
Made change to mysqlimport to set character_set_database to binary to 
make importing various charsets/columns work correctly.
 2005-10-25 14:50:08 -07:00
paul@frost.snake.net
ea8ab2a114 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  frost.snake.net:/Users/paul/bk/mysql-5.0
 2005-10-25 12:50:03 -05:00
pgalbraith@mysql.com
feca138e46 This cset fixes BUG# 12838, 14061, 12129 
mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views
mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.
 2005-10-25 19:04:31 +02:00