mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13240 commits 2778 branches 343 tags 1.6 GiB
Commit graph

13240 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
a7909ab90a Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/gcc34
 2004-07-04 21:20:39 +02:00
unknown
d760bfd6b0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged
 2004-07-02 17:32:47 -05:00
unknown
5b38494800 item_geofunc.cc: 
Minor comment tweaks.


sql/item_geofunc.cc:
  Minor comment tweaks.
 2004-07-02 16:22:46 -05:00
unknown
c345fc0f82 Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection 2004-07-02 16:52:02 +05:00
unknown
6b577437b9 configure.in: 
armscii8_bin was referenced to as armscii_bin.


configure.in:
  armscii8_bin was referenced to as armscii_bin.
 2004-07-02 13:33:26 +05:00
unknown
0fb0143d07 armscii8_bin was referenced to as armscii_bin in a mistake. 2004-07-02 13:27:46 +05:00
unknown
33c7a1fc15 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-07-01 23:33:44 -05:00
unknown
31a2dc300f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into here.mwagner.org:/Volumes/BK/mysql-4.1
 2004-07-01 14:48:58 -05:00
unknown
215e6848a6 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged
 2004-07-01 12:01:26 -05:00
unknown
9890cd9a9e Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
 2004-07-01 16:35:52 +02:00
unknown
f2e036aa5f WL#1564 Intensive test of prepared statements via 'mysqltest' 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-07-01 16:30:29 +02:00
unknown
0fc82282cb Portability fixes (For Netware) 
mysql-test/r/rpl_delete_all.result:
  Portability fix
mysql-test/t/rpl_delete_all.test:
  Portability fix
netware/BUILD/compile-netware-standard:
  Patch from novell
 2004-07-01 17:26:45 +03:00
unknown
904ab369e1 - tagged ChangeSet 1.2023 as "mysql-4.1.3" 
- bumped up version number in configure.in: 4.1.3-beta -> 4.1.4-beta


configure.in:
   - bumped up version number: 4.1.3-beta -> 4.1.4-beta
 2004-07-01 14:41:51 +02:00
unknown
18ee3ae493 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-07-01 07:40:32 -05:00
unknown
007b18d9da Merge here.mwagner.org:/Volumes/BK/mysql-4.1 
into here.mwagner.org:/Volumes/BK/mysql-4.1-work
 2004-06-30 23:31:33 -05:00
unknown
208b362de8 mysql-copyright: 
Fix for the condition when "the_fat" doesn't end with 'dnl\n', but ')\n'.


Build-tools/mysql-copyright:
  Fix for the condition when "the_fat" doesn't end with 'dnl\n', but ')\n'.
 2004-06-30 23:29:47 -05:00
unknown
b694101fce client.c, libmysql.c: 
Symbol spelling change.
errmsg.c:
  Client error message edits.
errmsg.h:
  Two symbol spelling changes.


include/errmsg.h:
  Two symbol spelling changes.
libmysql/errmsg.c:
  Client error message edits.
libmysql/libmysql.c:
  Symbol spelling change.
sql-common/client.c:
  Symbol spelling change.
 2004-06-30 22:18:41 -05:00
unknown
f22e1c5b56 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-30 14:18:34 -05:00
unknown
0426c065c1 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
 2004-06-30 10:38:56 -05:00
unknown
79f7645b5b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-06-30 14:19:31 +02:00
unknown
667c74144b Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2004-06-30 14:02:32 +02:00
unknown
c2668e106b - fixed server RPM postinstall (mysql_install_db was called with the 
wrong parameter)
 2004-06-30 14:01:31 +02:00
unknown
ee88811146 ctype-uca.c: 
mbminlen was wrong for UTF8.


strings/ctype-uca.c:
  mbminlen was wrong for UTF8.
 2004-06-30 14:45:08 +05:00
unknown
f671a1339b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-29 21:33:05 -05:00
unknown
0193768acd Reword some client error messages. 2004-06-29 12:28:45 -05:00
unknown
c46e4aca66 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-29 18:20:06 +03:00
unknown
d90a88a55b Apply patch from Novell 
netware/init_db.sql:
  Add time_zone tables
netware/mysql_test_run.c:
  Portability fix (log -> log_msg)
 2004-06-29 18:19:35 +03:00
unknown
0a1381e05b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4089


mysql-test/r/bdb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/handler.h:
  Auto merged
 2004-06-29 13:51:35 +05:00
unknown
f9b7537eb6 a fix (bug #4304: TRUNCATE <table of type BDB> , wrong result). 2004-06-29 13:49:50 +05:00
unknown
c7f0287985 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged
 2004-06-28 23:30:37 -05:00
unknown
834bde020d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-28 20:53:08 +03:00
unknown
50d4d61598 unused field removed 2004-06-28 20:01:11 +03:00
unknown
6893aff622 Message/comment touchup. 
scripts/mysql_fix_privilege_tables.sh:
  Message touchup.
scripts/mysql_fix_privilege_tables.sql:
  Comment touchup.
 2004-06-28 11:26:54 -05:00
unknown
dcb1d8ff63 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874


scripts/mysql_fix_privilege_tables.sh:
  Auto merged
 2004-06-28 15:39:04 +02:00
unknown
7bd97ab764 Fix for BUG#4240 "mysql_fix_privilege_tables Does not use --password properly" 
Pass password if it is NOT empty. Typo fixed.


scripts/mysql_fix_privilege_tables.sh:
  Pass password if it is NOT empty. Typo fixed.
 2004-06-28 15:37:42 +02:00
unknown
3b95283baa after merge fix 2004-06-28 11:06:22 +02:00
unknown
0c3d564aeb Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-28 00:42:38 +03:00
unknown
6cf3092224 Added missing my_time.c file to mysqlclient project 
Moved include <assert.h> to my_global.h


VC++Files/client/mysqlclient.dsp:
  Added missing my_time.c file to mysqlclient project
include/my_dbug.h:
  Moved include <assert.h> to my_global.h
  Removed NDEBUG as asserts should be indenpendent of if we are using DBUG or not
include/my_global.h:
  Added assert.h as this is included in a lot of places
sql/sql_table.cc:
  Initialize forgotten variable
 2004-06-28 00:42:02 +03:00
unknown
af0c28ffeb portability fix 2004-06-27 20:30:48 +02:00
unknown
282e7f9b18 tell make how to create mysql_tzinfo_to_sql.cc 2004-06-27 20:17:32 +02:00
unknown
f90b266fa5 Ensure that we don't create long temporary .o file (breaks on qnx) 2004-06-27 20:07:21 +03:00
unknown
f37e8fb999 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-27 19:18:03 +03:00
unknown
16bb7f392e Merge with 4.0 
configure.in:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
 2004-06-27 19:17:24 +03:00
unknown
d72f90dbe0 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-06-27 18:21:14 +03:00
unknown
3eb5fd0f24 Fix to be able to cross-compile for modesto 
scripts/make_win_src_distribution.sh:
  Change mode to -rw-rw-r--
 2004-06-27 18:20:06 +03:00
unknown
6ffe0a5016 correct casting void->char 2004-06-27 17:16:05 +02:00
unknown
9ddffd2778 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-27 07:00:14 -05:00
unknown
404730a123 after merge fix 
mysql-test/r/lowercase_table2.result:
  results updated
 2004-06-27 13:16:19 +02:00
unknown
54f47f1ef6 make lowercase_table3 to work 2004-06-27 11:57:08 +02:00
unknown
68ff7025c0 memory leak in tz code closed 
(table opened in my_tz_init, was removed from thd->open_tables in
tz_load_from_db w/o being unlocked, so it was stayng in open_cache
forever preventing the latter from being free'd in table_cache_free)
 2004-06-27 01:32:52 +02:00